[lld] r286991 - Rename function to avoid function overloading.

Rui Ueyama via llvm-commits llvm-commits at lists.llvm.org
Tue Nov 15 09:51:08 PST 2016


Author: ruiu
Date: Tue Nov 15 11:51:07 2016
New Revision: 286991

URL: http://llvm.org/viewvc/llvm-project?rev=286991&view=rev
Log:
Rename function to avoid function overloading.

We had two functions with the same name to read completely different
things. That was confusing.

Modified:
    lld/trunk/ELF/LinkerScript.cpp

Modified: lld/trunk/ELF/LinkerScript.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LinkerScript.cpp?rev=286991&r1=286990&r2=286991&view=diff
==============================================================================
--- lld/trunk/ELF/LinkerScript.cpp (original)
+++ lld/trunk/ELF/LinkerScript.cpp Tue Nov 15 11:51:07 2016
@@ -986,7 +986,7 @@ private:
   Expr readParenExpr();
 
   // For parsing version script.
-  void readExtern(std::vector<SymbolVersion> *Globals);
+  void readVersionExtern(std::vector<SymbolVersion> *Globals);
   void readVersionDeclaration(StringRef VerStr);
   void readGlobal(StringRef VerStr);
   void readLocal(StringRef VerStr);
@@ -1824,7 +1824,7 @@ void ScriptParser::readLocal(StringRef V
   }
 }
 
-void ScriptParser::readExtern(std::vector<SymbolVersion> *Globals) {
+void ScriptParser::readVersionExtern(std::vector<SymbolVersion> *Globals) {
   expect("\"C++\"");
   expect("{");
 
@@ -1849,7 +1849,7 @@ void ScriptParser::readGlobal(StringRef
 
   for (;;) {
     if (consume("extern"))
-      readExtern(Globals);
+      readVersionExtern(Globals);
 
     StringRef Cur = peek();
     if (Cur == "}" || Cur == "local:" || Error)




More information about the llvm-commits mailing list