diff options
| author | Sean Callanan <scallanan@apple.com> | 2011-11-12 02:31:32 +0000 |
|---|---|---|
| committer | Sean Callanan <scallanan@apple.com> | 2011-11-12 02:31:32 +0000 |
| commit | afe153c53f525b5599e79f847e2a0723905b6518 (patch) | |
| tree | 73fc98771dafa346a6ba2c2de8dc5952e42a67fe /lib/ExecutionEngine/MCJIT | |
| parent | 3a5257de21216125bddaa0e5f87c00d32e054cd0 (diff) | |
| download | external_llvm-afe153c53f525b5599e79f847e2a0723905b6518.zip external_llvm-afe153c53f525b5599e79f847e2a0723905b6518.tar.gz external_llvm-afe153c53f525b5599e79f847e2a0723905b6518.tar.bz2 | |
Fixed the MCJIT so that it can emit not only instance
methods but also class methods for Objective-C.
Clang emits Objective-C method names with '\1' at the
beginning, and the JIT has pre-existing logic to try
prepending a '\1' when searching a module for an
instance method (that is, a method whose name begins
with '-'). I simply extended it to do the same thing
when it encountered a class method (a method whose
name begins with '+').
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144451 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/ExecutionEngine/MCJIT')
| -rw-r--r-- | lib/ExecutionEngine/MCJIT/MCJITMemoryManager.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/ExecutionEngine/MCJIT/MCJITMemoryManager.h b/lib/ExecutionEngine/MCJIT/MCJITMemoryManager.h index c17a397..58f9100 100644 --- a/lib/ExecutionEngine/MCJIT/MCJITMemoryManager.h +++ b/lib/ExecutionEngine/MCJIT/MCJITMemoryManager.h @@ -39,9 +39,9 @@ public: if (Name[0] == '_') ++Name; Function *F = M->getFunction(Name); // Some ObjC names have a prefixed \01 in the IR. If we failed to find - // the symbol and it's of the ObjC conventions (starts with "-"), try - // prepending a \01 and see if we can find it that way. - if (!F && Name[0] == '-') + // the symbol and it's of the ObjC conventions (starts with "-" or + // "+"), try prepending a \01 and see if we can find it that way. + if (!F && (Name[0] == '-' || Name[0] == '+')) F = M->getFunction((Twine("\1") + Name).str()); assert(F && "No matching function in JIT IR Module!"); return JMM->startFunctionBody(F, Size); @@ -56,9 +56,9 @@ public: if (Name[0] == '_') ++Name; Function *F = M->getFunction(Name); // Some ObjC names have a prefixed \01 in the IR. If we failed to find - // the symbol and it's of the ObjC conventions (starts with "-"), try - // prepending a \01 and see if we can find it that way. - if (!F && Name[0] == '-') + // the symbol and it's of the ObjC conventions (starts with "-" or + // "+"), try prepending a \01 and see if we can find it that way. + if (!F && (Name[0] == '-' || Name[0] == '+')) F = M->getFunction((Twine("\1") + Name).str()); assert(F && "No matching function in JIT IR Module!"); JMM->endFunctionBody(F, FunctionStart, FunctionEnd); |