aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/AsmParser/llvmAsmParser.y11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/AsmParser/llvmAsmParser.y b/lib/AsmParser/llvmAsmParser.y
index f2135a7ad2..fdc4213436 100644
--- a/lib/AsmParser/llvmAsmParser.y
+++ b/lib/AsmParser/llvmAsmParser.y
@@ -919,8 +919,15 @@ ConstVal: Types '[' ConstVector ']' { // Nonempty unsized arr
if (STy == 0)
ThrowException("Cannot make struct constant with type: '" +
(*$1)->getDescription() + "'!");
- // FIXME: TODO: Check to see that the constants are compatible with the type
- // initializer!
+
+ // Check to ensure that constants are compatible with the type initializer!
+ for (unsigned i = 0, e = $3->size(); i != e; ++i)
+ if ((*$3)[i]->getType() != STy->getElementTypes()[i])
+ ThrowException("Expected type '" +
+ STy->getElementTypes()[i]->getDescription() +
+ "' for element #" + utostr(i) +
+ " of structure initializer!");
+
$$ = ConstantStruct::get(STy, *$3);
delete $1; delete $3;
}