tbaeder created this revision.
tbaeder added reviewers: aaron.ballman, erichkeane, tahonermann, shafik.
Herald added a project: All.
tbaeder requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
This was still missing.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D140874
Files:
clang/lib/AST/Interp/ByteCodeExprGen.cpp
clang/lib/AST/Interp/ByteCodeExprGen.h
clang/test/AST/Interp/literals.cpp
Index: clang/test/AST/Interp/literals.cpp
===================================================================
--- clang/test/AST/Interp/literals.cpp
+++ clang/test/AST/Interp/literals.cpp
@@ -665,6 +665,44 @@
// expected-note {{in call to 'IntMul}} \
// ref-error {{not an integral constant expression}} \
// ref-note {{in call to 'IntMul}}
+
+ constexpr int arr[] = {1,2,3};
+ constexpr int ptrInc1() {
+ const int *p = arr;
+ p += 2;
+ return *p;
+ }
+ static_assert(ptrInc1() == 3, "");
+
+ constexpr int ptrInc2() {
+ const int *p = arr;
+ return *(p += 1);
+ }
+ static_assert(ptrInc2() == 2, "");
+
+ constexpr int ptrInc3() { // expected-error {{never produces a constant expression}} \
+ // ref-error {{never produces a constant expression}}
+ const int *p = arr;
+ p += 12; // expected-note {{cannot refer to element 12 of array of 3 elements}} \
+ // ref-note {{cannot refer to element 12 of array of 3 elements}}
+ return *p;
+ }
+
+ constexpr int ptrIncDec1() {
+ const int *p = arr;
+ p += 2;
+ p -= 1;
+ return *p;
+ }
+ static_assert(ptrIncDec1() == 2, "");
+
+ constexpr int ptrDec1() { // expected-error {{never produces a constant expression}} \
+ // ref-error {{never produces a constant expression}}
+ const int *p = arr;
+ p -= 1; // expected-note {{cannot refer to element -1 of array of 3 elements}} \
+ // ref-note {{cannot refer to element -1 of array of 3 elements}}
+ return *p;
+ }
};
#endif
Index: clang/lib/AST/Interp/ByteCodeExprGen.h
===================================================================
--- clang/lib/AST/Interp/ByteCodeExprGen.h
+++ clang/lib/AST/Interp/ByteCodeExprGen.h
@@ -87,6 +87,7 @@
bool VisitCharacterLiteral(const CharacterLiteral *E);
bool VisitCompoundAssignOperator(const CompoundAssignOperator *E);
bool VisitFloatCompoundAssignOperator(const CompoundAssignOperator *E);
+ bool VisitPointerCompoundAssignOperator(const CompoundAssignOperator *E);
bool VisitExprWithCleanups(const ExprWithCleanups *E);
bool VisitMaterializeTemporaryExpr(const MaterializeTemporaryExpr *E);
bool VisitCompoundLiteralExpr(const CompoundLiteralExpr *E);
Index: clang/lib/AST/Interp/ByteCodeExprGen.cpp
===================================================================
--- clang/lib/AST/Interp/ByteCodeExprGen.cpp
+++ clang/lib/AST/Interp/ByteCodeExprGen.cpp
@@ -698,6 +698,41 @@
return this->emitStore(*LT, E);
}
+template <class Emitter>
+bool ByteCodeExprGen<Emitter>::VisitPointerCompoundAssignOperator(
+ const CompoundAssignOperator *E) {
+ BinaryOperatorKind Op = E->getOpcode();
+ const Expr *LHS = E->getLHS();
+ const Expr *RHS = E->getRHS();
+ std::optional<PrimType> LT = classify(LHS->getType());
+ std::optional<PrimType> RT = classify(RHS->getType());
+
+ assert(*LT == PT_Ptr);
+
+ if (!LT || !RT)
+ return false;
+
+ if (!visit(LHS))
+ return false;
+
+ if (!this->emitLoadPtr(LHS))
+ return false;
+
+ if (!visit(RHS))
+ return false;
+
+ if (Op == BO_AddAssign)
+ this->emitAddOffset(*RT, E);
+ else if (Op == BO_SubAssign)
+ this->emitSubOffset(*RT, E);
+ else
+ return false;
+
+ if (DiscardResult)
+ return this->emitStorePopPtr(E);
+ return this->emitStorePtr(E);
+}
+
template <class Emitter>
bool ByteCodeExprGen<Emitter>::VisitCompoundAssignOperator(
const CompoundAssignOperator *E) {
@@ -707,6 +742,9 @@
if (E->getType()->isFloatingType())
return VisitFloatCompoundAssignOperator(E);
+ if (E->getType()->isPointerType())
+ return VisitPointerCompoundAssignOperator(E);
+
const Expr *LHS = E->getLHS();
const Expr *RHS = E->getRHS();
std::optional<PrimType> LT = classify(E->getComputationLHSType());
@@ -715,9 +753,7 @@
if (!LT || !RT)
return false;
- assert(!E->getType()->isPointerType() &&
- "Support pointer arithmethic in compound assignment operators");
-
+ assert(!E->getType()->isPointerType() && "Handled above");
assert(!E->getType()->isFloatingType() && "Handled above");
// Get LHS pointer, load its value and get RHS value.
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
