Author: baldrick
Date: Fri Jan 11 16:36:48 2008
New Revision: 45887
URL: http://llvm.org/viewvc/llvm-project?rev=45887&view=rev
Log:
Do not allow attributes beyond a function's last
parameter, even if it is a varargs function. Do
allow attributes on the varargs part of a call,
but not beyond the last argument. Only allow
selected attributes to be on the varargs part of
a call (currently only 'byval' is allowed). The
reasoning here is that most attributes, eg inreg,
simply make no sense here.
Added:
llvm/trunk/test/Verifier/2008-01-11-VarargAttrs.ll
Modified:
llvm/trunk/include/llvm/ParameterAttributes.h
llvm/trunk/lib/VMCore/Verifier.cpp
Modified: llvm/trunk/include/llvm/ParameterAttributes.h
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ParameterAttributes.h?rev=45887&r1=45886&r2=45887&view=diff
==============================================================================
--- llvm/trunk/include/llvm/ParameterAttributes.h (original)
+++ llvm/trunk/include/llvm/ParameterAttributes.h Fri Jan 11 16:36:48 2008
@@ -52,6 +52,9 @@
/// @brief Attributes that only apply to function return values.
const uint16_t ReturnOnly = NoReturn | NoUnwind | ReadNone | ReadOnly;
+/// @brief Attributes that can apply to vararg call arguments.
+const uint16_t VarArgsCompatible = ByVal;
+
/// @brief Attributes that are mutually incompatible.
const uint16_t MutuallyIncompatible[3] = {
ByVal | InReg | Nest | StructRet,
Modified: llvm/trunk/lib/VMCore/Verifier.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=45887&r1=45886&r2=45887&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Verifier.cpp (original)
+++ llvm/trunk/lib/VMCore/Verifier.cpp Fri Jan 11 16:36:48 2008
@@ -390,11 +390,6 @@
if (!Attrs)
return;
- Assert1(FT->isVarArg() ||
- (Attrs->size() &&
- Attrs->getParamIndex(Attrs->size()-1) <= FT->getNumParams()),
- "Attributes after end of type!", V);
-
bool SawNest = false;
for (unsigned Idx = 0; Idx <= FT->getNumParams(); ++Idx) {
@@ -450,8 +445,15 @@
Assert1(!F.isStructReturn() || FT->getReturnType() == Type::VoidTy,
"Invalid struct-return function!", &F);
+ const ParamAttrsList *Attrs = F.getParamAttrs();
+
+ Assert1(!Attrs ||
+ (Attrs->size() &&
+ Attrs->getParamIndex(Attrs->size()-1) <= FT->getNumParams()),
+ "Attributes after last parameter!", &F);
+
// Check function attributes.
- VerifyParamAttrs(FT, F.getParamAttrs(), &F);
+ VerifyParamAttrs(FT, Attrs, &F);
// Check that this function meets the restrictions on this calling
convention.
switch (F.getCallingConv()) {
@@ -847,8 +849,24 @@
"Call parameter type does not match function signature!",
CS.getArgument(i), FTy->getParamType(i), I);
+ const ParamAttrsList *Attrs = CS.getParamAttrs();
+
+ Assert1(!Attrs ||
+ (Attrs->size() &&
+ Attrs->getParamIndex(Attrs->size()-1) <= CS.arg_size()),
+ "Attributes after last argument!", I);
+
// Verify call attributes.
- VerifyParamAttrs(FTy, CS.getParamAttrs(), I);
+ VerifyParamAttrs(FTy, Attrs, I);
+
+ if (Attrs && FTy->isVarArg())
+ // Check attributes on the varargs part.
+ for (unsigned Idx = 1 + FTy->getNumParams(); Idx <= CS.arg_size(); ++Idx) {
+ uint16_t Attr = Attrs->getParamAttrs(Idx);
+ uint16_t VArgI = Attr & ~ParamAttr::VarArgsCompatible;
+ Assert1(!VArgI, "Attribute " + Attrs->getParamAttrsText(VArgI) +
+ "cannot be used for vararg call arguments!", I);
+ }
visitInstruction(*I);
}
Added: llvm/trunk/test/Verifier/2008-01-11-VarargAttrs.ll
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Verifier/2008-01-11-VarargAttrs.ll?rev=45887&view=auto
==============================================================================
--- llvm/trunk/test/Verifier/2008-01-11-VarargAttrs.ll (added)
+++ llvm/trunk/test/Verifier/2008-01-11-VarargAttrs.ll Fri Jan 11 16:36:48 2008
@@ -0,0 +1,10 @@
+; RUN: not llvm-as < %s
+
+ %struct = type { }
+
+declare void @foo(...)
+
+define void @bar() {
+ call void (...)* @foo(%struct* inreg null )
+ ret void
+}
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
