Check the entire StackSaveValues stack for VLAs when dealing with goto and return statements. Noticed by Eli Friedman.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@61289 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp
index 6d8f5da..60e8bd6 100644
--- a/lib/CodeGen/CGStmt.cpp
+++ b/lib/CodeGen/CGStmt.cpp
@@ -220,9 +220,11 @@
return;
}
- if (StackSaveValues.back()) {
- CGM.ErrorUnsupported(&S, "goto inside scope with VLA");
- return;
+ for (int i = 0; i < StackSaveValues.size(); i++) {
+ if (StackSaveValues[i]) {
+ CGM.ErrorUnsupported(&S, "goto inside scope with VLA");
+ return;
+ }
}
// If this code is reachable then emit a stop point (if generating
@@ -476,9 +478,11 @@
/// if the function returns void, or may be missing one if the function returns
/// non-void. Fun stuff :).
void CodeGenFunction::EmitReturnStmt(const ReturnStmt &S) {
- if (StackSaveValues.back()) {
- CGM.ErrorUnsupported(&S, "return inside scope with VLA");
- return;
+ for (int i = 0; i < StackSaveValues.size(); i++) {
+ if (StackSaveValues[i]) {
+ CGM.ErrorUnsupported(&S, "return inside scope with VLA");
+ return;
+ }
}
// Emit the result value, even if unused, to evalute the side effects.