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

If we don't have the information about the type of the RHS report an and exit.

Browse Source
This commit is contained in:
Vassil Vassilev 2014-05-28 11:57:39 +02:00 committed by sftnight
parent a9ad9a8c02
commit e173faa960
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/Interpreter/DynamicLookup.cpp
View File

@ -222,6 +222,15 @@ namespace cling {
// Set the decl context, which is needed by Evaluate.
m_CurDeclContext = FD;
ASTNodeInfo NewBody = Visit((*J)->getBody());
if (NewBody.hasErrorOccurred()) {
// Report unsupported feature.
DiagnosticsEngine& Diags = m_Sema->getDiagnostics();
unsigned diagID
= Diags.getCustomDiagID(DiagnosticsEngine::Error,
"Feature not supported yet");
Diags.Report(NewBody.getAsSingleNode()->getLocStart(), diagID);
return; // Signal a fatal error.
}
FD->setBody(NewBody.getAsSingleNode());
}
assert ((!isa<BlockDecl>(*J) || !isa<ObjCMethodDecl>(*J))
@ -295,6 +304,8 @@ namespace cling {
ASTNodes::iterator it;
for (it = Children.begin(); it != Children.end(); ++it) {
ASTNodeInfo NewNode = Visit(*it);
if (NewNode.hasErrorOccurred())
return NewNode; // abort.
if (!NewNode.hasSingleNode()) {
ASTNodes& NewStmts(NewNode.getNodes());
@ -349,10 +360,15 @@ namespace cling {
VarDecl* CuredDecl = cast_or_null<VarDecl>(Node->getSingleDecl());
assert(CuredDecl && "Not a variable declaration!");
QualType CuredDeclTy = CuredDecl->getType();
if (isa<AutoType>(CuredDeclTy)) {
ASTNodeInfo result(Node, false);
result.setErrorOccurred();
return result;
}
// check if the case is sometype * somevar = init;
// or some_builtin_type somevar = init;
if (CuredDecl->hasInit() && (CuredDeclTy->isAnyPointerType()
|| !CuredDeclTy->isRecordType())) {
if (CuredDecl->hasInit() &&
(CuredDeclTy->isAnyPointerType() || !CuredDeclTy->isRecordType())) {
*I = SubstituteUnknownSymbol(CuredDeclTy, CuredDecl->getInit());
continue;
}

8
lib/Interpreter/DynamicLookup.h
View File

@ -33,14 +33,18 @@ namespace cling {
private:
ASTNodes Nodes;
bool forReplacement;
bool m_HasErrorOccurred;
public:
ASTNodeInfo() : forReplacement(false){}
ASTNodeInfo(clang::Stmt* S, bool needed) : forReplacement(needed) {
ASTNodeInfo() : forReplacement(false), m_HasErrorOccurred(false) {}
ASTNodeInfo(clang::Stmt* S, bool needed)
: forReplacement(needed), m_HasErrorOccurred(false) {
Nodes.push_back(S);
}
bool isForReplacement() { return forReplacement; }
void setForReplacement(bool val = true) { forReplacement = val; }
void setErrorOccurred(bool val = true) { m_HasErrorOccurred = val; }
bool hasErrorOccurred() { return m_HasErrorOccurred; }
bool hasSingleNode() { return Nodes.size() == 1; }
clang::Stmt* getAsSingleNode() {
assert(hasSingleNode() && "There is more than one node!");