diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2011-11-29 02:13:21 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2011-11-29 02:13:21 +0000 |
| commit | 9644f84280ea5f5d6c94161860e7f1780e27f8bd (patch) | |
| tree | 7a20d1267267176ce74f8f0f4a9b79d062ce4fc3 /lib/Core/Executor.cpp | |
| parent | 3c844fae79cbc71e365851e7978ee4767880f66b (diff) | |
| download | klee-9644f84280ea5f5d6c94161860e7f1780e27f8bd.tar.gz | |
Updates for LLVM 3.1.
git-svn-id: https://llvm.org/svn/llvm-project/klee/trunk@145365 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Core/Executor.cpp')
| -rw-r--r-- | lib/Core/Executor.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index 87e70a4c..a768ec38 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -449,7 +449,7 @@ void Executor::initializeGlobals(ExecutionState &state) { // not defined in this module; if it isn't resolvable then it // should be null. if (f->hasExternalWeakLinkage() && - !externalDispatcher->resolveSymbol(f->getNameStr())) { + !externalDispatcher->resolveSymbol(f->getName())) { addr = Expr::createPointer(0); } else { addr = Expr::createPointer((unsigned long) (void*) f); @@ -535,7 +535,7 @@ void Executor::initializeGlobals(ExecutionState &state) { extern void *__dso_handle __attribute__ ((__weak__)); addr = &__dso_handle; // wtf ? } else { - addr = externalDispatcher->resolveSymbol(i->getNameStr()); + addr = externalDispatcher->resolveSymbol(i->getName()); } if (!addr) klee_error("unable to load symbol(%s) while initializing globals.", @@ -551,7 +551,7 @@ void Executor::initializeGlobals(ExecutionState &state) { if (UseAsmAddresses && i->getName()[0]=='\01') { char *end; - uint64_t address = ::strtoll(i->getNameStr().c_str()+1, &end, 0); + uint64_t address = ::strtoll(i->getName().str().c_str()+1, &end, 0); if (end && *end == '\0') { klee_message("NOTE: allocated global at asm specified address: %#08llx" @@ -2667,7 +2667,7 @@ void Executor::callExternalFunction(ExecutionState &state, if (NoExternals && !okExternals.count(function->getName())) { std::cerr << "KLEE:ERROR: Calling not-OK external function : " - << function->getNameStr() << "\n"; + << function->getName().str() << "\n"; terminateStateOnError(state, "externals disallowed", "user.err"); return; } @@ -2707,7 +2707,7 @@ void Executor::callExternalFunction(ExecutionState &state, if (!SuppressExternalWarnings) { std::ostringstream os; - os << "calling external: " << function->getNameStr() << "("; + os << "calling external: " << function->getName().str() << "("; for (unsigned i=0; i<arguments.size(); i++) { os << arguments[i]; if (i != arguments.size()-1) |