summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2012-01-25 23:20:27 +0000
committerEli Friedman <eli.friedman@gmail.com>2012-01-25 23:20:27 +0000
commit9562f39e2fcfbf9a1f758af8a2c230267e6ae307 (patch)
treed71ba6f1be7c928ea20d372975ce09957a7e3006 /clang/lib
parent29f7dff58194d654a48ccb93bbc3491b0cddcc6f (diff)
downloadbcm5719-llvm-9562f39e2fcfbf9a1f758af8a2c230267e6ae307.tar.gz
bcm5719-llvm-9562f39e2fcfbf9a1f758af8a2c230267e6ae307.zip
Don't stack-allocate an IntegerLiteral which can be referred to after the current method returns. PR11744, part 2.
llvm-svn: 148995
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Sema/TreeTransform.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h
index 5d761d382a7..240445190b8 100644
--- a/clang/lib/Sema/TreeTransform.h
+++ b/clang/lib/Sema/TreeTransform.h
@@ -8325,9 +8325,12 @@ TreeTransform<Derived>::RebuildArrayType(QualType ElementType,
break;
}
- IntegerLiteral ArraySize(SemaRef.Context, *Size, SizeType,
- /*FIXME*/BracketsRange.getBegin());
- return SemaRef.BuildArrayType(ElementType, SizeMod, &ArraySize,
+ // Note that we can return a VariableArrayType here in the case where
+ // the element type was a dependent VariableArrayType.
+ IntegerLiteral *ArraySize
+ = IntegerLiteral::Create(SemaRef.Context, *Size, SizeType,
+ /*FIXME*/BracketsRange.getBegin());
+ return SemaRef.BuildArrayType(ElementType, SizeMod, ArraySize,
IndexTypeQuals, BracketsRange,
getDerived().getBaseEntity());
}
OpenPOWER on IntegriCloud