[clang][ExprConst] Assert that EvaluateAsInitializer has non-null VD (#159274)

Both the expression (the initializer) as well as the VarDecl can't be null here. Assert that.

Author: tbaederr

clang/lib/AST/ByteCode/EvalEmitter.cpp

@@ -51,19 +51,16 @@ EvaluationResult EvalEmitter::interpretExpr(const Expr *E,
 
 EvaluationResult EvalEmitter::interpretDecl(const VarDecl *VD, const Expr *Init,
  bool CheckFullyInitialized) {
+ assert(VD);
+ assert(Init);
  this->CheckFullyInitialized = CheckFullyInitialized;
  S.EvaluatingDecl = VD;
  S.setEvalLocation(VD->getLocation());
  EvalResult.setSource(VD);
 
- // FIXME: I think Init is never null.
- if (Init) {
- QualType T = VD->getType();
- this->ConvertResultToRValue = !Init->isGLValue() && !T->isPointerType() &&
- !T->isObjCObjectPointerType();
- } else
- this->ConvertResultToRValue = false;
-
+ QualType T = VD->getType();
+ this->ConvertResultToRValue = !Init->isGLValue() && !T->isPointerType() &&
+ !T->isObjCObjectPointerType();
  EvalResult.setSource(VD);
 
  if (!this->visitDeclAndReturn(VD, Init, S.inConstantContext()))

clang/lib/AST/ExprConstant.cpp

@@ -17761,6 +17761,7 @@ bool Expr::EvaluateAsInitializer(APValue &Value, const ASTContext &Ctx,
  bool IsConstantInitialization) const {
  assert(!isValueDependent() &&
  "Expression evaluator can't be called on a dependent expression.");
+ assert(VD && "Need a valid VarDecl");
 
  llvm::TimeTraceScope TimeScope("EvaluateAsInitializer", [&] {
  std::string Name;