This is an archive of the discontinued LLVM Phabricator instance.

Differential D8958

[Sema] Don't crash if array bound calculation overflowed constexpr array
ClosedPublic

Authored by majnemer on Apr 10 2015, 12:37 AM.

Details

Reviewers
rsmith
Commits
rGbc4cc14cd77b: [Sema] Don't crash if array bound calculation overflowed constexpr array
rC235251: [Sema] Don't crash if array bound calculation overflowed constexpr array
rL235251: [Sema] Don't crash if array bound calculation overflowed constexpr array
Summary

We didn't correctly expect a QualifiedTypeLoc when faced with fixing a
variable array type into a constant array type.

Diff Detail

Repository
rL LLVM

Event Timeline

majnemer updated this revision to Diff 23576.Apr 10 2015, 12:37 AM
majnemer retitled this revision from to [Sema] Don't crash if array bound calculation overflowed constexpr array.
majnemer updated this object.
majnemer added a reviewer: rsmith.
majnemer added a subscriber: Unknown Object (MLST).
majnemer added a comment.Apr 17 2015, 4:07 PM

Ping.

rsmith accepted this revision.Apr 17 2015, 7:55 PM
rsmith edited edge metadata.

LGTM

This revision is now accepted and ready to land.Apr 17 2015, 7:55 PM
Closed by commit rL235251: [Sema] Don't crash if array bound calculation overflowed constexpr array (authored by majnemer). · Explain WhyApr 17 2015, 9:59 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
cfe/
trunk/
lib/
Sema/
2 lines
test/
CXX/
basic/
basic.types/
2 lines

Diff 23986

cfe/trunk/lib/Sema/SemaDecl.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 4,885 Lines • ▼ Show 20 Linesstatic QualType TryToFixInvalidVariablyModifiedType(QualType T,
} }
return Context.getConstantArrayType(VLATy->getElementType(), return Context.getConstantArrayType(VLATy->getElementType(),
Res, ArrayType::Normal, 0); Res, ArrayType::Normal, 0);
} }
static void static void
FixInvalidVariablyModifiedTypeLoc(TypeLoc SrcTL, TypeLoc DstTL) { FixInvalidVariablyModifiedTypeLoc(TypeLoc SrcTL, TypeLoc DstTL) {
SrcTL = SrcTL.getUnqualifiedLoc();
DstTL = DstTL.getUnqualifiedLoc();
if (PointerTypeLoc SrcPTL = SrcTL.getAs<PointerTypeLoc>()) { if (PointerTypeLoc SrcPTL = SrcTL.getAs<PointerTypeLoc>()) {
PointerTypeLoc DstPTL = DstTL.castAs<PointerTypeLoc>(); PointerTypeLoc DstPTL = DstTL.castAs<PointerTypeLoc>();
FixInvalidVariablyModifiedTypeLoc(SrcPTL.getPointeeLoc(), FixInvalidVariablyModifiedTypeLoc(SrcPTL.getPointeeLoc(),
DstPTL.getPointeeLoc()); DstPTL.getPointeeLoc());
DstPTL.setStarLoc(SrcPTL.getStarLoc()); DstPTL.setStarLoc(SrcPTL.getStarLoc());
return; return;
} }
if (ParenTypeLoc SrcPTL = SrcTL.getAs<ParenTypeLoc>()) { if (ParenTypeLoc SrcPTL = SrcTL.getAs<ParenTypeLoc>()) {
▲ Show 20 Lines • Show All 9,248 Lines • Show Last 20 Lines

cfe/trunk/test/CXX/basic/basic.types/p10.cpp

Show First 20 Lines • Show All 133 Lines • ▼ Show 20 Lines
struct ArrBad { struct ArrBad {
S s[3]; // expected-note {{data member 's' of non-literal type 'S [3]'}} S s[3]; // expected-note {{data member 's' of non-literal type 'S [3]'}}
}; };
constexpr int f(ArrBad) { return 0; } // expected-error {{1st parameter type 'ArrBad' is not a literal type}} constexpr int f(ArrBad) { return 0; } // expected-error {{1st parameter type 'ArrBad' is not a literal type}}
constexpr int arb(int n) { constexpr int arb(int n) {
int a[n]; // expected-error {{variable of non-literal type 'int [n]' cannot be defined in a constexpr function}} int a[n]; // expected-error {{variable of non-literal type 'int [n]' cannot be defined in a constexpr function}}
} }
constexpr long Overflow[ // expected-error {{constexpr variable cannot have non-literal type 'long const[(1 << 30) << 2]'}}
(1 << 30) << 2]{}; // expected-warning {{requires 34 bits to represent}}