Index: clang/lib/AST/ExprConstant.cpp
===================================================================
--- clang/lib/AST/ExprConstant.cpp
+++ clang/lib/AST/ExprConstant.cpp
@@ -551,9 +551,6 @@
/// Temporaries - Temporary lvalues materialized within this stack frame.
MapTy Temporaries;
- /// CallLoc - The location of the call expression for this call.
- SourceLocation CallLoc;
-
/// Index - The call index of this call.
unsigned Index;
@@ -586,9 +583,8 @@
llvm::DenseMap<const ValueDecl *, FieldDecl *> LambdaCaptureFields;
FieldDecl *LambdaThisCaptureField = nullptr;
- CallStackFrame(EvalInfo &Info, SourceLocation CallLoc,
- const FunctionDecl *Callee, const LValue *This,
- const Expr *CallExpr, CallRef Arguments);
+ CallStackFrame(EvalInfo &Info, const FunctionDecl *Callee,
+ const LValue *This, const Expr *CallExpr, CallRef Arguments);
~CallStackFrame();
// Return the temporary for Key whose version number is Version.
@@ -630,7 +626,11 @@
void describe(llvm::raw_ostream &OS) const override;
Frame *getCaller() const override { return Caller; }
- SourceLocation getCallLocation() const override { return CallLoc; }
+ SourceRange getCallRange() const override {
+ if (CallExpr)
+ return CallExpr->getSourceRange();
+ return SourceRange();
+ }
const FunctionDecl *getCallee() const override { return Callee; }
bool isStdFunction() const {
@@ -982,7 +982,7 @@
CallStackDepth(0), NextCallIndex(1),
StepsLeft(C.getLangOpts().ConstexprStepLimit),
EnableNewConstInterp(C.getLangOpts().EnableNewConstInterp),
- BottomFrame(*this, SourceLocation(), /*Callee=*/nullptr,
+ BottomFrame(*this, /*Callee=*/nullptr,
/*This=*/nullptr,
/*CallExpr=*/nullptr, CallRef()),
EvaluatingDecl((const ValueDecl *)nullptr),
@@ -1468,12 +1468,11 @@
setInvalid();
}
-CallStackFrame::CallStackFrame(EvalInfo &Info, SourceLocation CallLoc,
- const FunctionDecl *Callee, const LValue *This,
- const Expr *CallExpr, CallRef Call)
+CallStackFrame::CallStackFrame(EvalInfo &Info, const FunctionDecl *Callee,
+ const LValue *This, const Expr *CallExpr,
+ CallRef Call)
: Info(Info), Caller(Info.CurrentCall), Callee(Callee), This(This),
- CallExpr(CallExpr), Arguments(Call), CallLoc(CallLoc),
- Index(Info.NextCallIndex++) {
+ CallExpr(CallExpr), Arguments(Call), Index(Info.NextCallIndex++) {
Info.CurrentCall = this;
++Info.CallStackDepth;
}
@@ -6225,15 +6224,15 @@
}
/// Evaluate a function call.
-static bool HandleFunctionCall(SourceLocation CallLoc,
+static bool HandleFunctionCall(SourceRange CallRange,
const FunctionDecl *Callee, const LValue *This,
const Expr *E, ArrayRef<const Expr *> Args,
CallRef Call, const Stmt *Body, EvalInfo &Info,
APValue &Result, const LValue *ResultSlot) {
- if (!Info.CheckCallLimit(CallLoc))
+ if (!Info.CheckCallLimit(CallRange.getBegin()))
return false;
- CallStackFrame Frame(Info, CallLoc, Callee, This, E, Call);
+ CallStackFrame Frame(Info, Callee, This, E, Call);
// For a trivial copy or move assignment, perform an APValue copy. This is
// essential for unions, where the operations performed by the assignment
@@ -6298,7 +6297,7 @@
Info,
ObjectUnderConstruction{This.getLValueBase(), This.Designator.Entries},
RD->getNumBases());
- CallStackFrame Frame(Info, CallLoc, Definition, &This, E, Call);
+ CallStackFrame Frame(Info, Definition, &This, E, Call);
// FIXME: Creating an APValue just to hold a nonexistent return value is
// wasteful.
@@ -6602,7 +6601,7 @@
if (!CheckConstexprFunction(Info, CallLoc, DD, Definition, Body))
return false;
- CallStackFrame Frame(Info, CallLoc, Definition, &This, /*CallExpr=*/nullptr,
+ CallStackFrame Frame(Info, Definition, &This, /*CallExpr=*/nullptr,
CallRef());
// We're now in the period of destruction of this object.
@@ -7871,8 +7870,8 @@
Stmt *Body = FD->getBody(Definition);
if (!CheckConstexprFunction(Info, E->getExprLoc(), FD, Definition, Body) ||
- !HandleFunctionCall(E->getExprLoc(), Definition, This, E, Args, Call,
- Body, Info, Result, ResultSlot))
+ !HandleFunctionCall(E->getSourceRange(), Definition, This, E, Args,
+ Call, Body, Info, Result, ResultSlot))
return false;
if (!CovariantAdjustmentPath.empty() &&
@@ -12145,8 +12144,9 @@
Callee->getIdentifier()->isStr("is_constant_evaluated")))) {
// FIXME: Find a better way to avoid duplicated diagnostics.
if (Info.EvalStatus.Diag)
- Info.report((Info.CallStackDepth == 1) ? E->getExprLoc()
- : Info.CurrentCall->CallLoc,
+ Info.report((Info.CallStackDepth == 1)
+ ? E->getExprLoc()
+ : Info.CurrentCall->getCallRange().getBegin(),
diag::warn_is_constant_evaluated_always_true_constexpr)
<< (Info.CallStackDepth == 1 ? "__builtin_is_constant_evaluated"
: "std::is_constant_evaluated");
@@ -16286,8 +16286,7 @@
Info.EvalStatus.HasSideEffects = false;
// Build fake call to Callee.
- CallStackFrame Frame(Info, Callee->getLocation(), Callee, ThisPtr, This,
- Call);
+ CallStackFrame Frame(Info, Callee, ThisPtr, This, Call);
// FIXME: Missing ExprWithCleanups in enable_if conditions?
FullExpressionRAII Scope(Info);
return Evaluate(Value, Info, this) && Scope.destroy() &&
@@ -16367,7 +16366,7 @@
Info.CheckingPotentialConstantExpression = true;
// Fabricate a call stack frame to give the arguments a plausible cover story.
- CallStackFrame Frame(Info, SourceLocation(), FD, /*This=*/nullptr,
+ CallStackFrame Frame(Info, FD, /*This=*/nullptr,
/*CallExpr=*/nullptr, CallRef());
APValue ResultScratch;
Index: clang/lib/AST/Interp/Frame.h
===================================================================
--- clang/lib/AST/Interp/Frame.h
+++ clang/lib/AST/Interp/Frame.h
@@ -33,7 +33,7 @@
virtual Frame *getCaller() const = 0;
/// Returns the location of the call site.
- virtual SourceLocation getCallLocation() const = 0;
+ virtual SourceRange getCallRange() const = 0;
/// Returns the called function's declaration.
virtual const FunctionDecl *getCallee() const = 0;
Index: clang/lib/AST/Interp/InterpFrame.h
===================================================================
--- clang/lib/AST/Interp/InterpFrame.h
+++ clang/lib/AST/Interp/InterpFrame.h
@@ -56,7 +56,7 @@
Frame *getCaller() const override;
/// Returns the location of the call to the frame.
- SourceLocation getCallLocation() const override;
+ SourceRange getCallRange() const override;
/// Returns the caller.
const FunctionDecl *getCallee() const override;
Index: clang/lib/AST/Interp/InterpFrame.cpp
===================================================================
--- clang/lib/AST/Interp/InterpFrame.cpp
+++ clang/lib/AST/Interp/InterpFrame.cpp
@@ -176,10 +176,10 @@
return S.getSplitFrame();
}
-SourceLocation InterpFrame::getCallLocation() const {
+SourceRange InterpFrame::getCallRange() const {
if (!Caller->Func)
- return S.getLocation(nullptr, {});
- return S.getLocation(Caller->Func, RetPC - sizeof(uintptr_t));
+ return S.getRange(nullptr, {});
+ return S.getRange(Caller->Func, RetPC - sizeof(uintptr_t));
}
const FunctionDecl *InterpFrame::getCallee() const {
Index: clang/lib/AST/Interp/State.cpp
===================================================================
--- clang/lib/AST/Interp/State.cpp
+++ clang/lib/AST/Interp/State.cpp
@@ -129,13 +129,13 @@
const Frame *Top = getCurrentFrame();
const Frame *Bottom = getBottomFrame();
for (const Frame *F = Top; F != Bottom; F = F->getCaller(), ++CallIdx) {
- SourceLocation CallLocation = F->getCallLocation();
+ SourceRange CallRange = F->getCallRange();
// Skip this call?
if (CallIdx >= SkipStart && CallIdx < SkipEnd) {
if (CallIdx == SkipStart) {
// Note that we're skipping calls.
- addDiag(CallLocation, diag::note_constexpr_calls_suppressed)
+ addDiag(CallRange.getBegin(), diag::note_constexpr_calls_suppressed)
<< unsigned(ActiveCalls - Limit);
}
continue;
@@ -146,7 +146,8 @@
if (const auto *CD =
dyn_cast_if_present<CXXConstructorDecl>(F->getCallee());
CD && CD->isInheritingConstructor()) {
- addDiag(CallLocation, diag::note_constexpr_inherited_ctor_call_here)
+ addDiag(CallRange.getBegin(),
+ diag::note_constexpr_inherited_ctor_call_here)
<< CD->getParent();
continue;
}
@@ -154,6 +155,7 @@
SmallString<128> Buffer;
llvm::raw_svector_ostream Out(Buffer);
F->describe(Out);
- addDiag(CallLocation, diag::note_constexpr_call_here) << Out.str();
+ addDiag(CallRange.getBegin(), diag::note_constexpr_call_here)
+ << Out.str() << CallRange;
}
}
Index: clang/test/Misc/constexpr-source-ranges.cpp
===================================================================
--- clang/test/Misc/constexpr-source-ranges.cpp
+++ clang/test/Misc/constexpr-source-ranges.cpp
@@ -13,3 +13,13 @@
constexpr const int *P = &I;
constexpr long L = (long)P;
// CHECK: constexpr-source-ranges.cpp:14:20:{14:20-14:27}
+
+
+constexpr int div(bool a, bool b) {
+ return 1 / (int)b;
+}
+constexpr int ints(int a, int b, int c, int d) {
+ return 1;
+}
+static_assert(ints(1, div(true, false), 2, div(false, true)) == 1, "");
+// CHECK: constexpr-source-ranges.cpp:24:23:{24:23-24:39}