From d7398c9b699cae3a109e9808401f7d0b2fc7e686 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Sat, 8 Nov 2008 07:37:34 +0000 Subject: [PATCH] Rename isString -> isExternalSymbol; getString -> getExternalSymbol since these work on externsym machine relocations. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58895 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/MachineRelocation.h | 8 ++++---- lib/ExecutionEngine/JIT/JITEmitter.cpp | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/llvm/CodeGen/MachineRelocation.h b/include/llvm/CodeGen/MachineRelocation.h index 4b655ed787f..80cd035445b 100644 --- a/include/llvm/CodeGen/MachineRelocation.h +++ b/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/lib/ExecutionEngine/JIT/JITEmitter.cpp b/lib/ExecutionEngine/JIT/JITEmitter.cpp index ce3df8a783f..9062cee84ee 100644 --- a/lib/ExecutionEngine/JIT/JITEmitter.cpp +++ b/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.