gamzinav/cling
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enforce integrity of getGlobalAddress, too.

Browse Source
This commit is contained in:
Vassil Vassilev 2013-10-24 13:16:56 -05:00 committed by sftnight
parent a97a2811c9
commit 69eb1a59a6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/cling/Interpreter/Interpreter.h
View File

@ -36,6 +36,7 @@ namespace clang {
class Decl;
class DeclContext;
class FunctionDecl;
class GlobalDecl;
class NamedDecl;
class Parser;
class QualType;
@ -549,7 +550,8 @@ namespace cling {
///\param[in] D - the global's Decl to find
///\param[out] fromJIT - whether the symbol was JITted.
///
void* getAddressOfGlobal(const clang::NamedDecl* D, bool* fromJIT = 0) const;
void* getAddressOfGlobal(const clang::GlobalDecl& D,
bool* fromJIT = 0) const;
///\brief Gets the address of an existing global and whether it was JITted.
///

8
lib/Interpreter/Interpreter.cpp
View File

@ -21,6 +21,7 @@
#include "cling/Utils/AST.h"
#include "clang/AST/ASTContext.h"
#include "clang/AST/GlobalDecl.h"
#include "clang/Basic/TargetInfo.h"
#include "clang/Basic/SourceManager.h"
#include "clang/CodeGen/ModuleBuilder.h"
@ -251,8 +252,9 @@ namespace cling {
NSD = utils::Lookup::Namespace(&getSema(), "runtime");
NSD = utils::Lookup::Namespace(&getSema(), "internal");
NamedDecl* ND = utils::Lookup::Named(&getSema(), "local_cxa_atexit", NSD);
GlobalDecl GD(cast<FunctionDecl>(ND));
std::string mangledName;
utils::Analyze::maybeMangleDeclName(ND, mangledName);
utils::Analyze::maybeMangleDeclName(GD, mangledName);
m_ExecutionContext->addSymbol(mangledName.c_str(),
(void*)(intptr_t)&runtime::internal::local_cxa_atexit);
@ -879,11 +881,11 @@ namespace cling {
return m_ExecutionContext->addSymbol(symbolName, symbolAddress);
}
void* Interpreter::getAddressOfGlobal(const clang::NamedDecl* D,
void* Interpreter::getAddressOfGlobal(const GlobalDecl& GD,
bool* fromJIT /*=0*/) const {
// Return a symbol's address, and whether it was jitted.
std::string mangledName;
utils::Analyze::maybeMangleDeclName(D, mangledName);
utils::Analyze::maybeMangleDeclName(GD, mangledName);
return getAddressOfGlobal(mangledName.c_str(), fromJIT);
}