From: Lang Hames Date: Sun, 8 Feb 2015 04:34:13 +0000 (+0000) Subject: [Orc][Kaleidoscope] Fix method-name think-o. NFC. X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=commitdiff_plain;h=b7e0983d80feca2fffc7a63621f4ac93d5dd8235 [Orc][Kaleidoscope] Fix method-name think-o. NFC. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@228519 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/examples/Kaleidoscope/Orc/initial/toy.cpp b/examples/Kaleidoscope/Orc/initial/toy.cpp index 8716f09915e..ce9fc7f9cde 100644 --- a/examples/Kaleidoscope/Orc/initial/toy.cpp +++ b/examples/Kaleidoscope/Orc/initial/toy.cpp @@ -1152,7 +1152,7 @@ public: // new module. Create one that resolves symbols by looking back into the JIT. auto MM = createLookasideRTDyldMM( [&](const std::string &S) { - return getUnmangledSymbolAddress(S); + return getMangledSymbolAddress(S); }, [](const std::string &S) { return 0; } ); @@ -1161,7 +1161,7 @@ public: void removeModule(ModuleHandleT H) { CompileLayer.removeModuleSet(H); } - uint64_t getUnmangledSymbolAddress(const std::string &Name) { + uint64_t getMangledSymbolAddress(const std::string &Name) { return CompileLayer.getSymbolAddress(Name, false); } @@ -1171,7 +1171,7 @@ public: raw_string_ostream MangledNameStream(MangledName); Mang.getNameWithPrefix(MangledNameStream, Name); } - return getUnmangledSymbolAddress(MangledName); + return getMangledSymbolAddress(MangledName); } private: diff --git a/examples/Kaleidoscope/Orc/lazy_codegen/toy.cpp b/examples/Kaleidoscope/Orc/lazy_codegen/toy.cpp index d96f2323220..9ba8899033b 100644 --- a/examples/Kaleidoscope/Orc/lazy_codegen/toy.cpp +++ b/examples/Kaleidoscope/Orc/lazy_codegen/toy.cpp @@ -1154,7 +1154,7 @@ public: // new module. Create one that resolves symbols by looking back into the JIT. auto MM = createLookasideRTDyldMM( [&](const std::string &S) { - return getUnmangledSymbolAddress(S); + return getMangledSymbolAddress(S); }, [](const std::string &S) { return 0; } ); @@ -1163,7 +1163,7 @@ public: void removeModule(ModuleHandleT H) { LazyEmitLayer.removeModuleSet(H); } - uint64_t getUnmangledSymbolAddress(const std::string &Name) { + uint64_t getMangledSymbolAddress(const std::string &Name) { return LazyEmitLayer.getSymbolAddress(Name, false); } @@ -1173,7 +1173,7 @@ public: raw_string_ostream MangledNameStream(MangledName); Mang.getNameWithPrefix(MangledNameStream, Name); } - return getUnmangledSymbolAddress(MangledName); + return getMangledSymbolAddress(MangledName); } private: diff --git a/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp b/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp index f13af2eacad..baafae22a30 100644 --- a/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp +++ b/examples/Kaleidoscope/Orc/lazy_irgen/toy.cpp @@ -1165,7 +1165,7 @@ public: auto MM = createLookasideRTDyldMM( [&](const std::string &Name) -> uint64_t { // First try to find 'Name' within the JIT. - if (uint64_t Addr = getUnmangledSymbolAddress(Name)) + if (uint64_t Addr = getMangledSymbolAddress(Name)) return Addr; // If we don't find 'Name' in the JIT, see if we have some AST @@ -1184,7 +1184,7 @@ public: } addModule(C.takeM()); - return getUnmangledSymbolAddress(Name); + return getMangledSymbolAddress(Name); }, [](const std::string &S) { return 0; } ); @@ -1193,12 +1193,12 @@ public: void removeModule(ModuleHandleT H) { LazyEmitLayer.removeModuleSet(H); } - uint64_t getUnmangledSymbolAddress(const std::string &Name) { + uint64_t getMangledSymbolAddress(const std::string &Name) { return LazyEmitLayer.getSymbolAddress(Name, false); } uint64_t getSymbolAddress(const std::string &Name) { - return getUnmangledSymbolAddress(Mangle(Name)); + return getMangledSymbolAddress(Mangle(Name)); } private: