This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rGae4849f96706: [clang][Interp] PointerToIntegral casts
(authored by tbaeder).
Changed prior to commit:
https://reviews.llvm.org/D150946?vs=523698&id=544303#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D150946/new/
https://reviews.llvm.org/D150946
Files:
clang/lib/AST/Interp/ByteCodeExprGen.cpp
clang/lib/AST/Interp/Interp.cpp
clang/lib/AST/Interp/Interp.h
clang/lib/AST/Interp/Opcodes.td
clang/lib/AST/Interp/Pointer.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
@@ -6,6 +6,8 @@
#define INT_MIN (~__INT_MAX__)
#define INT_MAX __INT_MAX__
+typedef __INTPTR_TYPE__ intptr_t;
+
static_assert(true, "");
static_assert(false, ""); // expected-error{{failed}} ref-error{{failed}}
@@ -932,3 +934,15 @@
static_assert(a() == 0, "");
#endif
}
+
+namespace PointerCasts {
+ constexpr int M = 10;
+ constexpr const int *P = &M;
+ constexpr intptr_t A = (intptr_t)P; // ref-error {{must be initialized by a constant expression}} \
+ // ref-note {{cast that performs the conversions of a reinterpret_cast}} \
+ // expected-error {{must be initialized by a constant expression}} \
+ // expected-note {{cast that performs the conversions of a reinterpret_cast}}
+
+ int array[(long)(char*)0]; // ref-warning {{variable length array folded to constant array}} \
+ // expected-warning {{variable length array folded to constant array}}
+}
Index: clang/lib/AST/Interp/Pointer.h
===================================================================
--- clang/lib/AST/Interp/Pointer.h
+++ clang/lib/AST/Interp/Pointer.h
@@ -77,6 +77,13 @@
/// Converts the pointer to an APValue.
APValue toAPValue() const;
+ /// Converts the pointer to a string usable in diagnostics.
+ std::string toDiagnosticString(const ASTContext &Ctx) const;
+
+ unsigned getIntegerRepresentation() const {
+ return reinterpret_cast<uintptr_t>(Pointee) + Offset;
+ }
+
/// Offsets a pointer inside an array.
Pointer atIndex(unsigned Idx) const {
if (Base == RootPtrMark)
Index: clang/lib/AST/Interp/Opcodes.td
===================================================================
--- clang/lib/AST/Interp/Opcodes.td
+++ clang/lib/AST/Interp/Opcodes.td
@@ -565,6 +565,12 @@
let HasGroup = 1;
}
+def CastPointerIntegral : Opcode {
+ let Types = [AluTypeClass];
+ let Args = [];
+ let HasGroup = 1;
+}
+
//===----------------------------------------------------------------------===//
// Comparison opcodes.
//===----------------------------------------------------------------------===//
Index: clang/lib/AST/Interp/Interp.h
===================================================================
--- clang/lib/AST/Interp/Interp.h
+++ clang/lib/AST/Interp/Interp.h
@@ -104,6 +104,10 @@
/// Checks that all fields are initialized after a constructor call.
bool CheckCtorCall(InterpState &S, CodePtr OpPC, const Pointer &This);
+/// Checks if reinterpret casts are legal in the current context.
+bool CheckPotentialReinterpretCast(InterpState &S, CodePtr OpPC,
+ const Pointer &Ptr);
+
/// Checks if the shift operation is legal.
template <typename LT, typename RT>
bool CheckShift(InterpState &S, CodePtr OpPC, const LT &LHS, const RT &RHS,
@@ -1493,6 +1497,17 @@
}
}
+template <PrimType Name, class T = typename PrimConv<Name>::T>
+bool CastPointerIntegral(InterpState &S, CodePtr OpPC) {
+ const Pointer &Ptr = S.Stk.pop<Pointer>();
+
+ if (!CheckPotentialReinterpretCast(S, OpPC, Ptr))
+ return false;
+
+ S.Stk.push<T>(T::from(Ptr.getIntegerRepresentation()));
+ return true;
+}
+
//===----------------------------------------------------------------------===//
// Zero, Nullptr
//===----------------------------------------------------------------------===//
Index: clang/lib/AST/Interp/Interp.cpp
===================================================================
--- clang/lib/AST/Interp/Interp.cpp
+++ clang/lib/AST/Interp/Interp.cpp
@@ -462,6 +462,17 @@
return CheckArrayInitialized(S, OpPC, This, CAT);
}
+bool CheckPotentialReinterpretCast(InterpState &S, CodePtr OpPC,
+ const Pointer &Ptr) {
+ if (!S.inConstantContext())
+ return true;
+
+ const SourceInfo &E = S.Current->getSource(OpPC);
+ S.CCEDiag(E, diag::note_constexpr_invalid_cast)
+ << 2 << S.getLangOpts().CPlusPlus;
+ return false;
+}
+
bool CheckFloatResult(InterpState &S, CodePtr OpPC, APFloat::opStatus Status) {
// In a constant context, assume that any dynamic rounding mode or FP
// exception state matches the default floating-point environment.
Index: clang/lib/AST/Interp/ByteCodeExprGen.cpp
===================================================================
--- clang/lib/AST/Interp/ByteCodeExprGen.cpp
+++ clang/lib/AST/Interp/ByteCodeExprGen.cpp
@@ -127,6 +127,15 @@
return true;
return this->emitNull(classifyPrim(CE->getType()), CE);
+ case CK_PointerToIntegral: {
+ // TODO: Discard handling.
+ if (!this->visit(SubExpr))
+ return false;
+
+ PrimType T = classifyPrim(CE->getType());
+ return this->emitCastPointerIntegral(T, CE);
+ }
+
case CK_ArrayToPointerDecay:
case CK_AtomicToNonAtomic:
case CK_ConstructorConversion:
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
