diff options
| author | Evan Cheng <evan.cheng@apple.com> | 2008-11-08 07:37:34 +0000 |
|---|---|---|
| committer | Evan Cheng <evan.cheng@apple.com> | 2008-11-08 07:37:34 +0000 |
| commit | 1b889b16da3d57697d89586c3e89b48d50e1c46b (patch) | |
| tree | 3d6bc851c87e772cbdc7ba62d604ac2c06223366 /llvm | |
| parent | 776f5922fb005799e70db2783ea60ba2d62cd383 (diff) | |
| download | bcm5719-llvm-1b889b16da3d57697d89586c3e89b48d50e1c46b.tar.gz bcm5719-llvm-1b889b16da3d57697d89586c3e89b48d50e1c46b.zip | |
Rename isString -> isExternalSymbol; getString -> getExternalSymbol since these work on externsym machine relocations.
llvm-svn: 58895
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm/CodeGen/MachineRelocation.h | 8 | ||||
| -rw-r--r-- | llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/llvm/include/llvm/CodeGen/MachineRelocation.h b/llvm/include/llvm/CodeGen/MachineRelocation.h index 4b655ed787f..80cd035445b 100644 --- a/llvm/include/llvm/CodeGen/MachineRelocation.h +++ b/llvm/include/llvm/CodeGen/MachineRelocation.h @@ -234,9 +234,9 @@ public: return AddrType == isBB; } - /// isString - Return true if this is a constant string. + /// isExternalSymbol - Return true if this is a constant string. /// - bool isString() const { + bool isExternalSymbol() const { return AddrType == isExtSym; } @@ -287,8 +287,8 @@ public: /// getString - If this is a string value, return the string reference. /// - const char *getString() const { - assert(isString() && "This is not a string reference!"); + const char *getExternalSymbol() const { + assert(isExternalSymbol() && "This is not an external symbol reference!"); return Target.ExtSym; } diff --git a/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp b/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp index ce3df8a783f..9062cee84ee 100644 --- a/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp +++ b/llvm/lib/ExecutionEngine/JIT/JITEmitter.cpp @@ -885,9 +885,9 @@ bool JITEmitter::finishFunction(MachineFunction &F) { MachineRelocation &MR = Relocations[i]; void *ResultPtr = 0; if (!MR.letTargetResolve()) { - if (MR.isString()) { - ResultPtr = TheJIT->getPointerToNamedFunction(MR.getString()); - DOUT << "JIT: Map \'" << MR.getString() << "\' to [" + if (MR.isExternalSymbol()) { + ResultPtr = TheJIT->getPointerToNamedFunction(MR.getExternalSymbol()); + DOUT << "JIT: Map \'" << MR.getExternalSymbol() << "\' to [" << ResultPtr << "]\n"; // If the target REALLY wants a stub for this function, emit it now. |

