From sabre at nondot.org  Mon Dec 15 00:34:48 2008
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Dec 2008 06:34:48 -0000
Subject: [llvm-commits] [llvm] r61028 - in /llvm/trunk:
 lib/Target/README.txt test/Transforms/GVN/lpre-call-wrap.ll
Message-ID: <200812150634.mBF6YmeJ025459@zion.cs.uiuc.edu>

Author: lattner
Date: Mon Dec 15 00:34:48 2008
New Revision: 61028

URL: http://llvm.org/viewvc/llvm-project?rev=61028&view=rev
Log:
gvn now hoists this load out of the hot non-call path.

Added:
    llvm/trunk/test/Transforms/GVN/lpre-call-wrap.ll
Modified:
    llvm/trunk/lib/Target/README.txt

Modified: llvm/trunk/lib/Target/README.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=61028&r1=61027&r2=61028&view=diff

==============================================================================
--- llvm/trunk/lib/Target/README.txt (original)
+++ llvm/trunk/lib/Target/README.txt Mon Dec 15 00:34:48 2008
@@ -1404,32 +1404,3 @@
 
 //===---------------------------------------------------------------------===//
 
-This C++ file:
-void g(); struct A { int n; int m; A& operator++(void) { ++n; if (n == m) g(); 
-return *this; }    A() : n(0), m(0) { } friend bool operator!=(A const& a1, 
-A const& a2) { return a1.n != a2.n; } }; void testfunction(A& iter) { A const 
-end; while (iter != end) ++iter; }
-
-Compiles down to:
-
-bb:		; preds = %bb3.backedge, %bb.nph
-	%.rle = phi i32 [ %1, %bb.nph ], [ %7, %bb3.backedge ]		; <i32> [#uses=1]
-	%4 = add i32 %.rle, 1		; <i32> [#uses=2]
-	store i32 %4, i32* %0, align 4
-	%5 = load i32* %3, align 4		; <i32> [#uses=1]
-	%6 = icmp eq i32 %4, %5		; <i1> [#uses=1]
-	br i1 %6, label %bb1, label %bb3.backedge
-
-bb1:		; preds = %bb
-	tail call void @_Z1gv()
-	br label %bb3.backedge
-
-bb3.backedge:		; preds = %bb, %bb1
-	%7 = load i32* %0, align 4		; <i32> [#uses=2]
-
-
-The %7 load is partially redundant with the store of %4 to %0, GVN's PRE 
-should remove it, but it doesn't apply to memory objects.
-
-//===---------------------------------------------------------------------===//
-

Added: llvm/trunk/test/Transforms/GVN/lpre-call-wrap.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/lpre-call-wrap.ll?rev=61028&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/GVN/lpre-call-wrap.ll (added)
+++ llvm/trunk/test/Transforms/GVN/lpre-call-wrap.ll Mon Dec 15 00:34:48 2008
@@ -0,0 +1,54 @@
+; RUN: llvm-as < %s | opt -gvn -enable-load-pre | llvm-dis > %t
+; RUN: %prcontext bb3.backedge: 2 < %t | grep phi
+; RUN: %prcontext bb3.backedge: 2 < %t | not grep load
+;
+; Make sure the load in bb3.backedge is removed and moved into bb1 after the 
+; call.  This makes the non-call case faster. 
+;
+; This test is derived from this C++ code:
+; void g();
+; struct A { 
+;   int n; int m;
+;   A& operator++(void) { ++n; if (n == m) g(); return *this; }
+;   A() : n(0), m(0) { } 
+;   friend bool operator!=(A const& a1, A const& a2) { return a1.n != a2.n; }
+; };
+; void testfunction(A& iter) { A const end; while (iter != end) ++iter; }
+;
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+target triple = "i386-apple-darwin7"
+	%struct.A = type { i32, i32 }
+
+define void @_Z12testfunctionR1A(%struct.A* %iter) {
+entry:
+	%0 = getelementptr %struct.A* %iter, i32 0, i32 0		; <i32*> [#uses=3]
+	%1 = load i32* %0, align 4		; <i32> [#uses=2]
+	%2 = icmp eq i32 %1, 0		; <i1> [#uses=1]
+	br i1 %2, label %return, label %bb.nph
+
+bb.nph:		; preds = %entry
+	%3 = getelementptr %struct.A* %iter, i32 0, i32 1		; <i32*> [#uses=1]
+	br label %bb
+
+bb:		; preds = %bb3.backedge, %bb.nph
+	%.rle = phi i32 [ %1, %bb.nph ], [ %7, %bb3.backedge ]		; <i32> [#uses=1]
+	%4 = add i32 %.rle, 1		; <i32> [#uses=2]
+	store i32 %4, i32* %0, align 4
+	%5 = load i32* %3, align 4		; <i32> [#uses=1]
+	%6 = icmp eq i32 %4, %5		; <i1> [#uses=1]
+	br i1 %6, label %bb1, label %bb3.backedge
+
+bb1:		; preds = %bb
+	tail call void @_Z1gv()
+	br label %bb3.backedge
+
+bb3.backedge:		; preds = %bb, %bb1
+	%7 = load i32* %0, align 4		; <i32> [#uses=2]
+	%8 = icmp eq i32 %7, 0		; <i1> [#uses=1]
+	br i1 %8, label %return, label %bb
+
+return:		; preds = %bb3.backedge, %entry
+	ret void
+}
+
+declare void @_Z1gv()




From wangmp at apple.com  Mon Dec 15 00:57:03 2008
From: wangmp at apple.com (Mon P Wang)
Date: Mon, 15 Dec 2008 06:57:03 -0000
Subject: [llvm-commits] [llvm] r61029 - in /llvm/trunk:
 lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
 lib/CodeGen/SelectionDAG/LegalizeTypes.h
 lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp
 test/CodeGen/X86/insertelement-legalize.ll
Message-ID: <200812150657.mBF6v3CU026129@zion.cs.uiuc.edu>

Author: wangmp
Date: Mon Dec 15 00:57:02 2008
New Revision: 61029

URL: http://llvm.org/viewvc/llvm-project?rev=61029&view=rev
Log:
Added support to LegalizeType for expanding the operands of scalar to vector
and insert vector element.  Modified extract vector element to extend the
result to match the expected promoted type.

Added:
    llvm/trunk/test/CodeGen/X86/insertelement-legalize.ll
Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp?rev=61029&r1=61028&r2=61029&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Mon Dec 15 00:57:02 2008
@@ -359,8 +359,10 @@
   if (TLI.isBigEndian())
     std::swap(Lo, Hi);
 
+  // Signed extend to the promoted type.
   SDValue Odd = DAG.getNode(ISD::TRUNCATE, MVT::i1, OldIdx);
-  return DAG.getNode(ISD::SELECT, NewVT, Odd, Hi, Lo);
+  SDValue Res = DAG.getNode(ISD::SELECT, NewVT, Odd, Hi, Lo);
+  return DAG.getNode(ISD::ANY_EXTEND, TLI.getTypeToTransformTo(OldVT), Res);
 }
 
 SDValue DAGTypeLegalizer::PromoteIntRes_FP_TO_XINT(SDNode *N) {
@@ -1938,9 +1940,11 @@
       assert(0 && "Do not know how to expand this operator's operand!");
       abort();
 
-    case ISD::BUILD_VECTOR:    Res = ExpandOp_BUILD_VECTOR(N); break;
-    case ISD::BIT_CONVERT:     Res = ExpandOp_BIT_CONVERT(N); break;
-    case ISD::EXTRACT_ELEMENT: Res = ExpandOp_EXTRACT_ELEMENT(N); break;
+    case ISD::BUILD_VECTOR:      Res = ExpandOp_BUILD_VECTOR(N); break;
+    case ISD::BIT_CONVERT:       Res = ExpandOp_BIT_CONVERT(N); break;
+    case ISD::EXTRACT_ELEMENT:   Res = ExpandOp_EXTRACT_ELEMENT(N); break;
+    case ISD::INSERT_VECTOR_ELT: Res = ExpandOp_INSERT_VECTOR_ELT(N); break;
+    case ISD::SCALAR_TO_VECTOR:  Res = ExpandOp_SCALAR_TO_VECTOR(N); break;
 
     case ISD::BR_CC:      Res = ExpandIntOp_BR_CC(N); break;
     case ISD::SELECT_CC:  Res = ExpandIntOp_SELECT_CC(N); break;

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h?rev=61029&r1=61028&r2=61029&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h Mon Dec 15 00:57:02 2008
@@ -613,11 +613,12 @@
   void ExpandRes_VAARG             (SDNode *N, SDValue &Lo, SDValue &Hi);
 
   // Generic Operand Expansion.
-  SDValue ExpandOp_BIT_CONVERT    (SDNode *N);
-  SDValue ExpandOp_BUILD_VECTOR   (SDNode *N);
-  SDValue ExpandOp_EXTRACT_ELEMENT(SDNode *N);
-  SDValue ExpandOp_NormalStore    (SDNode *N, unsigned OpNo);
-
+  SDValue ExpandOp_BIT_CONVERT      (SDNode *N);
+  SDValue ExpandOp_BUILD_VECTOR     (SDNode *N);
+  SDValue ExpandOp_EXTRACT_ELEMENT  (SDNode *N);
+  SDValue ExpandOp_INSERT_VECTOR_ELT(SDNode *N);
+  SDValue ExpandOp_SCALAR_TO_VECTOR (SDNode *N);
+  SDValue ExpandOp_NormalStore      (SDNode *N, unsigned OpNo);
 };
 
 } // end namespace llvm.

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp?rev=61029&r1=61028&r2=61029&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp Mon Dec 15 00:57:02 2008
@@ -280,6 +280,49 @@
   return cast<ConstantSDNode>(N->getOperand(1))->getZExtValue() ? Hi : Lo;
 }
 
+SDValue DAGTypeLegalizer::ExpandOp_INSERT_VECTOR_ELT(SDNode *N) {
+  // The vector type is legal but the element type needs expansion.
+  MVT VecVT = N->getValueType(0);
+  unsigned NumElts = VecVT.getVectorNumElements();
+
+  SDValue Val = N->getOperand(1);
+  MVT OldEVT = Val.getValueType();
+  MVT NewEVT = TLI.getTypeToTransformTo(OldEVT);
+
+  assert(OldEVT == VecVT.getVectorElementType() &&
+         "Inserted element type doesn't match vector element type!");
+
+  // Bitconvert to a vector of twice the length with elements of the expanded
+  // type, insert the expanded vector elements, and then convert back.
+  MVT NewVecVT = MVT::getVectorVT(NewEVT, NumElts*2);
+  SDValue NewVec = DAG.getNode(ISD::BIT_CONVERT, NewVecVT, N->getOperand(0));
+
+  SDValue Lo, Hi;
+  GetExpandedOp(Val, Lo, Hi);
+  if (TLI.isBigEndian())
+    std::swap(Lo, Hi);
+
+  SDValue Idx = N->getOperand(2);
+  Idx = DAG.getNode(ISD::ADD, Idx.getValueType(), Idx, Idx);
+  NewVec = DAG.getNode(ISD::INSERT_VECTOR_ELT, NewVecVT, NewVec, Lo, Idx);
+  Idx = DAG.getNode(ISD::ADD,Idx.getValueType(), Idx, DAG.getIntPtrConstant(1));
+  NewVec =  DAG.getNode(ISD::INSERT_VECTOR_ELT, NewVecVT, NewVec, Hi, Idx);
+
+  // Convert the new vector to the old vector type.
+  return DAG.getNode(ISD::BIT_CONVERT, VecVT, NewVec);
+}
+
+SDValue DAGTypeLegalizer::ExpandOp_SCALAR_TO_VECTOR(SDNode *N) {
+  MVT VT = N->getValueType(0);
+  unsigned NumElts = VT.getVectorNumElements();
+  SmallVector<SDValue, 16> Ops(NumElts);
+  Ops[0] = N->getOperand(0);
+  SDValue UndefVal = DAG.getNode(ISD::UNDEF, Ops[0].getValueType());
+  for (unsigned i = 1; i < NumElts; ++i)
+    Ops[i] = UndefVal;
+  return DAG.getNode(ISD::BUILD_VECTOR, VT, &Ops[0], NumElts);
+}
+
 SDValue DAGTypeLegalizer::ExpandOp_NormalStore(SDNode *N, unsigned OpNo) {
   assert(ISD::isNormalStore(N) && "This routine only for normal stores!");
   assert(OpNo == 1 && "Can only expand the stored value so far");

Added: llvm/trunk/test/CodeGen/X86/insertelement-legalize.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/insertelement-legalize.ll?rev=61029&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/insertelement-legalize.ll (added)
+++ llvm/trunk/test/CodeGen/X86/insertelement-legalize.ll Mon Dec 15 00:57:02 2008
@@ -0,0 +1,10 @@
+; RUN: llvm-as < %s | llc -march=x86 -disable-mmx
+
+; Test to check that we properly legalize an insert vector element
+define void @test(<2 x i64> %val, <2 x i64>* %dst, i64 %x) nounwind {
+entry:
+	%tmp4 = insertelement <2 x i64> %val, i64 %x, i32 0		; <<2 x i64>> [#uses=1]
+	%add = add <2 x i64> %tmp4, %val		; <<2 x i64>> [#uses=1]
+	store <2 x i64> %add, <2 x i64>* %dst
+	ret void
+}




From monping at apple.com  Mon Dec 15 00:57:06 2008
From: monping at apple.com (Mon Ping Wang)
Date: Sun, 14 Dec 2008 22:57:06 -0800
Subject: [llvm-commits] Patch: LegalizeType for promoting some operands
In-Reply-To: <200812142111.51375.baldrick@free.fr>
References: <7BF246A0-A2EB-4C0E-A20F-0A65A0A62BBC@apple.com>
	<200812142111.51375.baldrick@free.fr>
Message-ID: <097BCB71-324A-4544-BA2B-B2EAA1A2231C@apple.com>

Hi Duncan,

On Dec 14, 2008, at 9:11 PM, Duncan Sands wrote:

> Hi Mon Ping,
>
>> -  return DAG.getNode(ISD::SELECT, NewVT, Odd, Hi, Lo);
>> +  SDValue Res = DAG.getNode(ISD::SELECT, NewVT, Odd, Hi, Lo);
>> +  MVT NVT = TLI.getTypeToTransformTo(OldVT);
>> +  if (Res.getValueType() != NVT) {
>> +    assert(Res.getValueType().getSizeInBits() < NVT.getSizeInBits 
>> () &&
>> +           "Unexpected Result Type");
>> +    Res = DAG.getNode(ISD::ANY_EXTEND, NVT, Res);
>> +  }
>
> you might as well not bother testing Res.getValueType() != NVT, and
> always do the extension.  If the types are equal then SelectionDAG
> will fold the node and simply return Res.  The assertion is also
> useless: this is checked by the getNode call.
>

I have removed this test.

>> +  MVT OldEVT = Val.getValueType();
>
> Please add an assertion that this is the same as the vector element
> type.
>
Done.

>> +  // BitConvert a vector of twice the length out of the expanded  
>> elements,
>
> -> Bitconvert to a vector of twice the length with elements of the  
> expanded type,
>
>> +  SDValue Idx = N->getOperand(2);
>> +  if (ConstantSDNode *CIdx = dyn_cast<ConstantSDNode>(Idx)) {
>> +    unsigned IdxVal = CIdx->getZExtValue()*2;
>> +    NewVec = DAG.getNode(ISD::INSERT_VECTOR_ELT, NewVecVT, NewVec,  
>> Lo,
>> +                         DAG.getIntPtrConstant(IdxVal));
>> +    NewVec =  DAG.getNode(ISD::INSERT_VECTOR_ELT, NewVecVT,  
>> NewVec, Hi,
>> +                          DAG.getIntPtrConstant(IdxVal + 1));
>> +  } else {
>> +    Idx = DAG.getNode(ISD::SHL, Idx.getValueType(), Idx,
>> +                      DAG.getIntPtrConstant(1));
>> +    NewVec = DAG.getNode(ISD::INSERT_VECTOR_ELT, NewVecVT, NewVec,  
>> Lo,
>> Idx); +    Idx = DAG.getNode(ISD::ADD, Idx.getValueType(), Idx,
>> +                      DAG.getIntPtrConstant(1));
>> +    NewVec =  DAG.getNode(ISD::INSERT_VECTOR_ELT, NewVecVT,  
>> NewVec, Hi,
>> Idx); +  }
>
> I think you should drop the special version for constants, and keep
> the second version.  Also, in the second version it seems better to
> calculate 2*Idx by adding Idx to itself, rather than shifting left
> by 1.
>

Since DAGCombine will optimized the case of a constant, I remove the  
special version to keep the code cleaner.

>> +  for (unsigned i=1; i < NumElts; ++i)
>
> Missing spaces around the equals sign.
>

Done.

Thanks for the review,
   -- Mon Ping



From nicholas at mxc.ca  Mon Dec 15 01:29:55 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Mon, 15 Dec 2008 07:29:55 -0000
Subject: [llvm-commits] [llvm] r61030 - in /llvm/trunk:
 include/llvm/Attributes.h lib/AsmParser/llvmAsmParser.y
 lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Attributes.cpp
Message-ID: <200812150729.mBF7Ttg3027174@zion.cs.uiuc.edu>

Author: nicholas
Date: Mon Dec 15 01:29:55 2008
New Revision: 61030

URL: http://llvm.org/viewvc/llvm-project?rev=61030&view=rev
Log:
It turns out that "align 1" and unaligned are different. Add a bias to the
alignment attribute such that 0 means unaligned.

This will probably require a rebuild of llvm-gcc because of the change to
Attributes.h. If you see many test failures on "make check", please rebuild
your llvm-gcc.

Modified:
    llvm/trunk/include/llvm/Attributes.h
    llvm/trunk/lib/AsmParser/llvmAsmParser.y
    llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
    llvm/trunk/lib/VMCore/Attributes.cpp

Modified: llvm/trunk/include/llvm/Attributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=61030&r1=61029&r2=61030&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Attributes.h (original)
+++ llvm/trunk/include/llvm/Attributes.h Mon Dec 15 01:29:55 2008
@@ -51,7 +51,8 @@
 const Attributes StackProtect    = 1<<14; ///< Stack protection.
 const Attributes StackProtectReq = 1<<15; ///< Stack protection required.
 const Attributes Alignment = 31<<16; ///< Alignment of parameter (5 bits)
-                                     // stored as log2 of alignment.
+                                     // stored as log2 of alignment with +1 bias
+                                     // 0 means unaligned different from align 1
 const Attributes NoCapture = 1<<21; ///< Function creates no aliases of pointer
 
 /// @brief Attributes that only apply to function parameters.
@@ -79,7 +80,8 @@
 /// form used internally in Attributes.
 inline Attributes constructAlignmentFromInt(unsigned i) {
   assert(isPowerOf2_32(i) && "Alignment must be a power of two.");
-  return Log2_32(i) << 16;
+  assert(i <= 0x40000000 && "Alignment too large.");
+  return (Log2_32(i)+1) << 16;
 }
 
 /// The set of Attributes set in Attributes is converted to a
@@ -178,7 +180,7 @@
   /// getParamAlignment - Return the alignment for the specified function
   /// parameter.
   unsigned getParamAlignment(unsigned Idx) const {
-    return (getAttributes(Idx) & Attribute::Alignment) >> 16;
+    return 1ull << (((getAttributes(Idx) & Attribute::Alignment) >> 16) - 1);
   }
   
   /// hasAttrSomewhere - Return true if the specified attribute is set for at

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=61030&r1=61029&r2=61030&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Mon Dec 15 01:29:55 2008
@@ -1332,6 +1332,8 @@
   $$ = $2;
   if ($$ != 0 && !isPowerOf2_32($$))
     GEN_ERROR("Alignment must be a power of two");
+  if ($$ > 0x40000000)
+    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 };
 OptCAlign : /*empty*/            { $$ = 0; } |
@@ -1339,6 +1341,8 @@
   $$ = $3;
   if ($$ != 0 && !isPowerOf2_32($$))
     GEN_ERROR("Alignment must be a power of two");
+  if ($$ > 0x40000000)
+    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 };
 
@@ -1368,6 +1372,8 @@
   | ALIGN EUINT64VAL {
     if ($2 != 0 && !isPowerOf2_32($2))
       GEN_ERROR("Alignment must be a power of two");
+    if ($2 > 0x40000000)
+      GEN_ERROR("Alignment too large");
     CurGV->setAlignment($2);
     CHECK_FOR_ERROR
   };

Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=61030&r1=61029&r2=61030&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
+++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Mon Dec 15 01:29:55 2008
@@ -128,7 +128,8 @@
       // 5-bit log2 encoded value. Shift the bits above the alignment up by
       // 11 bits.
       uint64_t FauxAttr = PAWI.Attrs & 0xffff;
-      FauxAttr |= (1ull<<16)<<((PAWI.Attrs & Attribute::Alignment) >> 16);
+      if (PAWI.Attrs & Attribute::Alignment)
+        FauxAttr |= (1ull<<16)<<(((PAWI.Attrs & Attribute::Alignment)-1) >> 16);
       FauxAttr |= (PAWI.Attrs & (0x3FFull << 21)) << 11;
 
       Record.push_back(FauxAttr);

Modified: llvm/trunk/lib/VMCore/Attributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?rev=61030&r1=61029&r2=61030&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Attributes.cpp (original)
+++ llvm/trunk/lib/VMCore/Attributes.cpp Mon Dec 15 01:29:55 2008
@@ -61,7 +61,7 @@
     Result += "sspreq ";
   if (Attrs & Attribute::Alignment) {
     Result += "align ";
-    Result += utostr(1ull << ((Attrs & Attribute::Alignment)>>16));
+    Result += utostr(1ull << (((Attrs & Attribute::Alignment)>>16) - 1));
     Result += " ";
   }
   // Trim the trailing space.




From nicholas at mxc.ca  Mon Dec 15 01:31:07 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Mon, 15 Dec 2008 07:31:07 -0000
Subject: [llvm-commits] [llvm] r61031 - in /llvm/trunk/lib/AsmParser:
 llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y.cvs
Message-ID: <200812150731.mBF7V8pM027229@zion.cs.uiuc.edu>

Author: nicholas
Date: Mon Dec 15 01:31:07 2008
New Revision: 61031

URL: http://llvm.org/viewvc/llvm-project?rev=61031&view=rev
Log:
Update generated files after nocapture syntax change.

Modified:
    llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs?rev=61031&r1=61030&r2=61031&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Mon Dec 15 01:31:07 2008
@@ -219,8 +219,8 @@
      SRET = 400,
      NOUNWIND = 401,
      NOALIAS = 402,
-     BYVAL = 403,
-     NEST = 404,
+     NOCAPTURE = 403,
+     BYVAL = 404,
      READNONE = 405,
      READONLY = 406,
      GC = 407,
@@ -229,9 +229,10 @@
      ALWAYSINLINE = 410,
      SSP = 411,
      SSPREQ = 412,
-     DEFAULT = 413,
-     HIDDEN = 414,
-     PROTECTED = 415
+     NEST = 413,
+     DEFAULT = 414,
+     HIDDEN = 415,
+     PROTECTED = 416
    };
 #endif
 /* Tokens.  */
@@ -380,8 +381,8 @@
 #define SRET 400
 #define NOUNWIND 401
 #define NOALIAS 402
-#define BYVAL 403
-#define NEST 404
+#define NOCAPTURE 403
+#define BYVAL 404
 #define READNONE 405
 #define READONLY 406
 #define GC 407
@@ -390,9 +391,10 @@
 #define ALWAYSINLINE 410
 #define SSP 411
 #define SSPREQ 412
-#define DEFAULT 413
-#define HIDDEN 414
-#define PROTECTED 415
+#define NEST 413
+#define DEFAULT 414
+#define HIDDEN 415
+#define PROTECTED 416
 
 
 
@@ -1440,7 +1442,7 @@
   llvm::FCmpInst::Predicate         FPredicate;
 }
 /* Line 187 of yacc.c.  */
-#line 1444 "llvmAsmParser.tab.c"
+#line 1446 "llvmAsmParser.tab.c"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -1453,7 +1455,7 @@
 
 
 /* Line 216 of yacc.c.  */
-#line 1457 "llvmAsmParser.tab.c"
+#line 1459 "llvmAsmParser.tab.c"
 
 #ifdef short
 # undef short
@@ -1668,20 +1670,20 @@
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  44
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2434
+#define YYLAST   2372
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  175
+#define YYNTOKENS  176
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  87
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  351
+#define YYNRULES  352
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  711
+#define YYNSTATES  712
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   415
+#define YYMAXUTOK   416
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -1693,15 +1695,15 @@
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     161,   162,   165,     2,   164,     2,     2,     2,     2,     2,
+     162,   163,   166,     2,   165,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     170,   163,   171,     2,     2,     2,     2,     2,     2,     2,
+     171,   164,   172,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   167,   166,   169,     2,     2,     2,     2,     2,   174,
+       2,   168,   167,   170,     2,     2,     2,     2,     2,   175,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     168,     2,     2,   172,     2,   173,     2,     2,     2,     2,
+     169,     2,     2,   173,     2,   174,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1730,7 +1732,7 @@
      125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
      135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
      145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160
+     155,   156,   157,   158,   159,   160,   161
 };
 
 #if YYDEBUG
@@ -1749,37 +1751,37 @@
      160,   162,   164,   166,   167,   169,   171,   172,   174,   176,
      178,   180,   181,   183,   185,   186,   188,   190,   192,   194,
      196,   199,   201,   203,   205,   207,   209,   211,   213,   215,
-     217,   220,   221,   224,   226,   228,   230,   232,   233,   236,
+     217,   219,   222,   223,   226,   228,   230,   232,   234,   235,
      238,   240,   242,   244,   246,   248,   250,   252,   254,   256,
-     258,   260,   261,   264,   265,   268,   269,   272,   273,   277,
-     280,   281,   283,   284,   288,   290,   293,   295,   297,   299,
-     301,   303,   305,   307,   309,   311,   315,   317,   320,   326,
-     332,   338,   344,   348,   351,   357,   362,   365,   367,   369,
-     371,   375,   377,   381,   383,   384,   386,   390,   395,   399,
-     403,   408,   413,   417,   424,   430,   433,   436,   439,   442,
-     445,   448,   451,   454,   457,   460,   463,   466,   473,   479,
-     488,   495,   502,   510,   518,   526,   534,   541,   550,   559,
-     565,   573,   577,   579,   581,   583,   585,   586,   589,   596,
-     598,   599,   601,   604,   605,   609,   610,   614,   618,   622,
-     626,   627,   636,   637,   647,   648,   658,   664,   667,   671,
-     673,   677,   681,   685,   689,   691,   692,   698,   702,   704,
-     708,   710,   711,   723,   725,   727,   732,   734,   736,   739,
-     743,   744,   746,   748,   750,   752,   754,   756,   758,   760,
-     762,   764,   766,   770,   774,   777,   780,   784,   787,   793,
-     798,   800,   806,   808,   810,   812,   814,   816,   818,   821,
-     823,   827,   830,   833,   837,   841,   844,   845,   847,   850,
-     853,   857,   867,   877,   886,   902,   904,   906,   913,   919,
-     922,   925,   932,   940,   945,   950,   957,   964,   965,   966,
-     970,   973,   977,   980,   982,   988,   994,  1001,  1008,  1015,
-    1022,  1027,  1034,  1039,  1044,  1051,  1058,  1061,  1071,  1073,
-    1075,  1076,  1080,  1087,  1091,  1098,  1101,  1107,  1115,  1121,
-    1126,  1131
+     258,   260,   262,   263,   266,   267,   270,   271,   274,   275,
+     279,   282,   283,   285,   286,   290,   292,   295,   297,   299,
+     301,   303,   305,   307,   309,   311,   313,   317,   319,   322,
+     328,   334,   340,   346,   350,   353,   359,   364,   367,   369,
+     371,   373,   377,   379,   383,   385,   386,   388,   392,   397,
+     401,   405,   410,   415,   419,   426,   432,   435,   438,   441,
+     444,   447,   450,   453,   456,   459,   462,   465,   468,   475,
+     481,   490,   497,   504,   512,   520,   528,   536,   543,   552,
+     561,   567,   575,   579,   581,   583,   585,   587,   588,   591,
+     598,   600,   601,   603,   606,   607,   611,   612,   616,   620,
+     624,   628,   629,   638,   639,   649,   650,   660,   666,   669,
+     673,   675,   679,   683,   687,   691,   693,   694,   700,   704,
+     706,   710,   712,   713,   725,   727,   729,   734,   736,   738,
+     741,   745,   746,   748,   750,   752,   754,   756,   758,   760,
+     762,   764,   766,   768,   772,   776,   779,   782,   786,   789,
+     795,   800,   802,   808,   810,   812,   814,   816,   818,   820,
+     823,   825,   829,   832,   835,   839,   843,   846,   847,   849,
+     852,   855,   859,   869,   879,   888,   904,   906,   908,   915,
+     921,   924,   927,   934,   942,   947,   952,   959,   966,   967,
+     968,   972,   975,   979,   982,   984,   990,   996,  1003,  1010,
+    1017,  1024,  1029,  1036,  1041,  1046,  1053,  1060,  1063,  1073,
+    1075,  1077,  1078,  1082,  1089,  1093,  1100,  1103,  1109,  1117,
+    1123,  1128,  1133
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     222,     0,    -1,    75,    -1,    76,    -1,    77,    -1,    78,
+     223,     0,    -1,    75,    -1,    76,    -1,    77,    -1,    78,
       -1,    79,    -1,    80,    -1,    81,    -1,    82,    -1,    83,
       -1,    87,    -1,    88,    -1,    89,    -1,    84,    -1,    85,
       -1,    86,    -1,   120,    -1,   121,    -1,   122,    -1,   123,
@@ -1790,109 +1792,110 @@
       -1,   106,    -1,   107,    -1,   108,    -1,   109,    -1,   110,
       -1,   111,    -1,   112,    -1,   113,    -1,   100,    -1,   101,
       -1,   102,    -1,   103,    -1,    26,    -1,    27,    -1,    19,
-      -1,    22,    -1,    24,    -1,   181,    -1,    -1,    55,   161,
-       4,   162,    -1,    -1,   181,   163,    -1,    -1,     7,   163,
-      -1,    20,    -1,    23,    -1,   188,    -1,    -1,   186,   163,
+      -1,    22,    -1,    24,    -1,   182,    -1,    -1,    55,   162,
+       4,   163,    -1,    -1,   182,   164,    -1,    -1,     7,   164,
+      -1,    20,    -1,    23,    -1,   189,    -1,    -1,   187,   164,
       -1,    42,    -1,    44,    -1,    43,    -1,    45,    -1,    47,
       -1,    49,    -1,    46,    -1,    48,    -1,    51,    -1,    -1,
-     158,    -1,   159,    -1,   160,    -1,    -1,    46,    -1,    48,
+     159,    -1,   160,    -1,   161,    -1,    -1,    46,    -1,    48,
       -1,    -1,    42,    -1,    43,    -1,    44,    -1,    47,    -1,
       -1,    44,    -1,    42,    -1,    -1,    63,    -1,    64,    -1,
       65,    -1,    66,    -1,    67,    -1,    62,     4,    -1,   142,
       -1,   121,    -1,   141,    -1,   122,    -1,   144,    -1,   145,
-      -1,   147,    -1,   148,    -1,   149,    -1,    54,     4,    -1,
-      -1,   197,   196,    -1,   144,    -1,   142,    -1,   141,    -1,
-     147,    -1,    -1,   199,   198,    -1,   143,    -1,   146,    -1,
-     144,    -1,   142,    -1,   141,    -1,   150,    -1,   151,    -1,
-     154,    -1,   155,    -1,   153,    -1,   156,    -1,   157,    -1,
-      -1,   201,   200,    -1,    -1,   152,    22,    -1,    -1,    54,
-       4,    -1,    -1,   164,    54,     4,    -1,    34,    22,    -1,
-      -1,   205,    -1,    -1,   164,   208,   207,    -1,   205,    -1,
-      54,     4,    -1,    11,    -1,    12,    -1,    13,    -1,    16,
-      -1,    15,    -1,    14,    -1,    17,    -1,    50,    -1,   209,
-      -1,   210,   183,   165,    -1,   244,    -1,   166,     4,    -1,
-     210,   161,   214,   162,   201,    -1,    10,   161,   214,   162,
-     201,    -1,   167,     4,   168,   210,   169,    -1,   170,     4,
-     168,   210,   171,    -1,   172,   215,   173,    -1,   172,   173,
-      -1,   170,   172,   215,   173,   171,    -1,   170,   172,   173,
-     171,    -1,   210,   197,    -1,   210,    -1,    10,    -1,   211,
-      -1,   213,   164,   211,    -1,   213,    -1,   213,   164,    39,
-      -1,    39,    -1,    -1,   210,    -1,   215,   164,   210,    -1,
-     210,   167,   218,   169,    -1,   210,   167,   169,    -1,   210,
-     174,    22,    -1,   210,   170,   218,   171,    -1,   210,   172,
-     218,   173,    -1,   210,   172,   173,    -1,   210,   170,   172,
-     218,   173,   171,    -1,   210,   170,   172,   173,   171,    -1,
-     210,    40,    -1,   210,    41,    -1,   210,   244,    -1,   210,
-     217,    -1,   210,    25,    -1,   210,     3,    -1,   210,     5,
-      -1,   210,     4,    -1,   210,     6,    -1,   210,    26,    -1,
-     210,    27,    -1,   210,     9,    -1,   178,   161,   216,    38,
-     210,   162,    -1,   119,   161,   216,   256,   162,    -1,   133,
-     161,   216,   164,   216,   164,   216,   162,    -1,   176,   161,
-     216,   164,   216,   162,    -1,   177,   161,   216,   164,   216,
-     162,    -1,    90,   179,   161,   216,   164,   216,   162,    -1,
-      91,   180,   161,   216,   164,   216,   162,    -1,    92,   179,
-     161,   216,   164,   216,   162,    -1,    93,   180,   161,   216,
-     164,   216,   162,    -1,   135,   161,   216,   164,   216,   162,
-      -1,   136,   161,   216,   164,   216,   164,   216,   162,    -1,
-     137,   161,   216,   164,   216,   164,   216,   162,    -1,   139,
-     161,   216,   257,   162,    -1,   140,   161,   216,   164,   216,
-     257,   162,    -1,   218,   164,   216,    -1,   216,    -1,    32,
-      -1,    33,    -1,    37,    -1,    -1,   212,   244,    -1,   125,
-     161,   221,    38,   210,   162,    -1,   223,    -1,    -1,   224,
-      -1,   223,   224,    -1,    -1,    31,   225,   240,    -1,    -1,
-      30,   226,   241,    -1,    60,    59,   230,    -1,   184,    18,
-     210,    -1,   184,    18,    10,    -1,    -1,   187,   191,   220,
-     219,   216,   183,   227,   207,    -1,    -1,   187,   189,   191,
-     220,   219,   216,   183,   228,   207,    -1,    -1,   187,   190,
-     191,   220,   219,   210,   183,   229,   207,    -1,   187,   191,
-      35,   194,   221,    -1,    52,   231,    -1,    56,   163,   232,
-      -1,    22,    -1,    53,   163,    22,    -1,    68,   163,    22,
-      -1,   167,   233,   169,    -1,   233,   164,    22,    -1,    22,
-      -1,    -1,   234,   164,   210,   197,   182,    -1,   210,   197,
-     182,    -1,   234,    -1,   234,   164,    39,    -1,    39,    -1,
-      -1,   195,   199,   212,   186,   161,   235,   162,   201,   206,
-     203,   202,    -1,    28,    -1,   172,    -1,   193,   191,   236,
-     237,    -1,    29,    -1,   173,    -1,   248,   239,    -1,   192,
-     191,   236,    -1,    -1,    61,    -1,     3,    -1,     4,    -1,
-       5,    -1,     6,    -1,     9,    -1,    26,    -1,    27,    -1,
-      40,    -1,    41,    -1,    25,    -1,   170,   218,   171,    -1,
-     167,   218,   169,    -1,   167,   169,    -1,   174,    22,    -1,
-     172,   218,   173,    -1,   172,   173,    -1,   170,   172,   218,
-     173,   171,    -1,   170,   172,   173,   171,    -1,   217,    -1,
-      59,   242,    22,   164,    22,    -1,     7,    -1,     8,    -1,
-     181,    -1,   186,    -1,   244,    -1,   243,    -1,   210,   245,
-      -1,   246,    -1,   247,   164,   246,    -1,   248,   249,    -1,
-     238,   249,    -1,   250,   184,   251,    -1,   250,   185,   251,
-      -1,   250,   253,    -1,    -1,    21,    -1,    69,   247,    -1,
-      69,    10,    -1,    70,    17,   245,    -1,    70,    11,   245,
-     164,    17,   245,   164,    17,   245,    -1,    71,    11,   245,
-     164,    17,   245,   167,   252,   169,    -1,    71,    11,   245,
-     164,    17,   245,   167,   169,    -1,    72,   195,   199,   212,
-     245,   161,   255,   162,   201,    38,    17,   245,    73,    17,
-     245,    -1,    73,    -1,    74,    -1,   252,    11,   243,   164,
-      17,   245,    -1,    11,   243,   164,    17,   245,    -1,   184,
-     259,    -1,   185,   259,    -1,   210,   167,   245,   164,   245,
-     169,    -1,   254,   164,   167,   245,   164,   245,   169,    -1,
-     210,   197,   245,   197,    -1,    17,   197,   245,   197,    -1,
-     255,   164,   210,   197,   245,   197,    -1,   255,   164,    17,
-     197,   245,   197,    -1,    -1,    -1,   256,   164,   246,    -1,
-     164,     4,    -1,   257,   164,     4,    -1,    58,    57,    -1,
-      57,    -1,   176,   210,   245,   164,   245,    -1,   177,   210,
-     245,   164,   245,    -1,    90,   179,   210,   245,   164,   245,
-      -1,    91,   180,   210,   245,   164,   245,    -1,    92,   179,
-     210,   245,   164,   245,    -1,    93,   180,   210,   245,   164,
-     245,    -1,   178,   246,    38,   210,    -1,   133,   246,   164,
-     246,   164,   246,    -1,   134,   246,   164,   210,    -1,   135,
-     246,   164,   246,    -1,   136,   246,   164,   246,   164,   246,
-      -1,   137,   246,   164,   246,   164,   246,    -1,   132,   254,
-      -1,   258,   195,   199,   212,   245,   161,   255,   162,   201,
-      -1,   261,    -1,    36,    -1,    -1,   114,   210,   204,    -1,
-     114,   210,   164,    11,   245,   204,    -1,   115,   210,   204,
-      -1,   115,   210,   164,    11,   245,   204,    -1,   116,   246,
-      -1,   260,   117,   210,   245,   204,    -1,   260,   118,   246,
-     164,   210,   245,   204,    -1,   138,   210,   245,   164,     4,
-      -1,   119,   210,   245,   256,    -1,   139,   210,   245,   257,
-      -1,   140,   210,   245,   164,   210,   245,   257,    -1
+      -1,   147,    -1,   148,    -1,   149,    -1,   158,    -1,    54,
+       4,    -1,    -1,   198,   197,    -1,   144,    -1,   142,    -1,
+     141,    -1,   147,    -1,    -1,   200,   199,    -1,   143,    -1,
+     146,    -1,   144,    -1,   142,    -1,   141,    -1,   150,    -1,
+     151,    -1,   154,    -1,   155,    -1,   153,    -1,   156,    -1,
+     157,    -1,    -1,   202,   201,    -1,    -1,   152,    22,    -1,
+      -1,    54,     4,    -1,    -1,   165,    54,     4,    -1,    34,
+      22,    -1,    -1,   206,    -1,    -1,   165,   209,   208,    -1,
+     206,    -1,    54,     4,    -1,    11,    -1,    12,    -1,    13,
+      -1,    16,    -1,    15,    -1,    14,    -1,    17,    -1,    50,
+      -1,   210,    -1,   211,   184,   166,    -1,   245,    -1,   167,
+       4,    -1,   211,   162,   215,   163,   202,    -1,    10,   162,
+     215,   163,   202,    -1,   168,     4,   169,   211,   170,    -1,
+     171,     4,   169,   211,   172,    -1,   173,   216,   174,    -1,
+     173,   174,    -1,   171,   173,   216,   174,   172,    -1,   171,
+     173,   174,   172,    -1,   211,   198,    -1,   211,    -1,    10,
+      -1,   212,    -1,   214,   165,   212,    -1,   214,    -1,   214,
+     165,    39,    -1,    39,    -1,    -1,   211,    -1,   216,   165,
+     211,    -1,   211,   168,   219,   170,    -1,   211,   168,   170,
+      -1,   211,   175,    22,    -1,   211,   171,   219,   172,    -1,
+     211,   173,   219,   174,    -1,   211,   173,   174,    -1,   211,
+     171,   173,   219,   174,   172,    -1,   211,   171,   173,   174,
+     172,    -1,   211,    40,    -1,   211,    41,    -1,   211,   245,
+      -1,   211,   218,    -1,   211,    25,    -1,   211,     3,    -1,
+     211,     5,    -1,   211,     4,    -1,   211,     6,    -1,   211,
+      26,    -1,   211,    27,    -1,   211,     9,    -1,   179,   162,
+     217,    38,   211,   163,    -1,   119,   162,   217,   257,   163,
+      -1,   133,   162,   217,   165,   217,   165,   217,   163,    -1,
+     177,   162,   217,   165,   217,   163,    -1,   178,   162,   217,
+     165,   217,   163,    -1,    90,   180,   162,   217,   165,   217,
+     163,    -1,    91,   181,   162,   217,   165,   217,   163,    -1,
+      92,   180,   162,   217,   165,   217,   163,    -1,    93,   181,
+     162,   217,   165,   217,   163,    -1,   135,   162,   217,   165,
+     217,   163,    -1,   136,   162,   217,   165,   217,   165,   217,
+     163,    -1,   137,   162,   217,   165,   217,   165,   217,   163,
+      -1,   139,   162,   217,   258,   163,    -1,   140,   162,   217,
+     165,   217,   258,   163,    -1,   219,   165,   217,    -1,   217,
+      -1,    32,    -1,    33,    -1,    37,    -1,    -1,   213,   245,
+      -1,   125,   162,   222,    38,   211,   163,    -1,   224,    -1,
+      -1,   225,    -1,   224,   225,    -1,    -1,    31,   226,   241,
+      -1,    -1,    30,   227,   242,    -1,    60,    59,   231,    -1,
+     185,    18,   211,    -1,   185,    18,    10,    -1,    -1,   188,
+     192,   221,   220,   217,   184,   228,   208,    -1,    -1,   188,
+     190,   192,   221,   220,   217,   184,   229,   208,    -1,    -1,
+     188,   191,   192,   221,   220,   211,   184,   230,   208,    -1,
+     188,   192,    35,   195,   222,    -1,    52,   232,    -1,    56,
+     164,   233,    -1,    22,    -1,    53,   164,    22,    -1,    68,
+     164,    22,    -1,   168,   234,   170,    -1,   234,   165,    22,
+      -1,    22,    -1,    -1,   235,   165,   211,   198,   183,    -1,
+     211,   198,   183,    -1,   235,    -1,   235,   165,    39,    -1,
+      39,    -1,    -1,   196,   200,   213,   187,   162,   236,   163,
+     202,   207,   204,   203,    -1,    28,    -1,   173,    -1,   194,
+     192,   237,   238,    -1,    29,    -1,   174,    -1,   249,   240,
+      -1,   193,   192,   237,    -1,    -1,    61,    -1,     3,    -1,
+       4,    -1,     5,    -1,     6,    -1,     9,    -1,    26,    -1,
+      27,    -1,    40,    -1,    41,    -1,    25,    -1,   171,   219,
+     172,    -1,   168,   219,   170,    -1,   168,   170,    -1,   175,
+      22,    -1,   173,   219,   174,    -1,   173,   174,    -1,   171,
+     173,   219,   174,   172,    -1,   171,   173,   174,   172,    -1,
+     218,    -1,    59,   243,    22,   165,    22,    -1,     7,    -1,
+       8,    -1,   182,    -1,   187,    -1,   245,    -1,   244,    -1,
+     211,   246,    -1,   247,    -1,   248,   165,   247,    -1,   249,
+     250,    -1,   239,   250,    -1,   251,   185,   252,    -1,   251,
+     186,   252,    -1,   251,   254,    -1,    -1,    21,    -1,    69,
+     248,    -1,    69,    10,    -1,    70,    17,   246,    -1,    70,
+      11,   246,   165,    17,   246,   165,    17,   246,    -1,    71,
+      11,   246,   165,    17,   246,   168,   253,   170,    -1,    71,
+      11,   246,   165,    17,   246,   168,   170,    -1,    72,   196,
+     200,   213,   246,   162,   256,   163,   202,    38,    17,   246,
+      73,    17,   246,    -1,    73,    -1,    74,    -1,   253,    11,
+     244,   165,    17,   246,    -1,    11,   244,   165,    17,   246,
+      -1,   185,   260,    -1,   186,   260,    -1,   211,   168,   246,
+     165,   246,   170,    -1,   255,   165,   168,   246,   165,   246,
+     170,    -1,   211,   198,   246,   198,    -1,    17,   198,   246,
+     198,    -1,   256,   165,   211,   198,   246,   198,    -1,   256,
+     165,    17,   198,   246,   198,    -1,    -1,    -1,   257,   165,
+     247,    -1,   165,     4,    -1,   258,   165,     4,    -1,    58,
+      57,    -1,    57,    -1,   177,   211,   246,   165,   246,    -1,
+     178,   211,   246,   165,   246,    -1,    90,   180,   211,   246,
+     165,   246,    -1,    91,   181,   211,   246,   165,   246,    -1,
+      92,   180,   211,   246,   165,   246,    -1,    93,   181,   211,
+     246,   165,   246,    -1,   179,   247,    38,   211,    -1,   133,
+     247,   165,   247,   165,   247,    -1,   134,   247,   165,   211,
+      -1,   135,   247,   165,   247,    -1,   136,   247,   165,   247,
+     165,   247,    -1,   137,   247,   165,   247,   165,   247,    -1,
+     132,   255,    -1,   259,   196,   200,   213,   246,   162,   256,
+     163,   202,    -1,   262,    -1,    36,    -1,    -1,   114,   211,
+     205,    -1,   114,   211,   165,    11,   246,   205,    -1,   115,
+     211,   205,    -1,   115,   211,   165,    11,   246,   205,    -1,
+     116,   247,    -1,   261,   117,   211,   246,   205,    -1,   261,
+     118,   247,   165,   211,   246,   205,    -1,   138,   211,   246,
+     165,     4,    -1,   119,   211,   246,   257,    -1,   139,   211,
+     246,   258,    -1,   140,   211,   246,   165,   211,   246,   258,
+      -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -1909,31 +1912,31 @@
     1230,  1231,  1232,  1236,  1237,  1238,  1242,  1243,  1244,  1245,
     1246,  1250,  1251,  1252,  1255,  1256,  1257,  1258,  1259,  1260,
     1261,  1268,  1269,  1270,  1271,  1272,  1273,  1274,  1275,  1276,
-    1277,  1281,  1282,  1287,  1288,  1289,  1290,  1293,  1294,  1300,
+    1277,  1278,  1282,  1283,  1288,  1289,  1290,  1291,  1294,  1295,
     1301,  1302,  1303,  1304,  1305,  1306,  1307,  1308,  1309,  1310,
-    1311,  1314,  1315,  1321,  1322,  1329,  1330,  1336,  1337,  1346,
-    1354,  1355,  1360,  1361,  1362,  1367,  1380,  1380,  1380,  1380,
-    1380,  1380,  1380,  1383,  1387,  1391,  1398,  1403,  1411,  1446,
-    1477,  1482,  1492,  1502,  1506,  1516,  1523,  1532,  1539,  1544,
-    1549,  1556,  1557,  1564,  1571,  1579,  1585,  1597,  1625,  1641,
-    1668,  1696,  1722,  1742,  1768,  1788,  1800,  1807,  1873,  1883,
-    1893,  1904,  1917,  1928,  1942,  1949,  1956,  1974,  1986,  2007,
-    2015,  2021,  2032,  2037,  2042,  2047,  2052,  2058,  2064,  2070,
-    2078,  2089,  2093,  2101,  2101,  2104,  2104,  2107,  2119,  2140,
-    2145,  2153,  2154,  2158,  2158,  2162,  2162,  2165,  2168,  2192,
-    2204,  2203,  2215,  2214,  2224,  2223,  2234,  2274,  2277,  2283,
-    2293,  2297,  2302,  2304,  2309,  2314,  2323,  2333,  2344,  2348,
-    2357,  2366,  2371,  2520,  2520,  2522,  2531,  2531,  2533,  2538,
-    2550,  2554,  2559,  2563,  2567,  2572,  2577,  2581,  2585,  2589,
-    2593,  2597,  2601,  2623,  2645,  2651,  2664,  2676,  2681,  2693,
-    2699,  2703,  2713,  2717,  2721,  2726,  2733,  2733,  2739,  2748,
-    2753,  2758,  2762,  2771,  2780,  2793,  2802,  2806,  2814,  2834,
-    2838,  2843,  2854,  2873,  2882,  2986,  2990,  2997,  3008,  3021,
-    3030,  3043,  3054,  3064,  3075,  3083,  3093,  3100,  3103,  3104,
-    3112,  3118,  3127,  3131,  3136,  3152,  3169,  3181,  3193,  3207,
-    3221,  3233,  3254,  3261,  3267,  3273,  3279,  3294,  3404,  3409,
-    3413,  3420,  3427,  3437,  3444,  3454,  3462,  3476,  3493,  3507,
-    3522,  3537
+    1311,  1312,  1315,  1316,  1322,  1323,  1330,  1331,  1339,  1340,
+    1351,  1359,  1360,  1365,  1366,  1367,  1372,  1387,  1387,  1387,
+    1387,  1387,  1387,  1387,  1390,  1394,  1398,  1405,  1410,  1418,
+    1453,  1484,  1489,  1499,  1509,  1513,  1523,  1530,  1539,  1546,
+    1551,  1556,  1563,  1564,  1571,  1578,  1586,  1592,  1604,  1632,
+    1648,  1675,  1703,  1729,  1749,  1775,  1795,  1807,  1814,  1880,
+    1890,  1900,  1911,  1924,  1935,  1949,  1956,  1963,  1981,  1993,
+    2014,  2022,  2028,  2039,  2044,  2049,  2054,  2059,  2065,  2071,
+    2077,  2085,  2096,  2100,  2108,  2108,  2111,  2111,  2114,  2126,
+    2147,  2152,  2160,  2161,  2165,  2165,  2169,  2169,  2172,  2175,
+    2199,  2211,  2210,  2222,  2221,  2231,  2230,  2241,  2281,  2284,
+    2290,  2300,  2304,  2309,  2311,  2316,  2321,  2330,  2340,  2351,
+    2355,  2364,  2373,  2378,  2527,  2527,  2529,  2538,  2538,  2540,
+    2545,  2557,  2561,  2566,  2570,  2574,  2579,  2584,  2588,  2592,
+    2596,  2600,  2604,  2608,  2630,  2652,  2658,  2671,  2683,  2688,
+    2700,  2706,  2710,  2720,  2724,  2728,  2733,  2740,  2740,  2746,
+    2755,  2760,  2765,  2769,  2778,  2787,  2800,  2809,  2813,  2821,
+    2841,  2845,  2850,  2861,  2880,  2889,  2993,  2997,  3004,  3015,
+    3028,  3037,  3050,  3061,  3071,  3082,  3090,  3100,  3107,  3110,
+    3111,  3119,  3125,  3134,  3138,  3143,  3159,  3176,  3188,  3200,
+    3214,  3228,  3240,  3261,  3268,  3274,  3280,  3286,  3301,  3411,
+    3416,  3420,  3427,  3434,  3444,  3451,  3461,  3469,  3483,  3500,
+    3514,  3529,  3544
 };
 #endif
 
@@ -1964,11 +1967,11 @@
   "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", "PTRTOINT", "PHI_TOK",
   "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR",
   "GETRESULT", "EXTRACTVALUE", "INSERTVALUE", "SIGNEXT", "ZEROEXT",
-  "NORETURN", "INREG", "SRET", "NOUNWIND", "NOALIAS", "BYVAL", "NEST",
+  "NORETURN", "INREG", "SRET", "NOUNWIND", "NOALIAS", "NOCAPTURE", "BYVAL",
   "READNONE", "READONLY", "GC", "OPTSIZE", "NOINLINE", "ALWAYSINLINE",
-  "SSP", "SSPREQ", "DEFAULT", "HIDDEN", "PROTECTED", "'('", "')'", "'='",
-  "','", "'*'", "'\\\\'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'",
-  "'c'", "$accept", "ArithmeticOps", "LogicalOps", "CastOps",
+  "SSP", "SSPREQ", "NEST", "DEFAULT", "HIDDEN", "PROTECTED", "'('", "')'",
+  "'='", "','", "'*'", "'\\\\'", "'['", "'x'", "']'", "'<'", "'>'", "'{'",
+  "'}'", "'c'", "$accept", "ArithmeticOps", "LogicalOps", "CastOps",
   "IPredicates", "FPredicates", "LocalName", "OptLocalName",
   "OptAddrSpace", "OptLocalAssign", "LocalNumber", "GlobalName",
   "OptGlobalAssign", "GlobalAssign", "GVInternalLinkage",
@@ -2012,50 +2015,50 @@
      385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
      395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
      405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
-     415,    40,    41,    61,    44,    42,    92,    91,   120,    93,
-      60,    62,   123,   125,    99
+     415,   416,    40,    41,    61,    44,    42,    92,    91,   120,
+      93,    60,    62,   123,   125,    99
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   175,   176,   176,   176,   176,   176,   176,   176,   176,
-     176,   177,   177,   177,   177,   177,   177,   178,   178,   178,
-     178,   178,   178,   178,   178,   178,   178,   178,   178,   179,
+       0,   176,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   178,   178,   178,   178,   178,   178,   179,   179,   179,
      179,   179,   179,   179,   179,   179,   179,   179,   179,   180,
-     180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-     180,   180,   180,   180,   180,   181,   181,   181,   182,   182,
-     183,   183,   184,   184,   185,   186,   186,   187,   187,   188,
-     189,   189,   189,   189,   189,   189,   190,   190,   190,   191,
-     191,   191,   191,   192,   192,   192,   193,   193,   193,   193,
-     193,   194,   194,   194,   195,   195,   195,   195,   195,   195,
-     195,   196,   196,   196,   196,   196,   196,   196,   196,   196,
-     196,   197,   197,   198,   198,   198,   198,   199,   199,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   201,   201,   202,   202,   203,   203,   204,   204,   205,
-     206,   206,   207,   207,   208,   208,   209,   209,   209,   209,
-     209,   209,   209,   210,   210,   210,   210,   210,   210,   210,
-     210,   210,   210,   210,   210,   210,   211,   212,   212,   213,
-     213,   214,   214,   214,   214,   215,   215,   216,   216,   216,
-     216,   216,   216,   216,   216,   216,   216,   216,   216,   216,
-     216,   216,   216,   216,   216,   216,   216,   217,   217,   217,
+     180,   180,   180,   180,   180,   180,   180,   180,   180,   181,
+     181,   181,   181,   181,   181,   181,   181,   181,   181,   181,
+     181,   181,   181,   181,   181,   182,   182,   182,   183,   183,
+     184,   184,   185,   185,   186,   187,   187,   188,   188,   189,
+     190,   190,   190,   190,   190,   190,   191,   191,   191,   192,
+     192,   192,   192,   193,   193,   193,   194,   194,   194,   194,
+     194,   195,   195,   195,   196,   196,   196,   196,   196,   196,
+     196,   197,   197,   197,   197,   197,   197,   197,   197,   197,
+     197,   197,   198,   198,   199,   199,   199,   199,   200,   200,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   202,   202,   203,   203,   204,   204,   205,   205,
+     206,   207,   207,   208,   208,   209,   209,   210,   210,   210,
+     210,   210,   210,   210,   211,   211,   211,   211,   211,   211,
+     211,   211,   211,   211,   211,   211,   211,   212,   213,   213,
+     214,   214,   215,   215,   215,   215,   216,   216,   217,   217,
      217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
-     217,   218,   218,   219,   219,   220,   220,   221,   221,   222,
-     222,   223,   223,   225,   224,   226,   224,   224,   224,   224,
-     227,   224,   228,   224,   229,   224,   224,   224,   224,   230,
-     231,   231,   232,   233,   233,   233,   234,   234,   235,   235,
-     235,   235,   236,   237,   237,   238,   239,   239,   240,   241,
-     242,   242,   243,   243,   243,   243,   243,   243,   243,   243,
-     243,   243,   243,   243,   243,   243,   243,   243,   243,   243,
-     243,   243,   244,   244,   244,   244,   245,   245,   246,   247,
-     247,   248,   248,   249,   249,   250,   250,   250,   251,   251,
-     251,   251,   251,   251,   251,   251,   251,   252,   252,   253,
-     253,   254,   254,   255,   255,   255,   255,   255,   256,   256,
-     257,   257,   258,   258,   259,   259,   259,   259,   259,   259,
-     259,   259,   259,   259,   259,   259,   259,   259,   259,   260,
-     260,   261,   261,   261,   261,   261,   261,   261,   261,   261,
-     261,   261
+     217,   217,   217,   217,   217,   217,   217,   217,   218,   218,
+     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
+     218,   218,   219,   219,   220,   220,   221,   221,   222,   222,
+     223,   223,   224,   224,   226,   225,   227,   225,   225,   225,
+     225,   228,   225,   229,   225,   230,   225,   225,   225,   225,
+     231,   232,   232,   233,   234,   234,   234,   235,   235,   236,
+     236,   236,   236,   237,   238,   238,   239,   240,   240,   241,
+     242,   243,   243,   244,   244,   244,   244,   244,   244,   244,
+     244,   244,   244,   244,   244,   244,   244,   244,   244,   244,
+     244,   244,   244,   245,   245,   245,   245,   246,   246,   247,
+     248,   248,   249,   249,   250,   250,   251,   251,   251,   252,
+     252,   252,   252,   252,   252,   252,   252,   252,   253,   253,
+     254,   254,   255,   255,   256,   256,   256,   256,   256,   257,
+     257,   258,   258,   259,   259,   260,   260,   260,   260,   260,
+     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
+     261,   261,   262,   262,   262,   262,   262,   262,   262,   262,
+     262,   262,   262
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -2072,31 +2075,31 @@
        1,     1,     1,     0,     1,     1,     0,     1,     1,     1,
        1,     0,     1,     1,     0,     1,     1,     1,     1,     1,
        2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       2,     0,     2,     1,     1,     1,     1,     0,     2,     1,
+       1,     2,     0,     2,     1,     1,     1,     1,     0,     2,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     0,     2,     0,     2,     0,     2,     0,     3,     2,
-       0,     1,     0,     3,     1,     2,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     3,     1,     2,     5,     5,
-       5,     5,     3,     2,     5,     4,     2,     1,     1,     1,
-       3,     1,     3,     1,     0,     1,     3,     4,     3,     3,
-       4,     4,     3,     6,     5,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     6,     5,     8,
-       6,     6,     7,     7,     7,     7,     6,     8,     8,     5,
-       7,     3,     1,     1,     1,     1,     0,     2,     6,     1,
-       0,     1,     2,     0,     3,     0,     3,     3,     3,     3,
-       0,     8,     0,     9,     0,     9,     5,     2,     3,     1,
-       3,     3,     3,     3,     1,     0,     5,     3,     1,     3,
-       1,     0,    11,     1,     1,     4,     1,     1,     2,     3,
-       0,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     3,     3,     2,     2,     3,     2,     5,     4,
-       1,     5,     1,     1,     1,     1,     1,     1,     2,     1,
-       3,     2,     2,     3,     3,     2,     0,     1,     2,     2,
-       3,     9,     9,     8,    15,     1,     1,     6,     5,     2,
-       2,     6,     7,     4,     4,     6,     6,     0,     0,     3,
-       2,     3,     2,     1,     5,     5,     6,     6,     6,     6,
-       4,     6,     4,     4,     6,     6,     2,     9,     1,     1,
-       0,     3,     6,     3,     6,     2,     5,     7,     5,     4,
-       4,     7
+       1,     1,     0,     2,     0,     2,     0,     2,     0,     3,
+       2,     0,     1,     0,     3,     1,     2,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     3,     1,     2,     5,
+       5,     5,     5,     3,     2,     5,     4,     2,     1,     1,
+       1,     3,     1,     3,     1,     0,     1,     3,     4,     3,
+       3,     4,     4,     3,     6,     5,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     6,     5,
+       8,     6,     6,     7,     7,     7,     7,     6,     8,     8,
+       5,     7,     3,     1,     1,     1,     1,     0,     2,     6,
+       1,     0,     1,     2,     0,     3,     0,     3,     3,     3,
+       3,     0,     8,     0,     9,     0,     9,     5,     2,     3,
+       1,     3,     3,     3,     3,     1,     0,     5,     3,     1,
+       3,     1,     0,    11,     1,     1,     4,     1,     1,     2,
+       3,     0,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     3,     3,     2,     2,     3,     2,     5,
+       4,     1,     5,     1,     1,     1,     1,     1,     1,     2,
+       1,     3,     2,     2,     3,     3,     2,     0,     1,     2,
+       2,     3,     9,     9,     8,    15,     1,     1,     6,     5,
+       2,     2,     6,     7,     4,     4,     6,     6,     0,     0,
+       3,     2,     3,     2,     1,     5,     5,     6,     6,     6,
+       6,     4,     6,     4,     4,     6,     6,     2,     9,     1,
+       1,     0,     3,     6,     3,     6,     2,     5,     7,     5,
+       4,     4,     7
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -2104,310 +2107,314 @@
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-      68,    55,    65,    56,    66,    57,   225,   223,     0,     0,
-       0,     0,     0,     0,    79,    67,     0,    68,   221,    83,
-      86,     0,     0,   237,     0,     0,    62,     0,    69,    70,
+      68,    55,    65,    56,    66,    57,   226,   224,     0,     0,
+       0,     0,     0,     0,    79,    67,     0,    68,   222,    83,
+      86,     0,     0,   238,     0,     0,    62,     0,    69,    70,
       72,    71,    73,    76,    74,    77,    75,    78,    80,    81,
-      82,    79,    79,   216,     1,   222,    84,    85,    79,   226,
-      87,    88,    89,    90,    79,   296,   224,   296,     0,     0,
-     245,   238,   239,   227,   282,   283,   229,   146,   147,   148,
-     151,   150,   149,   152,   153,     0,     0,     0,     0,   284,
-     285,   154,   228,   156,   216,   216,    91,   215,     0,    94,
-      94,   297,   292,    63,   256,   257,   258,   291,   240,   241,
-     244,     0,   174,   157,     0,     0,     0,     0,   163,   175,
-       0,     0,   174,     0,     0,     0,    93,    92,     0,   213,
-     214,     0,     0,    95,    96,    97,    98,    99,   117,   259,
-       0,     0,   340,   340,   295,     0,   242,   173,   111,   169,
-     171,     0,     0,     0,     0,     0,     0,   162,     0,     0,
-     155,     0,     0,   168,     0,   167,     0,   236,    61,    61,
-     100,     0,   253,   254,   255,    64,   339,   323,     0,     0,
-       0,     0,    94,   305,   306,     2,     3,     4,     5,     6,
+      82,    79,    79,   217,     1,   223,    84,    85,    79,   227,
+      87,    88,    89,    90,    79,   297,   225,   297,     0,     0,
+     246,   239,   240,   228,   283,   284,   230,   147,   148,   149,
+     152,   151,   150,   153,   154,     0,     0,     0,     0,   285,
+     286,   155,   229,   157,   217,   217,    91,   216,     0,    94,
+      94,   298,   293,    63,   257,   258,   259,   292,   241,   242,
+     245,     0,   175,   158,     0,     0,     0,     0,   164,   176,
+       0,     0,   175,     0,     0,     0,    93,    92,     0,   214,
+     215,     0,     0,    95,    96,    97,    98,    99,   118,   260,
+       0,     0,   341,   341,   296,     0,   243,   174,   112,   170,
+     172,     0,     0,     0,     0,     0,     0,   163,     0,     0,
+     156,     0,     0,   169,     0,   168,     0,   237,    61,    61,
+     100,     0,   254,   255,   256,    64,   340,   324,     0,     0,
+       0,     0,    94,   306,   307,     2,     3,     4,     5,     6,
        7,     8,     9,    10,    14,    15,    16,    11,    12,    13,
        0,     0,     0,     0,     0,     0,     0,     0,    17,    18,
       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   293,    94,   309,     0,   338,   294,   310,   243,
-     166,     0,   131,    61,    61,   165,     0,   176,     0,   131,
-      61,    61,     0,   217,   190,   192,   191,   193,   196,   189,
-     194,   195,   185,   186,     0,     0,     0,     0,     0,     0,
+       0,     0,   294,    94,   310,     0,   339,   295,   311,   244,
+     167,     0,   132,    61,    61,   166,     0,   177,     0,   132,
+      61,    61,     0,   218,   191,   193,   192,   194,   197,   190,
+     195,   196,   186,   187,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   188,   187,   230,   115,   114,   113,   116,   118,
-       0,   322,   299,    61,   289,   298,     0,     0,     0,   117,
+       0,     0,   189,   188,   231,   116,   115,   114,   117,   119,
+       0,   323,   300,    61,   290,   299,     0,     0,     0,   118,
       29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
        0,    53,    54,    49,    50,    51,    52,    39,    40,    41,
       42,    43,    44,    45,    46,    47,    48,     0,     0,     0,
-     137,   137,   345,    61,    61,   336,     0,     0,     0,     0,
-       0,    61,    61,    61,    61,    61,     0,   117,     0,     0,
+     138,   138,   346,    61,    61,   337,     0,     0,     0,     0,
+       0,    61,    61,    61,    61,    61,     0,   118,     0,     0,
        0,   102,   104,   103,   101,   105,   106,   107,   108,   109,
-     112,   172,   170,   159,   160,   161,   164,    60,   158,   232,
-     234,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   178,   212,     0,     0,     0,   182,     0,
-     179,     0,     0,     0,   142,     0,   262,   263,   264,   265,
-     266,   271,   267,   268,   269,   270,   260,     0,     0,     0,
-       0,   280,   287,   286,   288,     0,     0,   300,     0,     0,
-      61,    61,    61,    61,     0,   341,     0,   343,   318,     0,
+     110,   113,   173,   171,   160,   161,   162,   165,    60,   159,
+     233,   235,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   179,   213,     0,     0,     0,   183,
+       0,   180,     0,     0,     0,   143,     0,   263,   264,   265,
+     266,   267,   272,   268,   269,   270,   271,   261,     0,     0,
+       0,     0,   281,   288,   287,   289,     0,     0,   301,     0,
+       0,    61,    61,    61,    61,     0,   342,     0,   344,   319,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    61,     0,   110,   123,   122,   119,   121,
-     120,   124,   125,   128,   126,   127,   129,   130,   132,   142,
-     142,     0,     0,     0,     0,     0,   318,     0,     0,     0,
-       0,     0,     0,     0,   177,   163,   175,     0,   180,   181,
-       0,     0,     0,     0,   231,   251,   261,     0,   274,     0,
-       0,     0,   277,     0,   275,   290,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   349,     0,     0,     0,
-     332,   333,     0,     0,     0,     0,   350,     0,     0,     0,
-     330,     0,   137,     0,   233,   235,    61,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   211,   184,
-       0,     0,     0,     0,     0,     0,   144,   142,   250,   111,
-     248,     0,     0,   273,   163,     0,   272,   276,     0,     0,
-       0,     0,     0,     0,     0,   137,   138,   137,     0,     0,
-       0,     0,     0,     0,   348,   320,     0,    61,   324,   325,
-       0,     0,   346,    61,   218,     0,     0,     0,     0,   198,
-       0,     0,     0,     0,   209,     0,   183,     0,     0,    61,
-     139,   145,   143,    59,     0,   131,     0,   279,     0,     0,
-       0,   317,   326,   327,   328,   329,   342,   344,   319,     0,
-       0,   331,   334,   335,   321,     0,   317,   137,     0,     0,
-       0,     0,     0,   206,     0,     0,     0,   200,   201,   197,
-      58,   247,   249,   111,   140,   281,   278,     0,     0,   111,
-     111,     0,   311,     0,   351,     0,   347,   202,   203,   204,
-     205,     0,     0,     0,   210,    59,   141,   135,     0,     0,
-     303,     0,     0,     0,   131,     0,   312,   131,   199,   207,
-     208,   246,     0,   133,   301,     0,     0,   302,   102,   104,
-     111,   111,     0,   111,   111,   337,   136,     0,   252,     0,
-       0,   314,   313,     0,     0,     0,   134,     0,     0,     0,
-     111,   111,   308,     0,     0,   316,   315,   307,     0,     0,
-     304
+       0,     0,     0,     0,    61,     0,   111,   124,   123,   120,
+     122,   121,   125,   126,   129,   127,   128,   130,   131,   133,
+     143,   143,     0,     0,     0,     0,     0,   319,     0,     0,
+       0,     0,     0,     0,     0,   178,   164,   176,     0,   181,
+     182,     0,     0,     0,     0,   232,   252,   262,     0,   275,
+       0,     0,     0,   278,     0,   276,   291,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   350,     0,     0,
+       0,   333,   334,     0,     0,     0,     0,   351,     0,     0,
+       0,   331,     0,   138,     0,   234,   236,    61,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   212,
+     185,     0,     0,     0,     0,     0,     0,   145,   143,   251,
+     112,   249,     0,     0,   274,   164,     0,   273,   277,     0,
+       0,     0,     0,     0,     0,     0,   138,   139,   138,     0,
+       0,     0,     0,     0,     0,   349,   321,     0,    61,   325,
+     326,     0,     0,   347,    61,   219,     0,     0,     0,     0,
+     199,     0,     0,     0,     0,   210,     0,   184,     0,     0,
+      61,   140,   146,   144,    59,     0,   132,     0,   280,     0,
+       0,     0,   318,   327,   328,   329,   330,   343,   345,   320,
+       0,     0,   332,   335,   336,   322,     0,   318,   138,     0,
+       0,     0,     0,     0,   207,     0,     0,     0,   201,   202,
+     198,    58,   248,   250,   112,   141,   282,   279,     0,     0,
+     112,   112,     0,   312,     0,   352,     0,   348,   203,   204,
+     205,   206,     0,     0,     0,   211,    59,   142,   136,     0,
+       0,   304,     0,     0,     0,   132,     0,   313,   132,   200,
+     208,   209,   247,     0,   134,   302,     0,     0,   303,   102,
+     104,   112,   112,     0,   112,   112,   338,   137,     0,   253,
+       0,     0,   315,   314,     0,     0,     0,   135,     0,     0,
+       0,   112,   112,   309,     0,     0,   317,   316,   308,     0,
+       0,   305
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,   269,   270,   271,   300,   317,    79,   631,   113,    12,
+      -1,   269,   270,   271,   300,   317,    79,   632,   113,    12,
      133,    80,    14,    15,    41,    42,    43,    48,    54,   118,
-     128,   350,   230,   279,   161,   448,   353,   688,   673,   415,
-     536,   657,   474,   537,    81,   158,   139,   156,   140,   141,
-     110,   374,   401,   375,   121,    88,   157,    16,    17,    18,
-      20,    19,   384,   449,   450,    63,    23,    61,   101,   540,
-     541,   129,   164,    55,    96,    56,    49,   477,   402,    83,
-     404,   284,   285,    57,    92,    93,   222,   661,   134,   325,
-     641,   496,   506,   223,   224,   225,   226
+     128,   351,   230,   279,   161,   449,   354,   689,   674,   416,
+     537,   658,   475,   538,    81,   158,   139,   156,   140,   141,
+     110,   375,   402,   376,   121,    88,   157,    16,    17,    18,
+      20,    19,   385,   450,   451,    63,    23,    61,   101,   541,
+     542,   129,   164,    55,    96,    56,    49,   478,   403,    83,
+     405,   284,   285,    57,    92,    93,   222,   662,   134,   325,
+     642,   497,   507,   223,   224,   225,   226
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -619
+#define YYPACT_NINF -611
 static const yytype_int16 yypact[] =
 {
-     790,  -619,  -619,  -619,  -619,  -619,  -619,  -619,    10,   -86,
-      53,   -45,   136,    38,    62,  -619,    49,  1492,  -619,   117,
-     167,    39,    43,  -619,    45,   151,  -619,  1999,  -619,  -619,
-    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    -619,   -27,   -27,   146,  -619,  -619,  -619,  -619,   -27,  -619,
-    -619,  -619,  -619,  -619,   -27,   197,  -619,     9,   216,   224,
-     228,  -619,  -619,  -619,  -619,  -619,   105,  -619,  -619,  -619,
-    -619,  -619,  -619,  -619,  -619,   266,   269,     2,   481,  -619,
-    -619,  -619,   -37,  -619,   244,   244,   156,  -619,    69,   213,
-     213,  -619,  -619,    40,  -619,  -619,  -619,  -619,  -619,  -619,
-    -619,   -70,  1724,  -619,   118,   119,   550,   105,  -619,   -37,
-    -118,   124,  1724,   125,    69,    69,  -619,  -619,  1768,  -619,
-    -619,  2024,   285,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-     -16,   131,  2294,  2294,  -619,   273,  -619,  -619,   -37,  -619,
-     132,   135,  2024,  2024,   127,   -83,  2024,  -619,   295,   138,
-    -619,  2024,  2024,   105,   145,   -37,    46,  -619,  1278,   252,
-    -619,  1679,  -619,  -619,  -619,  -619,  -619,  -619,   251,  2065,
-      78,   298,   213,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-     630,   660,   630,   660,  2024,  2024,  2024,  2024,  -619,  -619,
-    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    2024,  2024,  2024,  2024,  2024,  2024,  2024,  2024,  2024,  2024,
-    2024,  2024,  -619,   213,  -619,    59,  -619,  -619,  -619,  -619,
-     335,  1817,  -619,   -39,   -42,  -619,   147,   -37,   158,  -619,
-     252,   -10,  1768,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    -619,  -619,  -619,  -619,   630,   660,   630,   660,   160,   161,
-     170,   171,   172,   174,   175,  1858,  2124,   984,   312,   176,
-     181,   182,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-      64,  -619,   105,   934,  -619,   180,  1450,  1450,  1450,  -619,
-    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    2024,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    -619,  -619,  -619,  -619,  -619,  -619,  -619,  2024,  2024,  2024,
-     -24,   -19,  -619,   934,   -40,   183,   184,   187,   188,   189,
-     190,   934,   934,   934,   934,   934,   307,  -619,  2024,  2024,
-     342,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    -619,  -619,  -619,   557,  -619,  -619,  -619,  -619,   557,  -619,
-     125,   317,   195,   196,   200,   201,  2024,  2024,  2024,  2024,
-    2024,  2024,  2024,  -619,  -619,    -9,  1155,  -120,  -619,   -76,
-    -619,  2024,  2024,  2024,   203,   202,  -619,  -619,  -619,  -619,
-    -619,  -619,  -619,  -619,  -619,  -619,   299,  1899,  2165,  1327,
-     343,  -619,  -619,  -619,  -619,  2024,   204,  -619,   208,  1679,
-     934,   934,   934,   934,    17,  -619,    28,  -619,  -619,  1450,
-     206,  2024,  2024,  2024,  2024,  2024,   210,   211,   212,   214,
-     217,  2024,  1679,   934,   218,  -619,  -619,  -619,  -619,  -619,
-    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,   203,
-     203,  2024,  2024,  2024,  2024,  2024,  -619,   220,   222,   227,
-     229,   211,   230,  2024,  -619,   193,  1106,   -73,  -619,  -619,
-     238,   240,   339,     6,  -619,  1940,  -619,   366,  -619,    -3,
-    1638,   -97,  -619,   -11,  -619,  -619,   375,   390,  1450,   248,
-     250,   255,   256,  1450,   411,  1450,   257,   258,  1450,   259,
-     -37,  -619,   260,   262,   412,   423,   265,  2024,  1450,  1450,
-     -37,  1450,   268,  2024,  -619,  -619,   -23,   270,   271,   272,
-     274,    55,  2024,  2024,  2024,  2024,    66,  2024,  -619,  -619,
-     276,  2024,  2024,  2024,   408,   429,  -619,   203,  -619,   -37,
-     275,   280,   284,  -619,   279,    35,  -619,  -619,  1450,  1450,
-     291,  1450,  1450,  1450,  1450,   268,  -619,   268,  2024,  1450,
-     289,  2024,  2024,  2024,  -619,  -619,   433,   934,  -619,  -619,
-     294,   404,  -619,   934,  -619,  2024,  2024,  2024,  2024,  -619,
-     296,   304,   303,   305,  -619,   211,  -619,   306,   308,   -12,
-    -619,  -619,  -619,   522,  1958,  -619,   449,  -619,   314,   311,
-     319,  2190,  -619,  -619,  -619,  -619,  -619,  -619,  -619,   309,
-    1450,  -619,  -619,  -619,  -619,   211,  2190,   268,   328,   337,
-     344,   351,  2024,  -619,  2024,  2024,    72,  -619,  -619,  -619,
-    -619,  -619,  -619,   -37,   173,  -619,  -619,   497,    -2,   -13,
-     -37,    73,  -619,   346,   265,    87,  -619,  -619,  -619,  -619,
-    -619,   354,   360,   361,  -619,   522,  -619,   470,  1450,  1588,
-    -619,     3,   778,   778,  -619,  2231,  -619,  -619,  -619,  -619,
-    -619,  -619,   521,   374,  -619,   363,  1588,  -619,   367,   368,
-    -619,  -619,   474,   -13,   -37,   557,  -619,   508,  -619,   516,
-     370,   335,   335,   523,   778,   778,  -619,  1450,   525,  1450,
-    -619,  -619,  -619,  1450,   465,   335,   335,  -619,   526,  1450,
-    -619
+     828,  -611,  -611,  -611,  -611,  -611,  -611,  -611,    -5,   -90,
+      68,   -25,   113,   -20,    -9,  -611,   153,  1107,  -611,   173,
+      15,    36,    48,  -611,    -3,   196,  -611,  1950,  -611,  -611,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    -611,   137,   137,   190,  -611,  -611,  -611,  -611,   137,  -611,
+    -611,  -611,  -611,  -611,   137,   203,  -611,     3,   212,   215,
+     229,  -611,  -611,  -611,  -611,  -611,    83,  -611,  -611,  -611,
+    -611,  -611,  -611,  -611,  -611,   252,   268,     7,    87,  -611,
+    -611,  -611,    73,  -611,   238,   238,   186,  -611,    22,   200,
+     200,  -611,  -611,    42,  -611,  -611,  -611,  -611,  -611,  -611,
+    -611,     8,  1765,  -611,   110,   121,   573,    83,  -611,    73,
+    -114,   138,  1765,   142,    22,    22,  -611,  -611,  1368,  -611,
+    -611,  1991,   298,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+     -16,   168,  2181,  2181,  -611,   311,  -611,  -611,    73,  -611,
+     169,   174,  1991,  1991,   164,   -95,  1991,  -611,   334,   178,
+    -611,  1991,  1991,    83,   182,    73,   287,  -611,  1319,   293,
+    -611,  1680,  -611,  -611,  -611,  -611,  -611,  -611,   295,  2032,
+     119,   339,   200,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+     465,   412,   465,   412,  1991,  1991,  1991,  1991,  -611,  -611,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    1991,  1991,  1991,  1991,  1991,  1991,  1991,  1991,  1991,  1991,
+    1991,  1991,  -611,   200,  -611,   -33,  -611,  -611,  -611,  -611,
+     271,  1818,  -611,    -8,   -39,  -611,   181,    73,   191,  -611,
+     293,    -2,  1368,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    -611,  -611,  -611,  -611,   465,   412,   465,   412,   193,   195,
+     199,   201,   202,   205,   206,  1721,  2061,   659,   336,   210,
+     211,   213,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+     187,  -611,    83,   973,  -611,   197,  1492,  1492,  1492,  -611,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    1991,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,  1991,  1991,  1991,
+       1,    17,  -611,   973,   -30,   214,   216,   218,   220,   221,
+     224,   973,   973,   973,   973,   973,   322,  -611,  1991,  1991,
+     361,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    -611,  -611,  -611,  -611,   657,  -611,  -611,  -611,  -611,   657,
+    -611,   142,   338,   226,   228,   232,   233,  1991,  1991,  1991,
+    1991,  1991,  1991,  1991,  -611,  -611,    41,   743,    32,  -611,
+     -83,  -611,  1991,  1991,  1991,   236,   240,  -611,  -611,  -611,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,   313,  1859,  2117,
+    1023,   355,  -611,  -611,  -611,  -611,  1991,   243,  -611,   245,
+    1680,   973,   973,   973,   973,    33,  -611,    35,  -611,  -611,
+    1492,   235,  1991,  1991,  1991,  1991,  1991,   256,   257,   258,
+     265,   267,  1991,  1680,   973,   269,  -611,  -611,  -611,  -611,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+     236,   236,  1991,  1991,  1991,  1991,  1991,  -611,   270,   272,
+     275,   276,   257,   284,  1991,  -611,   219,  1146,   -69,  -611,
+    -611,   286,   288,   340,    11,  -611,  1891,  -611,   383,  -611,
+      44,  1195,    43,  -611,   -53,  -611,  -611,   400,   416,  1492,
+     289,   291,   296,   297,  1492,   432,  1492,   301,   306,  1492,
+     307,    73,  -611,   308,   309,   448,   456,   312,  1991,  1492,
+    1492,    73,  1492,   314,  1991,  -611,  -611,   -14,   315,   316,
+     319,   320,    78,  1991,  1991,  1991,  1991,    94,  1991,  -611,
+    -611,   304,  1991,  1991,  1991,   441,   474,  -611,   236,  -611,
+      73,   321,   324,   329,  -611,   325,   -52,  -611,  -611,  1492,
+    1492,   345,  1492,  1492,  1492,  1492,   314,  -611,   314,  1991,
+    1492,   331,  1991,  1991,  1991,  -611,  -611,   494,   973,  -611,
+    -611,   365,   447,  -611,   973,  -611,  1991,  1991,  1991,  1991,
+    -611,   367,   371,   370,   375,  -611,   257,  -611,   378,   379,
+     126,  -611,  -611,  -611,   198,  1932,  -611,   521,  -611,   372,
+     380,   381,  2158,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+     377,  1492,  -611,  -611,  -611,  -611,   257,  2158,   314,   385,
+     387,   388,   389,  1991,  -611,  1991,  1991,   122,  -611,  -611,
+    -611,  -611,  -611,  -611,    73,   127,  -611,  -611,   536,     2,
+      74,    73,   136,  -611,   401,   312,   140,  -611,  -611,  -611,
+    -611,  -611,   407,   409,   410,  -611,   198,  -611,   523,  1492,
+    1630,  -611,     4,   816,   816,  -611,  2199,  -611,  -611,  -611,
+    -611,  -611,  -611,   571,   430,  -611,   437,  1630,  -611,   442,
+     443,  -611,  -611,   349,    74,    73,   657,  -611,   584,  -611,
+     592,   449,   271,   271,   595,   816,   816,  -611,  1492,   599,
+    1492,  -611,  -611,  -611,  1492,   544,   271,   271,  -611,   601,
+    1492,  -611
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -619,   110,   128,   130,  -158,  -132,     0,  -116,  -126,   452,
-    -619,     8,  -619,  -619,  -619,  -619,    31,  -619,  -619,  -619,
-    -148,  -619,  -436,  -619,  -254,  -619,  -236,  -619,  -619,  -316,
-     -87,  -619,  -393,  -619,  -619,   -26,   318,  -150,  -619,   436,
-     445,  -114,  -156,  -240,   157,   199,   310,  -619,  -619,   536,
-    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    -619,   466,  -619,  -619,  -619,  -619,  -619,  -619,  -618,  -108,
-     186,  -192,  -619,  -619,   502,  -619,   438,  -619,  -619,  -619,
-     -38,   121,  -451,  -619,   446,  -619,  -619
+    -611,   183,   185,   189,  -166,  -110,     0,   -36,  -116,   528,
+    -611,     6,  -611,  -611,  -611,  -611,    27,  -611,  -611,  -611,
+    -145,  -611,  -526,  -611,  -260,  -611,  -237,  -611,  -611,  -314,
+     -13,  -611,  -420,  -611,  -611,   -26,   393,  -157,  -611,   514,
+     522,    75,  -153,  -258,   209,   246,   390,  -611,  -611,   610,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    -611,   539,  -611,  -611,  -611,  -611,  -611,  -611,  -610,   -85,
+     223,  -193,  -611,  -611,   574,  -611,   497,  -611,  -611,  -611,
+      16,   184,  -452,  -611,   505,  -611,  -611
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -221
+#define YYTABLE_NINF -222
 static const yytype_int16 yytable[] =
 {
-      11,    82,   272,   358,   322,   417,   105,   159,    13,   659,
-     526,   280,   162,   111,   676,   111,   111,    11,   111,   326,
-     327,   328,   329,   330,   289,    13,   377,   379,   493,   336,
-      91,   111,   111,   274,   318,   409,   111,   240,    94,   495,
-     534,   675,  -152,   111,   463,   111,   146,   131,   243,    44,
-     273,   468,   109,    64,    65,   147,   514,   515,   690,     1,
-     535,   319,     3,    21,     5,     1,     2,   463,     3,     4,
-       5,   494,    84,    85,   546,   337,   138,    24,    22,    89,
-     109,   146,   494,   432,     2,    90,   138,     4,   463,   286,
-     236,   463,   155,    11,   135,   287,   362,   469,   364,   136,
-     530,   119,   120,   593,    29,    30,    31,    32,    33,    34,
-      35,    36,    25,    37,   359,   360,   233,   234,    26,   112,
-     237,   112,   112,   363,   112,   365,   241,   419,   -61,   355,
-     354,    38,    39,    40,   626,   155,   467,   112,   112,   574,
-     414,   -61,   112,   283,   592,   416,   -61,   434,  -152,   112,
-     629,   112,  -152,   463,    27,   463,   163,   479,   481,   483,
-     464,   463,   547,    46,   644,    47,   543,   660,   320,   321,
-     283,   323,   677,    62,   106,   403,   338,   339,   403,   403,
-     403,    86,    95,    87,   324,   283,   283,   283,   283,   283,
-     331,   332,   333,   334,   335,   283,   572,   655,   116,   463,
-     117,    28,    58,   662,   663,   138,    59,   534,   598,    50,
-      51,    52,    60,   485,    53,   403,   155,   579,    91,   558,
-      38,    39,    40,   403,   403,   403,   403,   403,   584,   499,
-     566,   501,   502,   503,   654,   664,   566,   665,    98,   606,
-     545,   607,   219,   219,   691,   692,    99,   694,   695,   667,
-     100,   665,   456,   457,   458,   459,   460,   461,   462,   488,
-     220,   220,   221,   221,   705,   706,   102,   470,   471,   472,
-     103,   151,   152,   104,   410,   122,   123,   124,   125,   126,
-     127,    87,   511,   114,   115,   148,   142,   143,   385,   160,
-     150,   411,   412,   413,   165,   229,   231,   232,   235,   238,
-     239,   646,   403,   403,   403,   403,   242,   111,   281,   288,
-     272,   403,   433,   283,   436,   437,   438,   439,   356,   440,
-     357,   366,   367,   441,   442,   403,   443,   444,   445,   446,
-     447,   368,   369,   370,   380,   371,   372,   381,   517,   518,
-     519,   520,   382,   383,   405,   431,   435,   420,   421,   528,
-     466,   422,   423,   424,   425,   451,   452,   453,   273,   634,
-     476,   454,   455,   475,   529,   484,   608,   473,   486,   611,
-     612,   613,   487,   498,   504,   505,   507,   533,   508,   283,
-     403,   509,   513,   155,   522,   403,   523,   403,   542,   340,
-     403,   524,   548,   525,   527,   283,   500,   283,   283,   283,
-     403,   403,   531,   403,   532,   510,   155,   549,   580,   581,
-     582,   583,   551,   585,   552,   556,   564,   587,   588,   553,
-     554,   558,   559,   561,   562,   516,   563,   565,   682,   566,
-     590,   685,   571,   591,   575,   576,   577,   614,   578,   594,
-     403,   403,   595,   403,   403,   403,   403,   586,   596,   539,
-     597,   403,   601,   610,   466,   616,   341,   342,   494,   403,
-     622,   618,   619,   620,   621,   403,   623,   624,   627,   625,
-     628,   635,   406,   407,   408,   637,   343,   344,   642,   345,
-     346,   567,   347,   348,   349,   636,   638,   573,    64,    65,
-     647,   107,    67,    68,    69,    70,    71,    72,    73,   648,
-       1,     2,   403,     3,     4,     5,   649,   589,   651,   418,
-     652,   653,   693,   650,   658,   666,   668,   426,   427,   428,
-     429,   430,   669,   670,   672,   686,   687,   689,   -18,   -19,
-     696,    74,   283,   697,   698,   283,   283,   283,   708,   671,
-     699,     1,   703,   709,     3,   132,     5,   656,   149,   352,
-     403,   145,   361,    45,   403,   403,   130,    64,    65,    97,
-     107,    67,    68,    69,    70,    71,    72,    73,   633,     1,
-       2,   227,     3,     4,     5,   640,   340,   521,   645,   228,
-       0,     0,     0,     0,     0,     0,   403,   403,     0,   403,
-     640,   403,     0,   630,     0,   403,   489,   490,   491,   492,
-      74,   403,     0,     0,     0,   497,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   436,   437,   438,   439,   512,
-     440,     0,     0,     0,   441,   442,     0,   443,   444,   445,
-     446,   447,     0,     0,     0,     0,     0,     0,     0,   684,
-       0,     0,     0,   341,   342,     0,     0,    75,    76,     0,
-       0,    77,     0,    78,   108,   630,     0,     0,     0,     0,
-       0,     0,     0,   343,   344,     0,   345,   346,     0,   347,
-     348,   349,     0,     0,   550,     0,     0,     0,     0,   555,
-       0,   557,     0,     0,   560,     0,   301,   302,     0,     0,
-       0,     0,     0,     0,   568,   569,     0,   570,   436,   437,
-     438,   439,     0,   440,     0,     0,     0,   441,   442,     0,
-     443,   444,   445,   446,   447,     0,    75,    76,     0,     0,
-      77,     0,    78,   144,   290,   291,   292,   293,   294,   295,
-     296,   297,   298,   299,   599,   600,     0,   602,   603,   604,
-     605,     0,     0,     0,     0,   609,     0,     0,     0,     0,
-       0,     0,     0,   615,     0,     0,     0,     0,     0,   617,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,     0,     0,     0,     0,     0,     0,
-       0,   386,   387,   388,   389,    64,    65,   390,     0,     0,
-    -220,     0,     0,     0,     0,     0,   643,     1,     2,     0,
-       3,     4,     5,   391,   392,   393,     0,     0,   -63,     1,
-       2,     0,     3,     4,     5,     0,     0,     0,   394,   395,
-       6,     7,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   340,     0,     0,     0,     0,   396,     0,     0,
-       0,     0,     8,     0,   674,     0,     9,     0,   680,   681,
-      10,     0,     0,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,   189,   254,   255,
-     256,   257,     0,     0,     0,     0,     0,     0,     0,     0,
-     700,   701,     0,   702,     0,   704,     0,     0,     0,   707,
-       0,     0,     0,     0,     0,   710,     0,   258,   198,   678,
-     679,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-       0,   259,     0,   260,   261,   262,     0,   263,   264,   343,
-     344,     0,   345,   346,     0,   347,   348,   349,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   386,   387,   388,
-     389,    64,    65,   390,     0,   397,     0,     0,   398,     0,
-     399,     0,   400,     1,     2,     0,     3,     4,     5,   391,
-     392,   393,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   394,   395,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   111,
-       0,    64,    65,   396,   107,    67,    68,    69,    70,    71,
-      72,    73,     0,     1,     2,     0,     3,     4,     5,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
-     186,   187,   188,   189,   254,   255,   256,   257,     0,     0,
-       0,     0,     0,     0,    74,     0,     0,     0,     0,     0,
+      11,    82,   359,   322,   280,   272,    13,   418,   378,   380,
+     527,   105,   162,   660,   594,   677,   111,    11,   326,   327,
+     328,   329,   330,    13,    91,   111,   318,   289,   336,   410,
+     515,   516,    94,    29,    30,    31,    32,    33,    34,    35,
+      36,   111,    37,   274,   494,   535,   496,   111,    21,   131,
+     676,   146,   109,   111,   119,   120,   111,    50,    51,    52,
+     147,     1,    53,    22,     3,   536,     5,   691,    84,    85,
+     146,   243,   111,   273,    24,    89,   138,   433,   337,   236,
+     109,    90,   464,   319,   338,   339,   138,   495,   363,   495,
+     365,   470,   155,    11,    64,    65,   464,   107,    67,    68,
+      69,    70,    71,    72,    73,   531,     1,     2,   656,     3,
+       4,     5,   464,   464,   663,   664,   233,   234,   593,   468,
+     237,   548,   599,   112,   360,   361,   241,    25,   111,  -153,
+     286,    27,   112,   356,   627,   155,   287,    74,   420,    26,
+     480,   482,   484,   283,    28,   364,   435,   366,   112,   575,
+      38,    39,    40,    44,   112,   692,   693,   163,   695,   696,
+     112,   535,   355,   112,   645,    60,   415,   -61,   320,   321,
+     283,   323,   661,   135,   678,   706,   707,    95,   136,   112,
+     106,   111,   417,   -61,   324,   283,   283,   283,   283,   283,
+     331,   332,   333,   334,   335,   283,   159,   464,   404,   573,
+      58,   404,   404,   404,   469,   138,   464,     2,   464,   464,
+       4,   465,    59,   486,   544,   547,   155,     1,    62,    46,
+       3,    47,     5,   546,    91,    86,   240,    87,   116,   500,
+     117,   502,   503,   504,    98,   112,  -153,    99,   404,   -61,
+    -153,   580,   607,   559,   608,   102,   404,   404,   404,   404,
+     404,   100,   340,   489,    75,    76,   103,   585,    77,   567,
+      78,   108,   122,   123,   124,   125,   126,   127,   437,   438,
+     439,   440,   104,   441,   411,    87,   512,   442,   443,   142,
+     444,   445,   446,   447,   448,   655,   386,   567,   112,   630,
+     143,   412,   413,   414,    64,    65,    38,    39,    40,   665,
+     148,   666,   160,   668,   647,   666,     1,     2,   150,     3,
+       4,     5,   434,   283,   272,   219,   219,   220,   220,   341,
+     342,   221,   221,   151,   152,   340,   404,   404,   404,   404,
+     114,   115,   165,   229,   231,   404,   235,   232,   238,   343,
+     344,   239,   345,   346,   242,   347,   348,   349,   111,   404,
+     288,   467,   281,   357,   358,   367,   350,   368,   381,   635,
+     432,   369,   406,   370,   371,   436,   609,   372,   373,   612,
+     613,   614,   382,   383,   477,   384,   452,   485,   534,   421,
+     283,   422,   273,   423,   155,   424,   425,   694,   453,   426,
+     454,   530,   341,   342,   455,   456,   283,   501,   283,   283,
+     283,   474,   476,   499,   404,   543,   511,   155,   487,   404,
+     488,   404,   343,   344,   404,   345,   346,   549,   347,   348,
+     349,   505,   506,   508,   404,   404,   517,   404,   683,   350,
+     509,   686,   510,   550,   514,   523,   557,   524,   301,   302,
+     525,   526,   457,   458,   459,   460,   461,   462,   463,   528,
+     540,   532,   565,   533,   552,   467,   553,   471,   472,   473,
+     566,   554,   555,   591,   404,   404,   559,   404,   404,   404,
+     404,   560,   562,   563,   564,   404,   587,   567,   592,   572,
+     576,   577,   568,   404,   578,   579,   595,   596,   574,   404,
+     437,   438,   439,   440,   597,   441,   611,   598,   615,   442,
+     443,   495,   444,   445,   446,   447,   448,   602,   590,   407,
+     408,   409,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,   314,   315,   316,   404,   617,   518,   519,
+     520,   521,   623,   283,   624,   625,   283,   283,   283,   529,
+     626,   628,   629,   636,   637,   638,   419,   643,   648,   639,
+     649,   650,   651,   659,   427,   428,   429,   430,   431,   290,
+     291,   292,   293,   294,   295,   296,   297,   298,   299,   634,
+     669,   667,   670,   671,   404,   687,   641,   673,   404,   404,
+      64,    65,   688,   107,    67,    68,    69,    70,    71,    72,
+      73,   641,     1,     2,   631,     3,     4,     5,   581,   582,
+     583,   584,   690,   586,   -18,   -19,   697,   588,   589,   698,
+     404,   404,   700,   404,   699,   404,   704,   709,   710,   404,
+     672,   132,   657,    74,   353,   404,   149,    45,   145,   130,
+     227,    97,   362,   646,   490,   491,   492,   493,   228,     0,
+     685,   522,     0,   498,     0,     0,     0,     0,     0,     0,
+       0,   619,   620,   621,   622,     0,   631,   513,     0,     0,
+       0,     0,     0,     0,     0,     0,    64,    65,     0,   107,
+      67,    68,    69,    70,    71,    72,    73,     0,     1,     2,
+       0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   652,     0,
+     653,   654,     0,     0,     0,     0,     0,     0,     0,    74,
+       0,     0,   551,     0,     0,     0,     0,   556,     0,   558,
+       0,     0,   561,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   569,   570,     0,   571,     0,     0,     0,     0,
+      75,    76,     0,     0,    77,     0,    78,   144,     0,     0,
+      64,    65,     0,   107,    67,    68,    69,    70,    71,    72,
+      73,     0,     1,     2,     0,     3,     4,     5,     0,     0,
+       0,     0,   600,   601,     0,   603,   604,   605,   606,     0,
+       0,     0,     0,   610,     0,     0,     0,     0,     0,     0,
+       0,   616,     0,    74,     0,     0,     0,   618,   437,   438,
+     439,   440,     0,   441,     0,     0,     0,   442,   443,     0,
+     444,   445,   446,   447,   448,     0,     0,     0,     0,   387,
+     388,   389,   390,    64,    65,   391,    75,    76,  -221,     0,
+      77,     0,    78,   379,   644,     1,     2,     0,     3,     4,
+       5,   392,   393,   394,     0,     0,   -63,     1,     2,     0,
+       3,     4,     5,     0,     0,     0,   395,   396,     6,     7,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   258,   198,   199,   200,   201,   202,   203,
-     204,   205,   206,   207,   208,   209,     0,   259,     0,   260,
-     261,   262,     0,   263,   264,     0,     0,     0,     0,     0,
+     340,     0,     0,     0,     0,   397,     0,     0,     0,     0,
+       8,     0,   675,     0,     9,     0,   681,   682,    10,     0,
+       0,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   254,   255,   256,   257,
+      75,    76,     0,     0,    77,     0,    78,   466,   701,   702,
+       0,   703,     0,   705,     0,     0,     0,   708,     0,     0,
+       0,     0,     0,   711,     0,   258,   198,   679,   680,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,     0,   259,
+       0,   260,   261,   262,     0,   263,   264,   343,   344,     0,
+     345,   346,     0,   347,   348,   349,     0,     0,     0,     0,
+       0,     0,     0,     0,   350,     0,   387,   388,   389,   390,
+      64,    65,   391,     0,   398,     0,     0,   399,     0,   400,
+       0,   401,     1,     2,     0,     3,     4,     5,   392,   393,
+     394,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   395,   396,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   111,     0,
+      64,    65,   397,   107,    67,    68,    69,    70,    71,    72,
+      73,     0,     1,     2,     0,     3,     4,     5,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   254,   255,   256,   257,     0,     0,     0,
+       0,     0,     0,    74,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   112,     0,     0,     0,     0,
-       0,   397,     0,     0,   398,     0,   399,     0,   400,   244,
-     245,   246,   247,    64,    65,   248,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     1,     2,     0,     3,     4,
+       0,     0,   258,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,     0,   259,  -220,   260,   261,
+     262,     0,   263,   264,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   -63,     1,     2,     0,     3,
+       4,     5,     0,     0,     0,   112,     0,     6,     7,     0,
+       0,   398,     0,     0,   399,     0,   400,     0,   401,   244,
+     245,   246,   247,    64,    65,   248,     0,     0,     0,     8,
+       0,     0,     0,     9,     0,     1,     2,    10,     3,     4,
        5,   249,   250,   251,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   252,   253,     0,     0,
-      75,    76,     0,     0,    77,     0,    78,   378,     0,     0,
+      75,    76,     0,     0,    77,     0,    78,   483,     0,     0,
        0,   111,    64,    65,     0,   107,    67,    68,    69,    70,
       71,    72,    73,     0,     1,     2,     0,     3,     4,     5,
        0,   175,   176,   177,   178,   179,   180,   181,   182,   183,
@@ -2418,244 +2425,238 @@
      202,   203,   204,   205,   206,   207,   208,   209,     0,   259,
        0,   260,   261,   262,     0,   263,   264,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   112,     0,     0,
-       0,   -61,     0,   265,     0,     0,   266,     0,   267,     0,
-     268,   244,   245,   246,   247,    64,    65,   248,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     1,     2,     0,
-       3,     4,     5,   249,   250,   251,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   252,   253,
-       0,    75,    76,     0,     0,    77,     0,    78,   465,     0,
-       0,     0,     0,   111,    64,    65,     0,   107,    67,    68,
-      69,    70,    71,    72,    73,     0,     1,     2,     0,     3,
-       4,     5,     0,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,   189,   254,   255,
-     256,   257,     0,     0,     0,     0,     0,    74,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   112,     0,
+       0,     0,   -61,     0,   265,     0,     0,   266,     0,   267,
+       0,   268,   244,   245,   246,   247,    64,    65,   248,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     1,     2,
+       0,     3,     4,     5,   249,   250,   251,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   252,
+     253,     0,    75,    76,     0,     0,    77,     0,    78,   545,
+       0,     0,     0,     0,   111,    64,    65,     0,   153,    67,
+      68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
+       3,     4,     5,     0,   175,   176,   177,   178,   179,   180,
+     181,   182,   183,   184,   185,   186,   187,   188,   189,   254,
+     255,   256,   257,     0,     0,     0,     0,     0,    74,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   258,   198,
+     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
+     209,     0,   259,     0,   260,   261,   262,     0,   263,   264,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   258,   198,   199,
-     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-       0,   259,     0,   260,   261,   262,     0,   263,   264,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   112,
-       0,     0,     0,     0,     0,   265,     0,     0,   266,     0,
-     267,     0,   268,   386,   387,   388,   389,    64,    65,   390,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     1,
-       2,     0,     3,     4,     5,   391,   392,   393,     0,     0,
+       0,   112,     0,     0,     0,     0,     0,   265,     0,     0,
+     266,     0,   267,   154,   268,   387,   388,   389,   390,    64,
+      65,   391,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     1,     2,     0,     3,     4,     5,   392,   393,   394,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     394,   395,  -219,    75,    76,     0,     0,    77,     0,    78,
-     482,     0,     0,     0,     0,     0,     0,     0,     0,   396,
-     -63,     1,     2,     0,     3,     4,     5,     0,     0,     0,
-       0,     0,     6,     7,     0,   175,   176,   177,   178,   179,
+       0,     0,   395,   396,     0,    75,    76,     0,     0,    77,
+       0,    78,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   397,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   175,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
+     188,   189,   254,   255,   256,   257,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   258,   198,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,     0,   259,     0,   260,   261,   262,
+       0,   263,   264,   387,   388,   389,   390,     0,     0,   391,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   392,   393,   394,     0,     0,
+     398,     0,     0,   399,     0,   400,     0,   401,     0,     0,
+     395,   396,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    64,    65,   397,
+     153,    67,    68,    69,    70,    71,    72,    73,     0,     1,
+       2,     0,     3,     4,     5,   175,   176,   177,   178,   179,
      180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
-     254,   255,   256,   257,     8,     0,     0,     0,     9,     0,
-       0,     0,    10,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   258,
+     254,   255,   256,   257,     0,     0,     0,     0,    64,    65,
+      74,   107,    67,    68,    69,    70,    71,    72,    73,     0,
+       1,     2,     0,     3,     4,     5,     0,     0,     0,   258,
      198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
      208,   209,     0,   259,     0,   260,   261,   262,     0,   263,
-     264,   386,   387,   388,   389,     0,     0,   390,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   391,   392,   393,     0,   397,     0,     0,
-     398,     0,   399,     0,   400,     0,     0,     0,   394,   395,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    64,    65,   396,   107,    67,
+     264,    74,    64,    65,     0,   107,    67,    68,    69,    70,
+      71,    72,    73,     0,     1,     2,     0,     3,     4,     5,
+       0,     0,     0,     0,     0,     0,     0,     0,   398,     0,
+       0,   399,     0,   400,   137,   401,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    74,     0,     0,     0,     0,
+       0,   275,   276,     0,   277,    64,    65,   278,   107,    67,
       68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
-       3,     4,     5,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,   189,   254,   255,
-     256,   257,     0,     0,     0,     0,    64,    65,    74,   153,
+       3,     4,     5,     0,     0,     0,     0,    75,    76,     0,
+       0,    77,     0,    78,     0,     0,     0,   352,     0,     0,
+       0,     0,     0,     0,     0,     0,    64,    65,    74,   107,
       67,    68,    69,    70,    71,    72,    73,     0,     1,     2,
-       0,     3,     4,     5,     0,     0,     0,   258,   198,   199,
-     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-       0,   259,     0,   260,   261,   262,     0,   263,   264,    74,
-       0,    64,    65,     0,   107,    67,    68,    69,    70,    71,
-      72,    73,     0,     1,     2,     0,     3,     4,     5,     0,
-       0,     0,     0,     0,     0,   397,     0,     0,   398,     0,
-     399,     0,   400,   137,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    74,    64,    65,     0,   153,    67,
-      68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
-       3,     4,     5,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    75,    76,     0,     0,    77,     0,
-      78,   544,     0,     0,     0,     0,     0,     0,    74,     0,
-     275,   276,     0,   277,    64,    65,   278,   107,    67,    68,
+       0,     3,     4,     5,     0,     0,     0,     0,    75,    76,
+       0,   374,    77,     0,    78,     0,     0,     0,    64,    65,
+       0,   107,    67,    68,    69,    70,    71,    72,    73,    74,
+       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     539,     0,    75,    76,     0,     0,    77,     0,    78,    64,
+      65,    74,   107,    67,    68,    69,    70,    71,    72,    73,
+       0,     1,     2,     0,     3,     4,     5,    64,    65,     0,
+      66,    67,    68,    69,    70,    71,    72,    73,     0,     1,
+       2,   633,     3,     4,     5,     0,     0,     0,     0,     0,
+       0,     0,    74,     0,     0,    75,    76,     0,     0,    77,
+       0,    78,     0,     0,     0,     0,     0,     0,    64,    65,
+      74,   107,    67,    68,    69,    70,    71,    72,    73,     0,
+       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    75,    76,     0,   479,
+      77,     0,    78,     0,     0,     0,     0,     0,     0,    64,
+      65,    74,   282,    67,    68,    69,    70,    71,    72,    73,
+       0,     1,     2,     0,     3,     4,     5,     0,    75,    76,
+       0,     0,    77,     0,    78,     0,     0,     0,    64,    65,
+       0,   107,    67,    68,    69,    70,    71,    72,    73,     0,
+       1,     2,    74,     3,     4,     5,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    75,
+      76,     0,     0,    77,     0,    78,     0,     0,     0,     0,
+       0,    74,     0,     0,     0,     0,     0,    75,    76,     0,
+       0,    77,     0,    78,    64,    65,     0,   107,    67,    68,
       69,    70,    71,    72,    73,     0,     1,     2,     0,     3,
-       4,     5,     0,     0,     0,    75,    76,     0,     0,    77,
-       0,    78,     0,     0,     0,     0,   351,     0,     0,     0,
-       0,     0,     0,     0,     0,    64,    65,    74,   107,    67,
-      68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
+       4,     5,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    75,    76,
+       0,     0,    77,     0,    78,    64,    65,    74,   107,    67,
+      68,    69,    70,    71,    72,   640,     0,     1,     2,     0,
        3,     4,     5,     0,     0,     0,     0,     0,     0,     0,
-      75,    76,     0,   154,    77,     0,    78,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    64,    65,    74,   107,
-      67,    68,    69,    70,    71,    72,    73,     0,     1,     2,
-       0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    75,
+      76,     0,     0,    77,     0,    78,    64,    65,    74,   107,
+      67,    68,    69,    70,    71,    72,   684,   166,     1,     2,
+       0,     3,     4,     5,     0,     0,     0,     0,    75,    76,
+       0,     0,    77,     0,   377,     0,     0,     0,   167,   168,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
+     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
+     189,   190,   191,   192,   193,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    75,    76,     0,     0,    77,     0,
-      78,     0,     0,     0,     0,     0,     0,    64,    65,    74,
-     107,    67,    68,    69,    70,    71,    72,    73,     0,     1,
-       2,     0,     3,     4,     5,    64,    65,     0,   107,    67,
-      68,    69,    70,    71,    72,    73,     0,     1,     2,   538,
-       3,     4,     5,    75,    76,     0,     0,    77,     0,    78,
-      74,     0,     0,     0,     0,     0,     0,   632,     0,     0,
-       0,     0,     0,     0,     0,     0,    64,    65,    74,    66,
-      67,    68,    69,    70,    71,    72,    73,     0,     1,     2,
-       0,     3,     4,     5,    75,    76,     0,   373,    77,     0,
-      78,    64,    65,     0,   107,    67,    68,    69,    70,    71,
-      72,    73,     0,     1,     2,     0,     3,     4,     5,    74,
+     481,     0,     0,     0,     0,   194,   195,   196,     0,     0,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   218,     0,     0,     0,    75,    76,     0,     0,    77,
+       0,    78,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    75,    76,     0,   478,    77,
-       0,    78,    64,    65,    74,   282,    67,    68,    69,    70,
-      71,    72,    73,     0,     1,     2,     0,     3,     4,     5,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    75,    76,     0,     0,
-      77,     0,    78,     0,     0,    74,     0,     0,     0,     0,
-       0,     0,     0,     0,    75,    76,     0,     0,    77,     0,
-      78,    64,    65,     0,   107,    67,    68,    69,    70,    71,
-      72,    73,     0,     1,     2,     0,     3,     4,     5,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    75,    76,     0,     0,    77,
-       0,    78,    64,    65,    74,   107,    67,    68,    69,    70,
-      71,    72,    73,     0,     1,     2,     0,     3,     4,     5,
-      75,    76,     0,     0,    77,     0,    78,    64,    65,     0,
-     107,    67,    68,    69,    70,    71,    72,   639,     0,     1,
-       2,     0,     3,     4,     5,    74,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    75,    76,     0,     0,    77,     0,    78,    64,    65,
-      74,   107,    67,    68,    69,    70,    71,    72,   683,     0,
-       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    74,     0,     0,     0,     0,     0,     0,     0,     0,
-      75,    76,     0,     0,    77,     0,   376,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     166,    75,    76,     0,     0,    77,     0,   480,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   167,   168,     0,     0,     0,    75,    76,     0,     0,
-      77,     0,    78,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
-     186,   187,   188,   189,   190,   191,   192,   193,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    75,    76,     0,
-       0,    77,     0,    78,     0,     0,     0,     0,   194,   195,
-     196,     0,     0,   197,   198,   199,   200,   201,   202,   203,
-     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
-     214,   215,   216,   217,   218
+      77,     0,    78
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,    27,   158,   239,   196,   321,     4,   121,     0,    11,
-     461,   161,    28,    55,    11,    55,    55,    17,    55,   211,
-     212,   213,   214,   215,   172,    17,   266,   267,    11,   221,
-      21,    55,    55,   159,   192,   289,    55,   151,    29,    11,
-      34,   659,    55,    55,   164,    55,   164,     7,   156,     0,
-     158,   171,    78,     7,     8,   173,   449,   450,   676,    19,
-      54,   193,    22,    53,    24,    19,    20,   164,    22,    23,
-      24,    54,    41,    42,   171,   223,   102,   163,    68,    48,
-     106,   164,    54,   337,    20,    54,   112,    23,   164,    11,
-     173,   164,   118,    93,   164,    17,   254,   173,   256,   169,
-     173,    32,    33,   539,    42,    43,    44,    45,    46,    47,
-      48,    49,    59,    51,   240,   241,   142,   143,   163,   161,
-     146,   161,   161,   255,   161,   257,   152,   167,   165,   171,
-     169,   158,   159,   160,   585,   161,   376,   161,   161,   162,
-     164,   165,   161,   169,   537,   164,   165,   339,   161,   161,
-     162,   161,   165,   164,    18,   164,   172,   397,   398,   399,
-     169,   164,   173,    46,   615,    48,   169,   169,   194,   195,
-     196,   197,   169,    22,   172,   283,   117,   118,   286,   287,
-     288,    35,   173,    37,   210,   211,   212,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,   512,   633,    42,   164,
-      44,   163,   163,   639,   640,   231,   163,    34,   173,    42,
-      43,    44,   167,   405,    47,   323,   242,   162,    21,   164,
-     158,   159,   160,   331,   332,   333,   334,   335,   162,   421,
-     164,   423,   424,   425,   162,   162,   164,   164,    22,   555,
-     480,   557,   132,   133,   680,   681,    22,   683,   684,   162,
-      22,   164,   366,   367,   368,   369,   370,   371,   372,   409,
-     132,   133,   132,   133,   700,   701,   161,   381,   382,   383,
-       4,   114,   115,     4,   300,    62,    63,    64,    65,    66,
-      67,    37,   432,    84,    85,   161,   168,   168,   280,     4,
-     165,   317,   318,   319,   163,    22,   164,   162,   171,     4,
-     162,   617,   410,   411,   412,   413,   161,    55,    57,    11,
-     466,   419,   338,   339,   141,   142,   143,   144,   171,   146,
-     162,   161,   161,   150,   151,   433,   153,   154,   155,   156,
-     157,   161,   161,   161,    22,   161,   161,   161,   452,   453,
-     454,   455,   161,   161,   164,    38,     4,   164,   164,   463,
-     376,   164,   164,   164,   164,    38,   161,   161,   466,   595,
-      61,   161,   161,   161,   171,    22,   558,   164,   164,   561,
-     562,   563,   164,   167,   164,   164,   164,    38,   164,   405,
-     488,   164,   164,   409,   164,   493,   164,   495,    22,    54,
-     498,   164,    17,   164,   164,   421,   422,   423,   424,   425,
-     508,   509,   164,   511,   164,   431,   432,    17,   522,   523,
-     524,   525,   164,   527,   164,     4,     4,   531,   532,   164,
-     164,   164,   164,   164,   164,   451,   164,     4,   664,   164,
-      22,   667,   164,     4,   164,   164,   164,     4,   164,   164,
-     548,   549,   162,   551,   552,   553,   554,   171,   164,   475,
-     171,   559,   161,   164,   480,   161,   121,   122,    54,   567,
-     164,   575,   576,   577,   578,   573,   162,   164,   162,   164,
-     162,    22,   286,   287,   288,   164,   141,   142,   169,   144,
-     145,   507,   147,   148,   149,   171,   167,   513,     7,     8,
-     162,    10,    11,    12,    13,    14,    15,    16,    17,   162,
-      19,    20,   610,    22,    23,    24,   162,   533,   622,   323,
-     624,   625,    38,   162,    17,   169,   162,   331,   332,   333,
-     334,   335,   162,   162,    54,     4,   152,   164,   161,   161,
-      22,    50,   558,    17,   164,   561,   562,   563,    73,   655,
-      17,    19,    17,    17,    22,    93,    24,   634,   112,   231,
-     658,   106,   242,    17,   662,   663,    90,     7,     8,    57,
-      10,    11,    12,    13,    14,    15,    16,    17,   594,    19,
-      20,   133,    22,    23,    24,   601,    54,   456,   616,   133,
-      -1,    -1,    -1,    -1,    -1,    -1,   694,   695,    -1,   697,
-     616,   699,    -1,   593,    -1,   703,   410,   411,   412,   413,
-      50,   709,    -1,    -1,    -1,   419,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   141,   142,   143,   144,   433,
-     146,    -1,    -1,    -1,   150,   151,    -1,   153,   154,   155,
-     156,   157,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   665,
-      -1,    -1,    -1,   121,   122,    -1,    -1,   166,   167,    -1,
-      -1,   170,    -1,   172,   173,   655,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   141,   142,    -1,   144,   145,    -1,   147,
-     148,   149,    -1,    -1,   488,    -1,    -1,    -1,    -1,   493,
-      -1,   495,    -1,    -1,   498,    -1,    26,    27,    -1,    -1,
-      -1,    -1,    -1,    -1,   508,   509,    -1,   511,   141,   142,
+       0,    27,   239,   196,   161,   158,     0,   321,   266,   267,
+     462,     4,    28,    11,   540,    11,    55,    17,   211,   212,
+     213,   214,   215,    17,    21,    55,   192,   172,   221,   289,
+     450,   451,    29,    42,    43,    44,    45,    46,    47,    48,
+      49,    55,    51,   159,    11,    34,    11,    55,    53,     7,
+     660,   165,    78,    55,    32,    33,    55,    42,    43,    44,
+     174,    19,    47,    68,    22,    54,    24,   677,    41,    42,
+     165,   156,    55,   158,   164,    48,   102,   337,   223,   174,
+     106,    54,   165,   193,   117,   118,   112,    54,   254,    54,
+     256,   174,   118,    93,     7,     8,   165,    10,    11,    12,
+      13,    14,    15,    16,    17,   174,    19,    20,   634,    22,
+      23,    24,   165,   165,   640,   641,   142,   143,   538,   377,
+     146,   174,   174,   162,   240,   241,   152,    59,    55,    55,
+      11,    18,   162,   172,   586,   161,    17,    50,   168,   164,
+     398,   399,   400,   169,   164,   255,   339,   257,   162,   163,
+     159,   160,   161,     0,   162,   681,   682,   173,   684,   685,
+     162,    34,   170,   162,   616,   168,   165,   166,   194,   195,
+     196,   197,   170,   165,   170,   701,   702,   174,   170,   162,
+     173,    55,   165,   166,   210,   211,   212,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,   121,   165,   283,   513,
+     164,   286,   287,   288,   172,   231,   165,    20,   165,   165,
+      23,   170,   164,   406,   170,   172,   242,    19,    22,    46,
+      22,    48,    24,   481,    21,    35,   151,    37,    42,   422,
+      44,   424,   425,   426,    22,   162,   162,    22,   323,   166,
+     166,   163,   556,   165,   558,   162,   331,   332,   333,   334,
+     335,    22,    54,   410,   167,   168,     4,   163,   171,   165,
+     173,   174,    62,    63,    64,    65,    66,    67,   141,   142,
+     143,   144,     4,   146,   300,    37,   433,   150,   151,   169,
+     153,   154,   155,   156,   157,   163,   280,   165,   162,   163,
+     169,   317,   318,   319,     7,     8,   159,   160,   161,   163,
+     162,   165,     4,   163,   618,   165,    19,    20,   166,    22,
+      23,    24,   338,   339,   467,   132,   133,   132,   133,   121,
+     122,   132,   133,   114,   115,    54,   411,   412,   413,   414,
+      84,    85,   164,    22,   165,   420,   172,   163,     4,   141,
+     142,   163,   144,   145,   162,   147,   148,   149,    55,   434,
+      11,   377,    57,   172,   163,   162,   158,   162,    22,   596,
+      38,   162,   165,   162,   162,     4,   559,   162,   162,   562,
+     563,   564,   162,   162,    61,   162,    38,    22,    38,   165,
+     406,   165,   467,   165,   410,   165,   165,    38,   162,   165,
+     162,   172,   121,   122,   162,   162,   422,   423,   424,   425,
+     426,   165,   162,   168,   489,    22,   432,   433,   165,   494,
+     165,   496,   141,   142,   499,   144,   145,    17,   147,   148,
+     149,   165,   165,   165,   509,   510,   452,   512,   665,   158,
+     165,   668,   165,    17,   165,   165,     4,   165,    26,    27,
+     165,   165,   367,   368,   369,   370,   371,   372,   373,   165,
+     476,   165,     4,   165,   165,   481,   165,   382,   383,   384,
+       4,   165,   165,    22,   549,   550,   165,   552,   553,   554,
+     555,   165,   165,   165,   165,   560,   172,   165,     4,   165,
+     165,   165,   508,   568,   165,   165,   165,   163,   514,   574,
+     141,   142,   143,   144,   165,   146,   165,   172,     4,   150,
+     151,    54,   153,   154,   155,   156,   157,   162,   534,   286,
+     287,   288,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   611,   162,   453,   454,
+     455,   456,   165,   559,   163,   165,   562,   563,   564,   464,
+     165,   163,   163,    22,   172,   165,   323,   170,   163,   168,
+     163,   163,   163,    17,   331,   332,   333,   334,   335,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   595,
+     163,   170,   163,   163,   659,     4,   602,    54,   663,   664,
+       7,     8,   152,    10,    11,    12,    13,    14,    15,    16,
+      17,   617,    19,    20,   594,    22,    23,    24,   523,   524,
+     525,   526,   165,   528,   162,   162,    22,   532,   533,    17,
+     695,   696,    17,   698,   165,   700,    17,    73,    17,   704,
+     656,    93,   635,    50,   231,   710,   112,    17,   106,    90,
+     133,    57,   242,   617,   411,   412,   413,   414,   133,    -1,
+     666,   457,    -1,   420,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   576,   577,   578,   579,    -1,   656,   434,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    -1,    10,
+      11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
+      -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   623,    -1,
+     625,   626,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,
+      -1,    -1,   489,    -1,    -1,    -1,    -1,   494,    -1,   496,
+      -1,    -1,   499,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   509,   510,    -1,   512,    -1,    -1,    -1,    -1,
+     167,   168,    -1,    -1,   171,    -1,   173,   174,    -1,    -1,
+       7,     8,    -1,    10,    11,    12,    13,    14,    15,    16,
+      17,    -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,
+      -1,    -1,   549,   550,    -1,   552,   553,   554,   555,    -1,
+      -1,    -1,    -1,   560,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   568,    -1,    50,    -1,    -1,    -1,   574,   141,   142,
      143,   144,    -1,   146,    -1,    -1,    -1,   150,   151,    -1,
-     153,   154,   155,   156,   157,    -1,   166,   167,    -1,    -1,
-     170,    -1,   172,   173,    94,    95,    96,    97,    98,    99,
-     100,   101,   102,   103,   548,   549,    -1,   551,   552,   553,
-     554,    -1,    -1,    -1,    -1,   559,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   567,    -1,    -1,    -1,    -1,    -1,   573,
-     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
-     110,   111,   112,   113,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,     4,     5,     6,     7,     8,     9,    -1,    -1,
-       0,    -1,    -1,    -1,    -1,    -1,   610,    19,    20,    -1,
-      22,    23,    24,    25,    26,    27,    -1,    -1,    18,    19,
-      20,    -1,    22,    23,    24,    -1,    -1,    -1,    40,    41,
-      30,    31,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    54,    -1,    -1,    -1,    -1,    59,    -1,    -1,
-      -1,    -1,    52,    -1,   658,    -1,    56,    -1,   662,   663,
-      60,    -1,    -1,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     694,   695,    -1,   697,    -1,   699,    -1,    -1,    -1,   703,
-      -1,    -1,    -1,    -1,    -1,   709,    -1,   119,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-      -1,   133,    -1,   135,   136,   137,    -1,   139,   140,   141,
-     142,    -1,   144,   145,    -1,   147,   148,   149,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,     5,
-       6,     7,     8,     9,    -1,   167,    -1,    -1,   170,    -1,
-     172,    -1,   174,    19,    20,    -1,    22,    23,    24,    25,
-      26,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,
-      -1,     7,     8,    59,    10,    11,    12,    13,    14,    15,
-      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    -1,    -1,
-      -1,    -1,    -1,    -1,    50,    -1,    -1,    -1,    -1,    -1,
+     153,   154,   155,   156,   157,    -1,    -1,    -1,    -1,     3,
+       4,     5,     6,     7,     8,     9,   167,   168,     0,    -1,
+     171,    -1,   173,   174,   611,    19,    20,    -1,    22,    23,
+      24,    25,    26,    27,    -1,    -1,    18,    19,    20,    -1,
+      22,    23,    24,    -1,    -1,    -1,    40,    41,    30,    31,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,    -1,   133,    -1,   135,
-     136,   137,    -1,   139,   140,    -1,    -1,    -1,    -1,    -1,
+      54,    -1,    -1,    -1,    -1,    59,    -1,    -1,    -1,    -1,
+      52,    -1,   659,    -1,    56,    -1,   663,   664,    60,    -1,
+      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+     167,   168,    -1,    -1,   171,    -1,   173,   174,   695,   696,
+      -1,   698,    -1,   700,    -1,    -1,    -1,   704,    -1,    -1,
+      -1,    -1,    -1,   710,    -1,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   129,   130,   131,    -1,   133,
+      -1,   135,   136,   137,    -1,   139,   140,   141,   142,    -1,
+     144,   145,    -1,   147,   148,   149,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   158,    -1,     3,     4,     5,     6,
+       7,     8,     9,    -1,   168,    -1,    -1,   171,    -1,   173,
+      -1,   175,    19,    20,    -1,    22,    23,    24,    25,    26,
+      27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,    -1,
+       7,     8,    59,    10,    11,    12,    13,    14,    15,    16,
+      17,    -1,    19,    20,    -1,    22,    23,    24,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    -1,    -1,    -1,
+      -1,    -1,    -1,    50,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   161,    -1,    -1,    -1,    -1,
-      -1,   167,    -1,    -1,   170,    -1,   172,    -1,   174,     3,
-       4,     5,     6,     7,     8,     9,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    19,    20,    -1,    22,    23,
+      -1,    -1,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,    -1,   133,     0,   135,   136,
+     137,    -1,   139,   140,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    18,    19,    20,    -1,    22,
+      23,    24,    -1,    -1,    -1,   162,    -1,    30,    31,    -1,
+      -1,   168,    -1,    -1,   171,    -1,   173,    -1,   175,     3,
+       4,     5,     6,     7,     8,     9,    -1,    -1,    -1,    52,
+      -1,    -1,    -1,    56,    -1,    19,    20,    60,    22,    23,
       24,    25,    26,    27,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    40,    41,    -1,    -1,
-     166,   167,    -1,    -1,   170,    -1,   172,   173,    -1,    -1,
+     167,   168,    -1,    -1,   171,    -1,   173,   174,    -1,    -1,
       -1,    55,     7,     8,    -1,    10,    11,    12,    13,    14,
       15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
       -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
@@ -2666,124 +2667,114 @@
      124,   125,   126,   127,   128,   129,   130,   131,    -1,   133,
       -1,   135,   136,   137,    -1,   139,   140,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,    -1,    -1,
-      -1,   165,    -1,   167,    -1,    -1,   170,    -1,   172,    -1,
-     174,     3,     4,     5,     6,     7,     8,     9,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    19,    20,    -1,
-      22,    23,    24,    25,    26,    27,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    41,
-      -1,   166,   167,    -1,    -1,   170,    -1,   172,   173,    -1,
-      -1,    -1,    -1,    55,     7,     8,    -1,    10,    11,    12,
-      13,    14,    15,    16,    17,    -1,    19,    20,    -1,    22,
-      23,    24,    -1,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    -1,    -1,    -1,    -1,    -1,    50,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   162,    -1,
+      -1,    -1,   166,    -1,   168,    -1,    -1,   171,    -1,   173,
+      -1,   175,     3,     4,     5,     6,     7,     8,     9,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    19,    20,
+      -1,    22,    23,    24,    25,    26,    27,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,
+      41,    -1,   167,   168,    -1,    -1,   171,    -1,   173,   174,
+      -1,    -1,    -1,    -1,    55,     7,     8,    -1,    10,    11,
+      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
+      22,    23,    24,    -1,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    -1,    -1,    -1,    -1,    -1,    50,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   119,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-      -1,   133,    -1,   135,   136,   137,    -1,   139,   140,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   119,   120,
+     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
+     131,    -1,   133,    -1,   135,   136,   137,    -1,   139,   140,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,
-      -1,    -1,    -1,    -1,    -1,   167,    -1,    -1,   170,    -1,
-     172,    -1,   174,     3,     4,     5,     6,     7,     8,     9,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    19,
-      20,    -1,    22,    23,    24,    25,    26,    27,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      40,    41,     0,   166,   167,    -1,    -1,   170,    -1,   172,
-     173,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    59,
-      18,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
-      -1,    -1,    30,    31,    -1,    75,    76,    77,    78,    79,
+      -1,   162,    -1,    -1,    -1,    -1,    -1,   168,    -1,    -1,
+     171,    -1,   173,   125,   175,     3,     4,     5,     6,     7,
+       8,     9,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    19,    20,    -1,    22,    23,    24,    25,    26,    27,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    40,    41,    -1,   167,   168,    -1,    -1,   171,
+      -1,   173,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    59,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   129,   130,   131,    -1,   133,    -1,   135,   136,   137,
+      -1,   139,   140,     3,     4,     5,     6,    -1,    -1,     9,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    25,    26,    27,    -1,    -1,
+     168,    -1,    -1,   171,    -1,   173,    -1,   175,    -1,    -1,
+      40,    41,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    59,
+      10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
+      20,    -1,    22,    23,    24,    75,    76,    77,    78,    79,
       80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    52,    -1,    -1,    -1,    56,    -1,
-      -1,    -1,    60,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   119,
+      90,    91,    92,    93,    -1,    -1,    -1,    -1,     7,     8,
+      50,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
+      19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,   119,
      120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
      130,   131,    -1,   133,    -1,   135,   136,   137,    -1,   139,
-     140,     3,     4,     5,     6,    -1,    -1,     9,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    25,    26,    27,    -1,   167,    -1,    -1,
-     170,    -1,   172,    -1,   174,    -1,    -1,    -1,    40,    41,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     7,     8,    59,    10,    11,
-      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
-      22,    23,    24,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    -1,    -1,    -1,    -1,     7,     8,    50,    10,
-      11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-      -1,    22,    23,    24,    -1,    -1,    -1,   119,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-      -1,   133,    -1,   135,   136,   137,    -1,   139,   140,    50,
-      -1,     7,     8,    -1,    10,    11,    12,    13,    14,    15,
-      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    -1,
-      -1,    -1,    -1,    -1,    -1,   167,    -1,    -1,   170,    -1,
-     172,    -1,   174,    39,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    50,     7,     8,    -1,    10,    11,
-      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
-      22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,    -1,
-     172,   173,    -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,
-     141,   142,    -1,   144,     7,     8,   147,    10,    11,    12,
-      13,    14,    15,    16,    17,    -1,    19,    20,    -1,    22,
-      23,    24,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,
-      -1,   172,    -1,    -1,    -1,    -1,    39,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     7,     8,    50,    10,    11,
+     140,    50,     7,     8,    -1,    10,    11,    12,    13,    14,
+      15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   168,    -1,
+      -1,   171,    -1,   173,    39,   175,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    50,    -1,    -1,    -1,    -1,
+      -1,   141,   142,    -1,   144,     7,     8,   147,    10,    11,
       12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
-      22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     166,   167,    -1,   125,   170,    -1,   172,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    50,    10,
-      11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-      -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,    -1,
-     172,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    50,
-      10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
-      20,    -1,    22,    23,    24,     7,     8,    -1,    10,    11,
-      12,    13,    14,    15,    16,    17,    -1,    19,    20,    39,
-      22,    23,    24,   166,   167,    -1,    -1,   170,    -1,   172,
-      50,    -1,    -1,    -1,    -1,    -1,    -1,    39,    -1,    -1,
+      22,    23,    24,    -1,    -1,    -1,    -1,   167,   168,    -1,
+      -1,   171,    -1,   173,    -1,    -1,    -1,    39,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    50,    10,
       11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-      -1,    22,    23,    24,   166,   167,    -1,   169,   170,    -1,
-     172,     7,     8,    -1,    10,    11,    12,    13,    14,    15,
-      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    50,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   166,   167,    -1,   169,   170,
-      -1,   172,     7,     8,    50,    10,    11,    12,    13,    14,
-      15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   166,   167,    -1,    -1,
-     170,    -1,   172,    -1,    -1,    50,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,    -1,
-     172,     7,     8,    -1,    10,    11,    12,    13,    14,    15,
-      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    -1,
+      -1,    22,    23,    24,    -1,    -1,    -1,    -1,   167,   168,
+      -1,   170,   171,    -1,   173,    -1,    -1,    -1,     7,     8,
+      -1,    10,    11,    12,    13,    14,    15,    16,    17,    50,
+      19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,
-      -1,   172,     7,     8,    50,    10,    11,    12,    13,    14,
-      15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
-     166,   167,    -1,    -1,   170,    -1,   172,     7,     8,    -1,
+      39,    -1,   167,   168,    -1,    -1,   171,    -1,   173,     7,
+       8,    50,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,     7,     8,    -1,
       10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
-      20,    -1,    22,    23,    24,    50,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   166,   167,    -1,    -1,   170,    -1,   172,     7,     8,
+      20,    39,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    50,    -1,    -1,   167,   168,    -1,    -1,   171,
+      -1,   173,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,
       50,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
       19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   167,   168,    -1,   170,
+     171,    -1,   173,    -1,    -1,    -1,    -1,    -1,    -1,     7,
+       8,    50,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,   167,   168,
+      -1,    -1,   171,    -1,   173,    -1,    -1,    -1,     7,     8,
+      -1,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
+      19,    20,    50,    22,    23,    24,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   167,
+     168,    -1,    -1,   171,    -1,   173,    -1,    -1,    -1,    -1,
+      -1,    50,    -1,    -1,    -1,    -1,    -1,   167,   168,    -1,
+      -1,   171,    -1,   173,     7,     8,    -1,    10,    11,    12,
+      13,    14,    15,    16,    17,    -1,    19,    20,    -1,    22,
+      23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   167,   168,
+      -1,    -1,   171,    -1,   173,     7,     8,    50,    10,    11,
+      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
+      22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   167,
+     168,    -1,    -1,   171,    -1,   173,     7,     8,    50,    10,
+      11,    12,    13,    14,    15,    16,    17,    36,    19,    20,
+      -1,    22,    23,    24,    -1,    -1,    -1,    -1,   167,   168,
+      -1,    -1,   171,    -1,   173,    -1,    -1,    -1,    57,    58,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,
+      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,    93,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   167,   168,    -1,    -1,   171,    -1,
+     173,    -1,    -1,    -1,    -1,   114,   115,   116,    -1,    -1,
+     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
+     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
+     139,   140,    -1,    -1,    -1,   167,   168,    -1,    -1,   171,
+      -1,   173,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    50,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     166,   167,    -1,    -1,   170,    -1,   172,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      36,   166,   167,    -1,    -1,   170,    -1,   172,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    57,    58,    -1,    -1,    -1,   166,   167,    -1,    -1,
-     170,    -1,   172,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   166,   167,    -1,
-      -1,   170,    -1,   172,    -1,    -1,    -1,    -1,   114,   115,
-     116,    -1,    -1,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,   139,   140
+      -1,    -1,    -1,    -1,    -1,    -1,   167,   168,    -1,    -1,
+     171,    -1,   173
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2791,77 +2782,77 @@
 static const yytype_uint16 yystos[] =
 {
        0,    19,    20,    22,    23,    24,    30,    31,    52,    56,
-      60,   181,   184,   186,   187,   188,   222,   223,   224,   226,
-     225,    53,    68,   231,   163,    59,   163,    18,   163,    42,
-      43,    44,    45,    46,    47,    48,    49,    51,   158,   159,
-     160,   189,   190,   191,     0,   224,    46,    48,   192,   241,
-      42,    43,    44,    47,   193,   238,   240,   248,   163,   163,
-     167,   232,    22,   230,     7,     8,    10,    11,    12,    13,
-      14,    15,    16,    17,    50,   166,   167,   170,   172,   181,
-     186,   209,   210,   244,   191,   191,    35,    37,   220,   191,
-     191,    21,   249,   250,    29,   173,   239,   249,    22,    22,
-      22,   233,   161,     4,     4,     4,   172,    10,   173,   210,
-     215,    55,   161,   183,   220,   220,    42,    44,   194,    32,
-      33,   219,    62,    63,    64,    65,    66,    67,   195,   236,
-     236,     7,   184,   185,   253,   164,   169,    39,   210,   211,
-     213,   214,   168,   168,   173,   215,   164,   173,   161,   214,
-     165,   219,   219,    10,   125,   210,   212,   221,   210,   216,
-       4,   199,    28,   172,   237,   163,    36,    57,    58,    69,
+      60,   182,   185,   187,   188,   189,   223,   224,   225,   227,
+     226,    53,    68,   232,   164,    59,   164,    18,   164,    42,
+      43,    44,    45,    46,    47,    48,    49,    51,   159,   160,
+     161,   190,   191,   192,     0,   225,    46,    48,   193,   242,
+      42,    43,    44,    47,   194,   239,   241,   249,   164,   164,
+     168,   233,    22,   231,     7,     8,    10,    11,    12,    13,
+      14,    15,    16,    17,    50,   167,   168,   171,   173,   182,
+     187,   210,   211,   245,   192,   192,    35,    37,   221,   192,
+     192,    21,   250,   251,    29,   174,   240,   250,    22,    22,
+      22,   234,   162,     4,     4,     4,   173,    10,   174,   211,
+     216,    55,   162,   184,   221,   221,    42,    44,   195,    32,
+      33,   220,    62,    63,    64,    65,    66,    67,   196,   237,
+     237,     7,   185,   186,   254,   165,   170,    39,   211,   212,
+     214,   215,   169,   169,   174,   216,   165,   174,   162,   215,
+     166,   220,   220,    10,   125,   211,   213,   222,   211,   217,
+       4,   200,    28,   173,   238,   164,    36,    57,    58,    69,
       70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
       80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
       90,    91,    92,    93,   114,   115,   116,   119,   120,   121,
      122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   139,   140,   176,
-     177,   178,   251,   258,   259,   260,   261,   251,   259,    22,
-     197,   164,   162,   210,   210,   171,   173,   210,     4,   162,
-     216,   210,   161,   244,     3,     4,     5,     6,     9,    25,
+     132,   133,   134,   135,   136,   137,   138,   139,   140,   177,
+     178,   179,   252,   259,   260,   261,   262,   252,   260,    22,
+     198,   165,   163,   211,   211,   172,   174,   211,     4,   163,
+     217,   211,   162,   245,     3,     4,     5,     6,     9,    25,
       26,    27,    40,    41,    90,    91,    92,    93,   119,   133,
-     135,   136,   137,   139,   140,   167,   170,   172,   174,   176,
-     177,   178,   217,   244,   183,   141,   142,   144,   147,   198,
-     212,    57,    10,   210,   246,   247,    11,    17,    11,   195,
+     135,   136,   137,   139,   140,   168,   171,   173,   175,   177,
+     178,   179,   218,   245,   184,   141,   142,   144,   147,   199,
+     213,    57,    10,   211,   247,   248,    11,    17,    11,   196,
       94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-     179,    26,    27,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   180,   179,   180,
-     210,   210,   246,   210,   210,   254,   246,   246,   246,   246,
-     246,   210,   210,   210,   210,   210,   246,   195,   117,   118,
+     180,    26,    27,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   181,   180,   181,
+     211,   211,   247,   211,   211,   255,   247,   247,   247,   247,
+     247,   211,   211,   211,   211,   211,   247,   196,   117,   118,
       54,   121,   122,   141,   142,   144,   145,   147,   148,   149,
-     196,    39,   211,   201,   169,   171,   171,   162,   201,   183,
-     183,   221,   179,   180,   179,   180,   161,   161,   161,   161,
-     161,   161,   161,   169,   216,   218,   172,   218,   173,   218,
-      22,   161,   161,   161,   227,   186,     3,     4,     5,     6,
-       9,    25,    26,    27,    40,    41,    59,   167,   170,   172,
-     174,   217,   243,   244,   245,   164,   245,   245,   245,   199,
-     210,   210,   210,   210,   164,   204,   164,   204,   245,   167,
-     164,   164,   164,   164,   164,   164,   245,   245,   245,   245,
-     245,    38,   199,   210,   246,     4,   141,   142,   143,   144,
-     146,   150,   151,   153,   154,   155,   156,   157,   200,   228,
-     229,    38,   161,   161,   161,   161,   216,   216,   216,   216,
-     216,   216,   216,   164,   169,   173,   210,   218,   171,   173,
-     216,   216,   216,   164,   207,   161,    61,   242,   169,   218,
-     172,   218,   173,   218,    22,   246,   164,   164,   212,   245,
-     245,   245,   245,    11,    54,    11,   256,   245,   167,   246,
-     210,   246,   246,   246,   164,   164,   257,   164,   164,   164,
-     210,   212,   245,   164,   207,   207,   210,   216,   216,   216,
-     216,   256,   164,   164,   164,   164,   257,   164,   216,   171,
-     173,   164,   164,    38,    34,    54,   205,   208,    39,   210,
-     234,   235,    22,   169,   173,   218,   171,   173,    17,    17,
-     245,   164,   164,   164,   164,   245,     4,   245,   164,   164,
-     245,   164,   164,   164,     4,     4,   164,   210,   245,   245,
-     245,   164,   204,   210,   162,   164,   164,   164,   164,   162,
-     216,   216,   216,   216,   162,   216,   171,   216,   216,   210,
-      22,     4,   207,   197,   164,   162,   164,   171,   173,   245,
-     245,   161,   245,   245,   245,   245,   204,   204,   246,   245,
-     164,   246,   246,   246,     4,   245,   161,   245,   216,   216,
-     216,   216,   164,   162,   164,   164,   257,   162,   162,   162,
-     181,   182,    39,   210,   201,    22,   171,   164,   167,    17,
-     210,   255,   169,   245,   257,   255,   204,   162,   162,   162,
-     162,   216,   216,   216,   162,   197,   205,   206,    17,    11,
-     169,   252,   197,   197,   162,   164,   169,   162,   162,   162,
-     162,   182,    54,   203,   245,   243,    11,   169,   121,   122,
-     245,   245,   201,    17,   210,   201,     4,   152,   202,   164,
-     243,   197,   197,    38,   197,   197,    22,    17,   164,    17,
-     245,   245,   245,    17,   245,   197,   197,   245,    73,    17,
-     245
+     158,   197,    39,   212,   202,   170,   172,   172,   163,   202,
+     184,   184,   222,   180,   181,   180,   181,   162,   162,   162,
+     162,   162,   162,   162,   170,   217,   219,   173,   219,   174,
+     219,    22,   162,   162,   162,   228,   187,     3,     4,     5,
+       6,     9,    25,    26,    27,    40,    41,    59,   168,   171,
+     173,   175,   218,   244,   245,   246,   165,   246,   246,   246,
+     200,   211,   211,   211,   211,   165,   205,   165,   205,   246,
+     168,   165,   165,   165,   165,   165,   165,   246,   246,   246,
+     246,   246,    38,   200,   211,   247,     4,   141,   142,   143,
+     144,   146,   150,   151,   153,   154,   155,   156,   157,   201,
+     229,   230,    38,   162,   162,   162,   162,   217,   217,   217,
+     217,   217,   217,   217,   165,   170,   174,   211,   219,   172,
+     174,   217,   217,   217,   165,   208,   162,    61,   243,   170,
+     219,   173,   219,   174,   219,    22,   247,   165,   165,   213,
+     246,   246,   246,   246,    11,    54,    11,   257,   246,   168,
+     247,   211,   247,   247,   247,   165,   165,   258,   165,   165,
+     165,   211,   213,   246,   165,   208,   208,   211,   217,   217,
+     217,   217,   257,   165,   165,   165,   165,   258,   165,   217,
+     172,   174,   165,   165,    38,    34,    54,   206,   209,    39,
+     211,   235,   236,    22,   170,   174,   219,   172,   174,    17,
+      17,   246,   165,   165,   165,   165,   246,     4,   246,   165,
+     165,   246,   165,   165,   165,     4,     4,   165,   211,   246,
+     246,   246,   165,   205,   211,   163,   165,   165,   165,   165,
+     163,   217,   217,   217,   217,   163,   217,   172,   217,   217,
+     211,    22,     4,   208,   198,   165,   163,   165,   172,   174,
+     246,   246,   162,   246,   246,   246,   246,   205,   205,   247,
+     246,   165,   247,   247,   247,     4,   246,   162,   246,   217,
+     217,   217,   217,   165,   163,   165,   165,   258,   163,   163,
+     163,   182,   183,    39,   211,   202,    22,   172,   165,   168,
+      17,   211,   256,   170,   246,   258,   256,   205,   163,   163,
+     163,   163,   217,   217,   217,   163,   198,   206,   207,    17,
+      11,   170,   253,   198,   198,   163,   165,   170,   163,   163,
+     163,   163,   183,    54,   204,   246,   244,    11,   170,   121,
+     122,   246,   246,   202,    17,   211,   202,     4,   152,   203,
+     165,   244,   198,   198,    38,   198,   198,    22,    17,   165,
+      17,   246,   246,   246,    17,   246,   198,   198,   246,    73,
+      17,   246
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -4057,180 +4048,189 @@
 
   case 108:
 #line 1275 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ByVal;     ;}
+    { (yyval.Attributes) = Attribute::NoCapture; ;}
     break;
 
   case 109:
 #line 1276 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::Nest;      ;}
+    { (yyval.Attributes) = Attribute::ByVal;     ;}
     break;
 
   case 110:
 #line 1277 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) =
-                          Attribute::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val));    ;}
+    { (yyval.Attributes) = Attribute::Nest;      ;}
     break;
 
   case 111:
-#line 1281 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::None; ;}
+#line 1278 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) =
+                          Attribute::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val));    ;}
     break;
 
   case 112:
 #line 1282 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    {
-                (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
-              ;}
+    { (yyval.Attributes) = Attribute::None; ;}
     break;
 
   case 113:
-#line 1287 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::InReg;    ;}
+#line 1283 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    {
+                (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
+              ;}
     break;
 
   case 114:
 #line 1288 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ZExt;     ;}
+    { (yyval.Attributes) = Attribute::InReg;    ;}
     break;
 
   case 115:
 #line 1289 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::SExt;     ;}
+    { (yyval.Attributes) = Attribute::ZExt;     ;}
     break;
 
   case 116:
 #line 1290 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::NoAlias;  ;}
+    { (yyval.Attributes) = Attribute::SExt;     ;}
     break;
 
   case 117:
-#line 1293 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::None; ;}
+#line 1291 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::NoAlias;  ;}
     break;
 
   case 118:
 #line 1294 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    {
-               (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
-             ;}
+    { (yyval.Attributes) = Attribute::None; ;}
     break;
 
   case 119:
-#line 1300 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::NoReturn; ;}
+#line 1295 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    {
+               (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
+             ;}
     break;
 
   case 120:
 #line 1301 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::NoUnwind; ;}
+    { (yyval.Attributes) = Attribute::NoReturn; ;}
     break;
 
   case 121:
 #line 1302 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::InReg;     ;}
+    { (yyval.Attributes) = Attribute::NoUnwind; ;}
     break;
 
   case 122:
 #line 1303 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ZExt;     ;}
+    { (yyval.Attributes) = Attribute::InReg;     ;}
     break;
 
   case 123:
 #line 1304 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::SExt;     ;}
+    { (yyval.Attributes) = Attribute::ZExt;     ;}
     break;
 
   case 124:
 #line 1305 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ReadNone; ;}
+    { (yyval.Attributes) = Attribute::SExt;     ;}
     break;
 
   case 125:
 #line 1306 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ReadOnly; ;}
+    { (yyval.Attributes) = Attribute::ReadNone; ;}
     break;
 
   case 126:
 #line 1307 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::NoInline; ;}
+    { (yyval.Attributes) = Attribute::ReadOnly; ;}
     break;
 
   case 127:
 #line 1308 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::AlwaysInline; ;}
+    { (yyval.Attributes) = Attribute::NoInline; ;}
     break;
 
   case 128:
 #line 1309 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::OptimizeForSize; ;}
+    { (yyval.Attributes) = Attribute::AlwaysInline; ;}
     break;
 
   case 129:
 #line 1310 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::StackProtect; ;}
+    { (yyval.Attributes) = Attribute::OptimizeForSize; ;}
     break;
 
   case 130:
 #line 1311 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::StackProtectReq; ;}
+    { (yyval.Attributes) = Attribute::StackProtect; ;}
     break;
 
   case 131:
-#line 1314 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::None; ;}
+#line 1312 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::StackProtectReq; ;}
     break;
 
   case 132:
 #line 1315 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::None; ;}
+    break;
+
+  case 133:
+#line 1316 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
               ;}
     break;
 
-  case 133:
-#line 1321 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 134:
+#line 1322 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
-  case 134:
-#line 1322 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 135:
+#line 1323 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
               ;}
     break;
 
-  case 135:
-#line 1329 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 136:
+#line 1330 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 136:
-#line 1330 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 137:
+#line 1331 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
     GEN_ERROR("Alignment must be a power of two");
+  if ((yyval.UIntVal) > 0x40000000)
+    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 137:
-#line 1336 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 138:
+#line 1339 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 138:
-#line 1337 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 139:
+#line 1340 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
     GEN_ERROR("Alignment must be a power of two");
+  if ((yyval.UIntVal) > 0x40000000)
+    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 139:
-#line 1346 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 140:
+#line 1351 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   for (unsigned i = 0, e = (yyvsp[(2) - (2)].StrVal)->length(); i != e; ++i)
     if ((*(yyvsp[(2) - (2)].StrVal))[i] == '"' || (*(yyvsp[(2) - (2)].StrVal))[i] == '\\')
@@ -4240,28 +4240,28 @@
 ;}
     break;
 
-  case 140:
-#line 1354 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = 0; ;}
-    break;
-
   case 141:
-#line 1355 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
+#line 1359 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = 0; ;}
     break;
 
   case 142:
 #line 1360 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    {;}
+    { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
     break;
 
   case 143:
-#line 1361 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+#line 1365 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 144:
-#line 1362 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+#line 1366 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    {;}
+    break;
+
+  case 145:
+#line 1367 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -4269,34 +4269,36 @@
   ;}
     break;
 
-  case 145:
-#line 1367 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 146:
+#line 1372 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two");
+    if ((yyvsp[(2) - (2)].UInt64Val) > 0x40000000)
+      GEN_ERROR("Alignment too large");
     CurGV->setAlignment((yyvsp[(2) - (2)].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 153:
-#line 1383 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 154:
+#line 1390 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 154:
-#line 1387 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 155:
+#line 1394 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 155:
-#line 1391 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 156:
+#line 1398 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[(1) - (3)].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -4306,8 +4308,8 @@
   ;}
     break;
 
-  case 156:
-#line 1398 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 157:
+#line 1405 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
     const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal));
     CHECK_FOR_ERROR
@@ -4315,8 +4317,8 @@
   ;}
     break;
 
-  case 157:
-#line 1403 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 158:
+#line 1410 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                   // Type UpReference
     if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
@@ -4327,8 +4329,8 @@
   ;}
     break;
 
-  case 158:
-#line 1411 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 159:
+#line 1418 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4366,8 +4368,8 @@
   ;}
     break;
 
-  case 159:
-#line 1446 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 160:
+#line 1453 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4400,8 +4402,8 @@
   ;}
     break;
 
-  case 160:
-#line 1477 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 161:
+#line 1484 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (yyvsp[(2) - (5)].UInt64Val))));
     delete (yyvsp[(4) - (5)].TypeVal);
@@ -4409,8 +4411,8 @@
   ;}
     break;
 
-  case 161:
-#line 1482 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 162:
+#line 1489 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {          // Vector type?
      const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal)->get();
      if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val))
@@ -4423,8 +4425,8 @@
   ;}
     break;
 
-  case 162:
-#line 1492 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 163:
+#line 1499 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
@@ -4437,16 +4439,16 @@
   ;}
     break;
 
-  case 163:
-#line 1502 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 164:
+#line 1509 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 164:
-#line 1506 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 165:
+#line 1513 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
@@ -4459,16 +4461,16 @@
   ;}
     break;
 
-  case 165:
-#line 1516 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 166:
+#line 1523 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 166:
-#line 1523 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 167:
+#line 1530 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4477,8 +4479,8 @@
   ;}
     break;
 
-  case 167:
-#line 1532 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 168:
+#line 1539 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription());
@@ -4488,15 +4490,15 @@
   ;}
     break;
 
-  case 168:
-#line 1539 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 169:
+#line 1546 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
-  case 169:
-#line 1544 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 170:
+#line 1551 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs));
@@ -4504,16 +4506,16 @@
   ;}
     break;
 
-  case 170:
-#line 1549 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 171:
+#line 1556 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 172:
-#line 1557 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 173:
+#line 1564 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = Attribute::None;
@@ -4523,8 +4525,8 @@
   ;}
     break;
 
-  case 173:
-#line 1564 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 174:
+#line 1571 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = Attribute::None;
@@ -4534,16 +4536,16 @@
   ;}
     break;
 
-  case 174:
-#line 1571 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 175:
+#line 1578 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 175:
-#line 1579 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 176:
+#line 1586 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal));
@@ -4552,8 +4554,8 @@
   ;}
     break;
 
-  case 176:
-#line 1585 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 177:
+#line 1592 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal));
     delete (yyvsp[(3) - (3)].TypeVal);
@@ -4561,8 +4563,8 @@
   ;}
     break;
 
-  case 177:
-#line 1597 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 178:
+#line 1604 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4593,8 +4595,8 @@
   ;}
     break;
 
-  case 178:
-#line 1625 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 179:
+#line 1632 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4613,8 +4615,8 @@
   ;}
     break;
 
-  case 179:
-#line 1641 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 180:
+#line 1648 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4644,8 +4646,8 @@
   ;}
     break;
 
-  case 180:
-#line 1668 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 181:
+#line 1675 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4676,8 +4678,8 @@
   ;}
     break;
 
-  case 181:
-#line 1696 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 182:
+#line 1703 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (STy == 0)
@@ -4706,8 +4708,8 @@
   ;}
     break;
 
-  case 182:
-#line 1722 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 183:
+#line 1729 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4730,8 +4732,8 @@
   ;}
     break;
 
-  case 183:
-#line 1742 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 184:
+#line 1749 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (6)].TypeVal)->get());
     if (STy == 0)
@@ -4760,8 +4762,8 @@
   ;}
     break;
 
-  case 184:
-#line 1768 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 185:
+#line 1775 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription());
@@ -4784,8 +4786,8 @@
   ;}
     break;
 
-  case 185:
-#line 1788 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 186:
+#line 1795 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4800,8 +4802,8 @@
   ;}
     break;
 
-  case 186:
-#line 1800 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 187:
+#line 1807 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4811,8 +4813,8 @@
   ;}
     break;
 
-  case 187:
-#line 1807 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 188:
+#line 1814 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4881,8 +4883,8 @@
   ;}
     break;
 
-  case 188:
-#line 1873 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 189:
+#line 1880 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4895,8 +4897,8 @@
   ;}
     break;
 
-  case 189:
-#line 1883 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 190:
+#line 1890 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4909,8 +4911,8 @@
   ;}
     break;
 
-  case 190:
-#line 1893 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 191:
+#line 1900 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (IntegerType *IT = dyn_cast<IntegerType>((yyvsp[(1) - (2)].TypeVal)->get())) {
       if (!ConstantInt::isValueValidForType(IT, (yyvsp[(2) - (2)].SInt64Val)))
@@ -4924,8 +4926,8 @@
   ;}
     break;
 
-  case 191:
-#line 1904 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 192:
+#line 1911 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     if (IntegerType *IT = dyn_cast<IntegerType>((yyvsp[(1) - (2)].TypeVal)->get())) {
       if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > IT->getBitWidth())
@@ -4941,8 +4943,8 @@
   ;}
     break;
 
-  case 192:
-#line 1917 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 193:
+#line 1924 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (IntegerType *IT = dyn_cast<IntegerType>((yyvsp[(1) - (2)].TypeVal)->get())) {
       if (!ConstantInt::isValueValidForType(IT, (yyvsp[(2) - (2)].UInt64Val)))
@@ -4956,8 +4958,8 @@
   ;}
     break;
 
-  case 193:
-#line 1928 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 194:
+#line 1935 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     if (IntegerType *IT = dyn_cast<IntegerType>((yyvsp[(1) - (2)].TypeVal)->get())) {
       if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > IT->getBitWidth())
@@ -4974,8 +4976,8 @@
   ;}
     break;
 
-  case 194:
-#line 1942 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 195:
+#line 1949 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     if ((yyvsp[(1) - (2)].TypeVal)->get() != Type::Int1Ty)
       GEN_ERROR("Constant true must have type i1");
@@ -4985,8 +4987,8 @@
   ;}
     break;
 
-  case 195:
-#line 1949 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 196:
+#line 1956 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     if ((yyvsp[(1) - (2)].TypeVal)->get() != Type::Int1Ty)
       GEN_ERROR("Constant false must have type i1");
@@ -4996,8 +4998,8 @@
   ;}
     break;
 
-  case 196:
-#line 1956 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 197:
+#line 1963 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                   // Floating point constants
     if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].TypeVal)->get(), *(yyvsp[(2) - (2)].FPVal)))
       GEN_ERROR("Floating point constant invalid for type");
@@ -5016,8 +5018,8 @@
   ;}
     break;
 
-  case 197:
-#line 1974 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 198:
+#line 1981 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
@@ -5032,8 +5034,8 @@
   ;}
     break;
 
-  case 198:
-#line 1986 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 199:
+#line 1993 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
@@ -5057,8 +5059,8 @@
   ;}
     break;
 
-  case 199:
-#line 2007 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 200:
+#line 2014 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
@@ -5069,8 +5071,8 @@
   ;}
     break;
 
-  case 200:
-#line 2015 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 201:
+#line 2022 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
@@ -5079,8 +5081,8 @@
   ;}
     break;
 
-  case 201:
-#line 2021 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 202:
+#line 2028 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
@@ -5094,8 +5096,8 @@
   ;}
     break;
 
-  case 202:
-#line 2032 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 203:
+#line 2039 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
@@ -5103,8 +5105,8 @@
   ;}
     break;
 
-  case 203:
-#line 2037 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 204:
+#line 2044 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
@@ -5112,8 +5114,8 @@
   ;}
     break;
 
-  case 204:
-#line 2042 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 205:
+#line 2049 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vicmp operand types must match");
@@ -5121,8 +5123,8 @@
   ;}
     break;
 
-  case 205:
-#line 2047 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 206:
+#line 2054 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vfcmp operand types must match");
@@ -5130,8 +5132,8 @@
   ;}
     break;
 
-  case 206:
-#line 2052 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 207:
+#line 2059 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -5140,8 +5142,8 @@
   ;}
     break;
 
-  case 207:
-#line 2058 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 208:
+#line 2065 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -5150,8 +5152,8 @@
   ;}
     break;
 
-  case 208:
-#line 2064 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 209:
+#line 2071 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -5160,8 +5162,8 @@
   ;}
     break;
 
-  case 209:
-#line 2070 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 210:
+#line 2077 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (5)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("ExtractValue requires an aggregate operand");
@@ -5172,8 +5174,8 @@
   ;}
     break;
 
-  case 210:
-#line 2078 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 211:
+#line 2085 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (7)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (7)].ConstVal)->getType()))
       GEN_ERROR("InsertValue requires an aggregate operand");
@@ -5184,16 +5186,16 @@
   ;}
     break;
 
-  case 211:
-#line 2089 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 212:
+#line 2096 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 212:
-#line 2093 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 213:
+#line 2100 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
@@ -5201,28 +5203,28 @@
   ;}
     break;
 
-  case 213:
-#line 2101 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 214:
+#line 2108 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 214:
-#line 2101 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 215:
+#line 2108 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 215:
-#line 2104 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 216:
+#line 2111 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 216:
-#line 2104 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 217:
+#line 2111 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 217:
-#line 2107 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 218:
+#line 2114 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get();
     Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal));
@@ -5237,8 +5239,8 @@
    ;}
     break;
 
-  case 218:
-#line 2119 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 219:
+#line 2126 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     Constant *Val = (yyvsp[(3) - (6)].ConstVal);
     const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
@@ -5253,8 +5255,8 @@
    ;}
     break;
 
-  case 219:
-#line 2140 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 220:
+#line 2147 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5262,8 +5264,8 @@
   ;}
     break;
 
-  case 220:
-#line 2145 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 221:
+#line 2152 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5271,40 +5273,40 @@
   ;}
     break;
 
-  case 223:
-#line 2158 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 224:
+#line 2165 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
-  case 224:
-#line 2158 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 225:
+#line 2165 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 225:
-#line 2162 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 226:
+#line 2169 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
-  case 226:
-#line 2162 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 227:
+#line 2169 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 227:
-#line 2165 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 228:
+#line 2172 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 228:
-#line 2168 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 229:
+#line 2175 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription());
@@ -5331,8 +5333,8 @@
   ;}
     break;
 
-  case 229:
-#line 2192 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 230:
+#line 2199 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType));
 
@@ -5346,8 +5348,8 @@
   ;}
     break;
 
-  case 230:
-#line 2204 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 231:
+#line 2211 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     /* "Externally Visible" Linkage */
     if ((yyvsp[(5) - (6)].ConstVal) == 0)
@@ -5358,15 +5360,15 @@
   ;}
     break;
 
-  case 231:
-#line 2211 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 232:
+#line 2218 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 232:
-#line 2215 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 233:
+#line 2222 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(6) - (7)].ConstVal) == 0)
       GEN_ERROR("Global value initializer is not a constant");
@@ -5375,15 +5377,15 @@
   ;}
     break;
 
-  case 233:
-#line 2220 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 234:
+#line 2227 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 234:
-#line 2224 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 235:
+#line 2231 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (7)].TypeVal))->getDescription());
@@ -5393,16 +5395,16 @@
   ;}
     break;
 
-  case 235:
-#line 2230 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 236:
+#line 2237 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 236:
-#line 2234 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 237:
+#line 2241 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     std::string Name;
     if ((yyvsp[(1) - (5)].StrVal)) {
@@ -5445,22 +5447,22 @@
   ;}
     break;
 
-  case 237:
-#line 2274 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 238:
+#line 2281 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 238:
-#line 2277 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 239:
+#line 2284 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 239:
-#line 2283 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 240:
+#line 2290 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   if (AsmSoFar.empty())
@@ -5472,24 +5474,24 @@
 ;}
     break;
 
-  case 240:
-#line 2293 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 241:
+#line 2300 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
   ;}
     break;
 
-  case 241:
-#line 2297 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 242:
+#line 2304 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
   ;}
     break;
 
-  case 243:
-#line 2304 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 244:
+#line 2311 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal));
           delete (yyvsp[(3) - (3)].StrVal);
@@ -5497,8 +5499,8 @@
         ;}
     break;
 
-  case 244:
-#line 2309 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 245:
+#line 2316 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal));
           delete (yyvsp[(1) - (1)].StrVal);
@@ -5506,15 +5508,15 @@
         ;}
     break;
 
-  case 245:
-#line 2314 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 246:
+#line 2321 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
-  case 246:
-#line 2323 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 247:
+#line 2330 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -5527,8 +5529,8 @@
   ;}
     break;
 
-  case 247:
-#line 2333 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 248:
+#line 2340 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -5541,16 +5543,16 @@
   ;}
     break;
 
-  case 248:
-#line 2344 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 249:
+#line 2351 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 249:
-#line 2348 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 250:
+#line 2355 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
     struct ArgListEntry E;
@@ -5562,8 +5564,8 @@
   ;}
     break;
 
-  case 250:
-#line 2357 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 251:
+#line 2364 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -5575,16 +5577,16 @@
   ;}
     break;
 
-  case 251:
-#line 2366 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 252:
+#line 2373 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 252:
-#line 2372 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 253:
+#line 2379 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   std::string FunctionName(*(yyvsp[(4) - (11)].StrVal));
   delete (yyvsp[(4) - (11)].StrVal);  // Free strdup'd memory!
@@ -5734,8 +5736,8 @@
 ;}
     break;
 
-  case 255:
-#line 2522 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 256:
+#line 2529 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -5746,16 +5748,16 @@
 ;}
     break;
 
-  case 258:
-#line 2533 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 259:
+#line 2540 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 259:
-#line 2538 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 260:
+#line 2545 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage));
     CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility));
@@ -5765,40 +5767,40 @@
   ;}
     break;
 
-  case 260:
-#line 2550 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 261:
+#line 2557 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 261:
-#line 2554 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 262:
+#line 2561 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 262:
-#line 2559 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 263:
+#line 2566 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 263:
-#line 2563 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 264:
+#line 2570 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 264:
-#line 2567 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 265:
+#line 2574 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     (yyval.ValIDVal) = ValID::create(*(yyvsp[(1) - (1)].APIntVal), true);
     delete (yyvsp[(1) - (1)].APIntVal);
@@ -5806,8 +5808,8 @@
   ;}
     break;
 
-  case 265:
-#line 2572 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 266:
+#line 2579 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     (yyval.ValIDVal) = ValID::create(*(yyvsp[(1) - (1)].APIntVal), false);
     delete (yyvsp[(1) - (1)].APIntVal);
@@ -5815,56 +5817,56 @@
   ;}
     break;
 
-  case 266:
-#line 2577 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 267:
+#line 2584 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 267:
-#line 2581 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 268:
+#line 2588 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 268:
-#line 2585 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 269:
+#line 2592 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 269:
-#line 2589 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 270:
+#line 2596 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 270:
-#line 2593 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 271:
+#line 2600 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 271:
-#line 2597 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 272:
+#line 2604 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 272:
-#line 2601 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 273:
+#line 2608 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     unsigned NumElements = (yyvsp[(2) - (3)].ConstVector)->size();
@@ -5889,8 +5891,8 @@
   ;}
     break;
 
-  case 273:
-#line 2623 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 274:
+#line 2630 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     uint64_t NumElements = (yyvsp[(2) - (3)].ConstVector)->size();
@@ -5915,8 +5917,8 @@
   ;}
     break;
 
-  case 274:
-#line 2645 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 275:
+#line 2652 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Use undef instead of an array because it's inconvenient to determine
     // the element type at this point, there being no elements to examine.
@@ -5925,8 +5927,8 @@
   ;}
     break;
 
-  case 275:
-#line 2651 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 276:
+#line 2658 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     uint64_t NumElements = (yyvsp[(2) - (2)].StrVal)->length();
     const Type *ETy = Type::Int8Ty;
@@ -5942,8 +5944,8 @@
   ;}
     break;
 
-  case 276:
-#line 2664 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 277:
+#line 2671 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(2) - (3)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(2) - (3)].ConstVector)->size(); i != e; ++i)
@@ -5958,8 +5960,8 @@
   ;}
     break;
 
-  case 277:
-#line 2676 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 278:
+#line 2683 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>());
     (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, std::vector<Constant*>()));
@@ -5967,8 +5969,8 @@
   ;}
     break;
 
-  case 278:
-#line 2681 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 279:
+#line 2688 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(3) - (5)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(3) - (5)].ConstVector)->size(); i != e; ++i)
@@ -5983,8 +5985,8 @@
   ;}
     break;
 
-  case 279:
-#line 2693 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 280:
+#line 2700 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>(),
                                             /*isPacked=*/true);
@@ -5993,16 +5995,16 @@
   ;}
     break;
 
-  case 280:
-#line 2699 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 281:
+#line 2706 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 281:
-#line 2703 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 282:
+#line 2710 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createInlineAsm(*(yyvsp[(3) - (5)].StrVal), *(yyvsp[(5) - (5)].StrVal), (yyvsp[(2) - (5)].BoolVal));
     delete (yyvsp[(3) - (5)].StrVal);
@@ -6011,24 +6013,24 @@
   ;}
     break;
 
-  case 282:
-#line 2713 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 283:
+#line 2720 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 283:
-#line 2717 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 284:
+#line 2724 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 284:
-#line 2721 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 285:
+#line 2728 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -6036,8 +6038,8 @@
   ;}
     break;
 
-  case 285:
-#line 2726 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 286:
+#line 2733 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -6045,8 +6047,8 @@
   ;}
     break;
 
-  case 288:
-#line 2739 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 289:
+#line 2746 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -6056,8 +6058,8 @@
   ;}
     break;
 
-  case 289:
-#line 2748 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 290:
+#line 2755 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = new std::vector<Value *>();
     (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal));
@@ -6065,32 +6067,32 @@
   ;}
     break;
 
-  case 290:
-#line 2753 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 291:
+#line 2760 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 291:
-#line 2758 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 292:
+#line 2765 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 292:
-#line 2762 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 293:
+#line 2769 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 293:
-#line 2771 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 294:
+#line 2778 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal));
     CHECK_FOR_ERROR
@@ -6101,8 +6103,8 @@
   ;}
     break;
 
-  case 294:
-#line 2780 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 295:
+#line 2787 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   CHECK_FOR_ERROR
   int ValNum = InsertValue((yyvsp[(3) - (3)].TermInstVal));
@@ -6116,8 +6118,8 @@
 ;}
     break;
 
-  case 295:
-#line 2793 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 296:
+#line 2800 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[(2) - (2)].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -6129,16 +6131,16 @@
   ;}
     break;
 
-  case 296:
-#line 2802 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 297:
+#line 2809 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 297:
-#line 2806 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 298:
+#line 2813 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -6147,8 +6149,8 @@
   ;}
     break;
 
-  case 298:
-#line 2814 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 299:
+#line 2821 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Return with a result...
     ValueList &VL = *(yyvsp[(2) - (2)].ValueList);
     assert(!VL.empty() && "Invalid ret operands!");
@@ -6171,16 +6173,16 @@
   ;}
     break;
 
-  case 299:
-#line 2834 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 300:
+#line 2841 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
     (yyval.TermInstVal) = ReturnInst::Create();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 300:
-#line 2838 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 301:
+#line 2845 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6188,8 +6190,8 @@
   ;}
     break;
 
-  case 301:
-#line 2843 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 302:
+#line 2850 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (cast<IntegerType>((yyvsp[(2) - (9)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Branch condition must have type i1");
@@ -6203,8 +6205,8 @@
   ;}
     break;
 
-  case 302:
-#line 2854 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 303:
+#line 2861 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6226,8 +6228,8 @@
   ;}
     break;
 
-  case 303:
-#line 2873 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 304:
+#line 2880 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6239,8 +6241,8 @@
   ;}
     break;
 
-  case 304:
-#line 2883 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 305:
+#line 2890 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6346,24 +6348,24 @@
   ;}
     break;
 
-  case 305:
-#line 2986 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 306:
+#line 2993 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 306:
-#line 2990 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 307:
+#line 2997 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 307:
-#line 2997 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 308:
+#line 3004 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal)));
@@ -6377,8 +6379,8 @@
   ;}
     break;
 
-  case 308:
-#line 3008 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 309:
+#line 3015 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal)));
@@ -6393,8 +6395,8 @@
   ;}
     break;
 
-  case 309:
-#line 3021 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 310:
+#line 3028 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
     setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal));
@@ -6405,8 +6407,8 @@
   ;}
     break;
 
-  case 310:
-#line 3030 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 311:
+#line 3037 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
     int ValNum = InsertValue((yyvsp[(2) - (2)].InstVal));
@@ -6420,8 +6422,8 @@
   ;}
     break;
 
-  case 311:
-#line 3043 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 312:
+#line 3050 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription());
@@ -6435,8 +6437,8 @@
   ;}
     break;
 
-  case 312:
-#line 3054 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 313:
+#line 3061 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList);
     Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList)->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal));
@@ -6447,8 +6449,8 @@
   ;}
     break;
 
-  case 313:
-#line 3064 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 314:
+#line 3071 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -6462,8 +6464,8 @@
   ;}
     break;
 
-  case 314:
-#line 3075 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 315:
+#line 3082 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     // Labels are only valid in ASMs
@@ -6474,8 +6476,8 @@
   ;}
     break;
 
-  case 315:
-#line 3083 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 316:
+#line 3090 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -6488,8 +6490,8 @@
   ;}
     break;
 
-  case 316:
-#line 3093 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 317:
+#line 3100 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList);
@@ -6499,18 +6501,18 @@
   ;}
     break;
 
-  case 317:
-#line 3100 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 318:
+#line 3107 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamList) = new ParamList(); ;}
     break;
 
-  case 318:
-#line 3103 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 319:
+#line 3110 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
-  case 319:
-#line 3104 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 320:
+#line 3111 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
     (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
@@ -6518,8 +6520,8 @@
   ;}
     break;
 
-  case 320:
-#line 3112 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 321:
+#line 3119 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = new std::vector<unsigned>();
     if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
@@ -6528,8 +6530,8 @@
   ;}
     break;
 
-  case 321:
-#line 3118 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 322:
+#line 3125 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = (yyvsp[(1) - (3)].ConstantList);
     if ((unsigned)(yyvsp[(3) - (3)].UInt64Val) != (yyvsp[(3) - (3)].UInt64Val))
@@ -6539,24 +6541,24 @@
   ;}
     break;
 
-  case 322:
-#line 3127 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 323:
+#line 3134 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 323:
-#line 3131 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 324:
+#line 3138 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 324:
-#line 3136 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 325:
+#line 3143 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6575,8 +6577,8 @@
   ;}
     break;
 
-  case 325:
-#line 3152 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 326:
+#line 3159 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6596,8 +6598,8 @@
   ;}
     break;
 
-  case 326:
-#line 3169 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 327:
+#line 3176 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6612,8 +6614,8 @@
   ;}
     break;
 
-  case 327:
-#line 3181 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 328:
+#line 3188 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6628,8 +6630,8 @@
   ;}
     break;
 
-  case 328:
-#line 3193 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 329:
+#line 3200 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6646,8 +6648,8 @@
   ;}
     break;
 
-  case 329:
-#line 3207 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 330:
+#line 3214 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6664,8 +6666,8 @@
   ;}
     break;
 
-  case 330:
-#line 3221 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 331:
+#line 3228 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6680,8 +6682,8 @@
   ;}
     break;
 
-  case 331:
-#line 3233 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 332:
+#line 3240 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (isa<VectorType>((yyvsp[(2) - (6)].ValueVal)->getType())) {
       // vector select
@@ -6705,8 +6707,8 @@
   ;}
     break;
 
-  case 332:
-#line 3254 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 333:
+#line 3261 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6716,8 +6718,8 @@
   ;}
     break;
 
-  case 333:
-#line 3261 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 334:
+#line 3268 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -6726,8 +6728,8 @@
   ;}
     break;
 
-  case 334:
-#line 3267 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 335:
+#line 3274 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -6736,8 +6738,8 @@
   ;}
     break;
 
-  case 335:
-#line 3273 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 336:
+#line 3280 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -6746,8 +6748,8 @@
   ;}
     break;
 
-  case 336:
-#line 3279 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 337:
+#line 3286 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -6765,8 +6767,8 @@
   ;}
     break;
 
-  case 337:
-#line 3295 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 338:
+#line 3302 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6878,32 +6880,32 @@
   ;}
     break;
 
-  case 338:
-#line 3404 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 339:
+#line 3411 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 339:
-#line 3409 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 340:
+#line 3416 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 340:
-#line 3413 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 341:
+#line 3420 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 341:
-#line 3420 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 342:
+#line 3427 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6913,8 +6915,8 @@
   ;}
     break;
 
-  case 342:
-#line 3427 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 343:
+#line 3434 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6927,8 +6929,8 @@
   ;}
     break;
 
-  case 343:
-#line 3437 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 344:
+#line 3444 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6938,8 +6940,8 @@
   ;}
     break;
 
-  case 344:
-#line 3444 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 345:
+#line 3451 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6952,8 +6954,8 @@
   ;}
     break;
 
-  case 345:
-#line 3454 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 346:
+#line 3461 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(2) - (2)].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " +
@@ -6963,8 +6965,8 @@
   ;}
     break;
 
-  case 346:
-#line 3462 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 347:
+#line 3469 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -6981,8 +6983,8 @@
   ;}
     break;
 
-  case 347:
-#line 3476 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 348:
+#line 3483 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription());
@@ -7002,8 +7004,8 @@
   ;}
     break;
 
-  case 348:
-#line 3493 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 349:
+#line 3500 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -7020,8 +7022,8 @@
   ;}
     break;
 
-  case 349:
-#line 3507 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 350:
+#line 3514 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -7039,8 +7041,8 @@
   ;}
     break;
 
-  case 350:
-#line 3522 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 351:
+#line 3529 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -7058,8 +7060,8 @@
   ;}
     break;
 
-  case 351:
-#line 3537 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 352:
+#line 3544 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (7)].TypeVal))->getDescription());
@@ -7081,7 +7083,7 @@
 
 
 /* Line 1267 of yacc.c.  */
-#line 7085 "llvmAsmParser.tab.c"
+#line 7087 "llvmAsmParser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -7295,7 +7297,7 @@
 }
 
 
-#line 3556 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+#line 3563 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs?rev=61031&r1=61030&r2=61031&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs Mon Dec 15 01:31:07 2008
@@ -184,8 +184,8 @@
      SRET = 400,
      NOUNWIND = 401,
      NOALIAS = 402,
-     BYVAL = 403,
-     NEST = 404,
+     NOCAPTURE = 403,
+     BYVAL = 404,
      READNONE = 405,
      READONLY = 406,
      GC = 407,
@@ -194,9 +194,10 @@
      ALWAYSINLINE = 410,
      SSP = 411,
      SSPREQ = 412,
-     DEFAULT = 413,
-     HIDDEN = 414,
-     PROTECTED = 415
+     NEST = 413,
+     DEFAULT = 414,
+     HIDDEN = 415,
+     PROTECTED = 416
    };
 #endif
 /* Tokens.  */
@@ -345,8 +346,8 @@
 #define SRET 400
 #define NOUNWIND 401
 #define NOALIAS 402
-#define BYVAL 403
-#define NEST 404
+#define NOCAPTURE 403
+#define BYVAL 404
 #define READNONE 405
 #define READONLY 406
 #define GC 407
@@ -355,16 +356,17 @@
 #define ALWAYSINLINE 410
 #define SSP 411
 #define SSPREQ 412
-#define DEFAULT 413
-#define HIDDEN 414
-#define PROTECTED 415
+#define NEST 413
+#define DEFAULT 414
+#define HIDDEN 415
+#define PROTECTED 416
 
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 986 "/Volumes/Gir/devel/llvm/llvm.src/lib/AsmParser/llvmAsmParser.y"
+#line 986 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -412,8 +414,8 @@
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
 }
-/* Line 1529 of yacc.c.  */
-#line 417 "llvmAsmParser.tab.h"
+/* Line 1489 of yacc.c.  */
+#line 419 "llvmAsmParser.tab.h"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs?rev=61031&r1=61030&r2=61031&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Mon Dec 15 01:31:07 2008
@@ -1136,8 +1136,8 @@
 %token <OtherOpVal> EXTRACTVALUE INSERTVALUE
 
 // Function Attributes
-%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST
-%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ
+%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS NOCAPTURE BYVAL
+%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ NEST
 
 // Visibility Styles
 %token DEFAULT HIDDEN PROTECTED
@@ -1265,15 +1265,16 @@
                   CHECK_FOR_ERROR
                  };
 
-Attribute     : ZEROEXT { $$ = Attribute::ZExt;      }
-              | ZEXT    { $$ = Attribute::ZExt;      }
-              | SIGNEXT { $$ = Attribute::SExt;      }
-              | SEXT    { $$ = Attribute::SExt;      }
-              | INREG   { $$ = Attribute::InReg;     }
-              | SRET    { $$ = Attribute::StructRet; }
-              | NOALIAS { $$ = Attribute::NoAlias;   }
-              | BYVAL   { $$ = Attribute::ByVal;     }
-              | NEST    { $$ = Attribute::Nest;      }
+Attribute     : ZEROEXT   { $$ = Attribute::ZExt;      }
+              | ZEXT      { $$ = Attribute::ZExt;      }
+              | SIGNEXT   { $$ = Attribute::SExt;      }
+              | SEXT      { $$ = Attribute::SExt;      }
+              | INREG     { $$ = Attribute::InReg;     }
+              | SRET      { $$ = Attribute::StructRet; }
+              | NOALIAS   { $$ = Attribute::NoAlias;   }
+              | NOCAPTURE { $$ = Attribute::NoCapture; }
+              | BYVAL     { $$ = Attribute::ByVal;     }
+              | NEST      { $$ = Attribute::Nest;      }
               | ALIGN EUINT64VAL { $$ =
                           Attribute::constructAlignmentFromInt($2);    }
               ;
@@ -1284,9 +1285,10 @@
               }
               ;
 
-RetAttr       : INREG    { $$ = Attribute::InReg;     }
+RetAttr       : INREG    { $$ = Attribute::InReg;    }
               | ZEROEXT  { $$ = Attribute::ZExt;     }
               | SIGNEXT  { $$ = Attribute::SExt;     }
+              | NOALIAS  { $$ = Attribute::NoAlias;  }
               ;
 
 OptRetAttrs  : /* empty */ { $$ = Attribute::None; }
@@ -1330,6 +1332,8 @@
   $$ = $2;
   if ($$ != 0 && !isPowerOf2_32($$))
     GEN_ERROR("Alignment must be a power of two");
+  if ($$ > 0x40000000)
+    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 };
 OptCAlign : /*empty*/            { $$ = 0; } |
@@ -1337,6 +1341,8 @@
   $$ = $3;
   if ($$ != 0 && !isPowerOf2_32($$))
     GEN_ERROR("Alignment must be a power of two");
+  if ($$ > 0x40000000)
+    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 };
 
@@ -1366,6 +1372,8 @@
   | ALIGN EUINT64VAL {
     if ($2 != 0 && !isPowerOf2_32($2))
       GEN_ERROR("Alignment must be a power of two");
+    if ($2 > 0x40000000)
+      GEN_ERROR("Alignment too large");
     CurGV->setAlignment($2);
     CHECK_FOR_ERROR
   };




From sabre at nondot.org  Mon Dec 15 01:49:24 2008
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Dec 2008 07:49:24 -0000
Subject: [llvm-commits] [llvm] r61032 - in /llvm/trunk:
 lib/Target/README.txt test/Transforms/GVN/lpre-call-wrap-2.ll
 test/Transforms/GVN/lpre-call-wrap.ll
Message-ID: <200812150749.mBF7nOUY027767@zion.cs.uiuc.edu>

Author: lattner
Date: Mon Dec 15 01:49:24 2008
New Revision: 61032

URL: http://llvm.org/viewvc/llvm-project?rev=61032&view=rev
Log:
Add a testcase for GCC PR 23455, which lpre handles now.  Add some
comments about why we're not getting other cases.

Added:
    llvm/trunk/test/Transforms/GVN/lpre-call-wrap-2.ll
Modified:
    llvm/trunk/lib/Target/README.txt
    llvm/trunk/test/Transforms/GVN/lpre-call-wrap.ll

Modified: llvm/trunk/lib/Target/README.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=61032&r1=61031&r2=61032&view=diff

==============================================================================
--- llvm/trunk/lib/Target/README.txt (original)
+++ llvm/trunk/lib/Target/README.txt Mon Dec 15 01:49:24 2008
@@ -1323,8 +1323,13 @@
 }
 *P = tmp;
 
+We now hoist the reload after the call (Transforms/GVN/lpre-call-wrap.ll), but
+we don't sink the store.  We need partially dead store sinking.
+
 //===---------------------------------------------------------------------===//
 
+[PHI TRANSLATE GEPs]
+
 GCC PR37166: Sinking of loads prevents SROA'ing the "g" struct on the stack
 leading to excess stack traffic. This could be handled by GVN with some crazy
 symbolic phi translation.  The code we get looks like (g is on the stack):
@@ -1350,10 +1355,11 @@
 GCC testsuite.  There are many pre testcases as ssa-pre-*.c
 
 Other simple load PRE cases:
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35287
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34677 (licm does this)
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29789 (SPEC2K6)
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=23455
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35287 [LPRE crit edge splitting]
+
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34677 (licm does this, LPRE crit edge)
+  llvm-gcc t2.c -S -o - -O0 -emit-llvm | llvm-as | opt -mem2reg -simplifycfg -gvn | llvm-dis
+
 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14705
 
 //===---------------------------------------------------------------------===//

Added: llvm/trunk/test/Transforms/GVN/lpre-call-wrap-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/lpre-call-wrap-2.ll?rev=61032&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/GVN/lpre-call-wrap-2.ll (added)
+++ llvm/trunk/test/Transforms/GVN/lpre-call-wrap-2.ll Mon Dec 15 01:49:24 2008
@@ -0,0 +1,39 @@
+; RUN: llvm-as < %s | opt -gvn -enable-load-pre | llvm-dis > %t
+; RUN: %prcontext bb1: 2 < %t | grep phi
+; RUN: %prcontext bb1: 2 < %t | not grep load
+;
+; The partially redundant load in bb1 should be hoisted to "bb".  This comes
+; from this C code (GCC PR 23455):
+;   unsigned outcnt;  extern void flush_outbuf(void);
+;   void bi_windup(unsigned char *outbuf, unsigned char bi_buf) {
+;     outbuf[outcnt] = bi_buf;
+;     if (outcnt == 16384)
+;       flush_outbuf();
+;     outbuf[outcnt] = bi_buf;
+;   }
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+target triple = "i386-apple-darwin7"
+ at outcnt = common global i32 0		; <i32*> [#uses=3]
+
+define void @bi_windup(i8* %outbuf, i8 zeroext %bi_buf) nounwind {
+entry:
+	%"alloca point" = bitcast i32 0 to i32		; <i32> [#uses=0]
+	%0 = load i32* @outcnt, align 4		; <i32> [#uses=1]
+	%1 = getelementptr i8* %outbuf, i32 %0		; <i8*> [#uses=1]
+	store i8 %bi_buf, i8* %1, align 1
+	%2 = load i32* @outcnt, align 4		; <i32> [#uses=1]
+	%3 = icmp eq i32 %2, 16384		; <i1> [#uses=1]
+	br i1 %3, label %bb, label %bb1
+
+bb:		; preds = %entry
+	call void @flush_outbuf() nounwind
+	br label %bb1
+
+bb1:		; preds = %bb, %entry
+	%4 = load i32* @outcnt, align 4		; <i32> [#uses=1]
+	%5 = getelementptr i8* %outbuf, i32 %4		; <i8*> [#uses=1]
+	store i8 %bi_buf, i8* %5, align 1
+	ret void
+}
+
+declare void @flush_outbuf()

Modified: llvm/trunk/test/Transforms/GVN/lpre-call-wrap.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/lpre-call-wrap.ll?rev=61032&r1=61031&r2=61032&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/GVN/lpre-call-wrap.ll (original)
+++ llvm/trunk/test/Transforms/GVN/lpre-call-wrap.ll Mon Dec 15 01:49:24 2008
@@ -5,7 +5,7 @@
 ; Make sure the load in bb3.backedge is removed and moved into bb1 after the 
 ; call.  This makes the non-call case faster. 
 ;
-; This test is derived from this C++ code:
+; This test is derived from this C++ code (GCC PR 37810):
 ; void g();
 ; struct A { 
 ;   int n; int m;




From sabre at nondot.org  Mon Dec 15 02:32:28 2008
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Dec 2008 08:32:28 -0000
Subject: [llvm-commits] [llvm] r61033 - /llvm/trunk/lib/Target/README.txt
Message-ID: <200812150832.mBF8WSfH029178@zion.cs.uiuc.edu>

Author: lattner
Date: Mon Dec 15 02:32:28 2008
New Revision: 61033

URL: http://llvm.org/viewvc/llvm-project?rev=61033&view=rev
Log:
add some more notes.

Modified:
    llvm/trunk/lib/Target/README.txt

Modified: llvm/trunk/lib/Target/README.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=61033&r1=61032&r2=61033&view=diff

==============================================================================
--- llvm/trunk/lib/Target/README.txt (original)
+++ llvm/trunk/lib/Target/README.txt Mon Dec 15 02:32:28 2008
@@ -1354,12 +1354,58 @@
 There are many load PRE testcases in testsuite/gcc.dg/tree-ssa/loadpre* in the
 GCC testsuite.  There are many pre testcases as ssa-pre-*.c
 
+//===---------------------------------------------------------------------===//
+
+There are some interesting cases in testsuite/gcc.dg/tree-ssa/pred-comm* in the
+GCC testsuite.  For example, predcom-1.c is:
+
+ for (i = 2; i < 1000; i++)
+    fib[i] = (fib[i-1] + fib[i - 2]) & 0xffff;
+
+which compiles into:
+
+bb1:		; preds = %bb1, %bb1.thread
+	%indvar = phi i32 [ 0, %bb1.thread ], [ %0, %bb1 ]	
+	%i.0.reg2mem.0 = add i32 %indvar, 2		
+	%0 = add i32 %indvar, 1		; <i32> [#uses=3]
+	%1 = getelementptr [1000 x i32]* @fib, i32 0, i32 %0		
+	%2 = load i32* %1, align 4		; <i32> [#uses=1]
+	%3 = getelementptr [1000 x i32]* @fib, i32 0, i32 %indvar	
+	%4 = load i32* %3, align 4		; <i32> [#uses=1]
+	%5 = add i32 %4, %2		; <i32> [#uses=1]
+	%6 = and i32 %5, 65535		; <i32> [#uses=1]
+	%7 = getelementptr [1000 x i32]* @fib, i32 0, i32 %i.0.reg2mem.0
+	store i32 %6, i32* %7, align 4
+	%exitcond = icmp eq i32 %0, 998		; <i1> [#uses=1]
+	br i1 %exitcond, label %return, label %bb1
+
+This is basically:
+  LOAD fib[i+1]
+  LOAD fib[i]
+  STORE fib[i+2]
+
+instead of handling this as a loop or other xform, all we'd need to do is teach
+load PRE to phi translate the %0 add (i+1) into the predecessor as (i'+1+1) =
+(i'+2) (where i' is the previous iteration of i).  This would find the store
+which feeds it.
+
+predcom-2.c is apparently the same as predcom-1.c
+predcom-3.c is very similar but needs loads feeding each other instead of
+store->load.
+predcom-4.c seems the same as the rest.
+
+
+//===---------------------------------------------------------------------===//
+
 Other simple load PRE cases:
 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=35287 [LPRE crit edge splitting]
 
 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34677 (licm does this, LPRE crit edge)
   llvm-gcc t2.c -S -o - -O0 -emit-llvm | llvm-as | opt -mem2reg -simplifycfg -gvn | llvm-dis
 
+//===---------------------------------------------------------------------===//
+
+Type based alias analysis:
 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14705
 
 //===---------------------------------------------------------------------===//
@@ -1380,7 +1426,7 @@
 
 
 One example (that requires crazy phi translation) is:
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=16799
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=16799 [BITCAST PHI TRANS]
 
 //===---------------------------------------------------------------------===//
 
@@ -1388,9 +1434,14 @@
 of PRE'ing the load/store.  This may be fixable in instcombine:
 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37892
 
+
+
 Interesting missed case because of control flow flattening (should be 2 loads):
 http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26629
-
+With: llvm-gcc t2.c -S -o - -O0 -emit-llvm | llvm-as | 
+             opt -mem2reg -gvn -instcombine | llvm-dis
+we miss it because we need 1) GEP PHI TRAN, 2) CRIT EDGE 3) MULTIPLE DIFFERENT
+VALS PRODUCED BY ONE BLOCK OVER DIFFERENT PATHS
 
 //===---------------------------------------------------------------------===//
 




From baldrick at free.fr  Mon Dec 15 04:52:37 2008
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 15 Dec 2008 11:52:37 +0100
Subject: [llvm-commits] [llvm] r61030 - in /llvm/trunk:
	include/llvm/Attributes.h lib/AsmParser/llvmAsmParser.y
	lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Attributes.cpp
In-Reply-To: <200812150729.mBF7Ttg3027174@zion.cs.uiuc.edu>
References: <200812150729.mBF7Ttg3027174@zion.cs.uiuc.edu>
Message-ID: <200812151152.37244.baldrick@free.fr>

Hi Nick,

> It turns out that "align 1" and unaligned are different. Add a bias to the
> alignment attribute such that 0 means unaligned.

what happens if a function is aligned 1024 or something huge like that?
Also, I don't think 0 means unaligned, I think it means default alignment.

Ciao,

Duncan.

> +                                     // 0 means unaligned different from align 1

-> 0 means default alignment

Ciao,

Duncan.


From baldrick at free.fr  Mon Dec 15 04:57:35 2008
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 15 Dec 2008 11:57:35 +0100
Subject: [llvm-commits] [llvm] r61019 - in /llvm/trunk:
	docs/AliasAnalysis.html docs/LangRef.html
	include/llvm/Attributes.h lib/AsmParser/LLLexer.cpp
	lib/AsmParser/llvmAsmParser.y lib/Bitcode/Reader/BitcodeReader.cpp
	lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Attributes.cpp
In-Reply-To: <200812150134.mBF1YxKZ015699@zion.cs.uiuc.edu>
References: <200812150134.mBF1YxKZ015699@zion.cs.uiuc.edu>
Message-ID: <200812151157.35229.baldrick@free.fr>

Hi Nick,

> Introducing nocapture, a parameter attribute for pointers to indicate that the
> callee will not introduce any new aliases of that pointer.

if I understand right, this attribute means that the pointer is only dereferenced:
no bits of the pointer value itself are otherwise used or escape.

> +    <dt><tt>nocapture</tt></dt>
> +    <dd>This indicates that the callee does not make any copies of the pointer
> +    that outlive the callee itself. This is not a valid attribute for return
> +    values.</dd>

I think you should mention that callee does not copy even one bit.  Because if
it is allowed to, it is easy to construct examples where the whole pointer value
escapes through multiple calls.

Ciao,

Duncan.


From criswell at cs.uiuc.edu  Mon Dec 15 09:25:42 2008
From: criswell at cs.uiuc.edu (John Criswell)
Date: Mon, 15 Dec 2008 09:25:42 -0600
Subject: [llvm-commits] CVS: llvm-www/Users.html
Message-ID: <200812151525.mBFFPgXX017943@maute.cs.uiuc.edu>



Changes in directory llvm-www:

Users.html updated: 1.46 -> 1.47
---
Log message:

Added C-to-Verilog to the list of companies using LLVM.


---
Diffs of the changes:  (+8 -1)

 Users.html |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)


Index: llvm-www/Users.html
diff -u llvm-www/Users.html:1.46 llvm-www/Users.html:1.47
--- llvm-www/Users.html:1.46	Mon Nov 24 13:01:48 2008
+++ llvm-www/Users.html	Mon Dec 15 09:24:56 2008
@@ -65,6 +65,13 @@
     <td>Electronic System Level (ESL) to Silicon</td>
   </tr>
 
+  <!-- From Nadav Rotem via email -->
+  <tr>
+    <td><a href="http://www.c-to-verilog.com/">C-to-Verilog</a></td>
+    <td> Compiler from C into the Verilog hardware description language.
+         Automates circuit design. </td>
+  </tr>
+
   <!-- Announcement at 2008 dev. meeting -->
   <tr>
     <td>Codedgers Inc.</td>
@@ -405,6 +412,6 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
 
 <br><a href="mailto:llvmdev at cs.uiuc.edu">LLVM Development List</a><br>
-  Last modified: $Date: 2008/11/24 19:01:48 $
+  Last modified: $Date: 2008/12/15 15:24:56 $
 </address>
 <!--#include virtual="footer.incl" -->





From brukman at cs.uiuc.edu  Mon Dec 15 10:52:07 2008
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Mon, 15 Dec 2008 10:52:07 -0600
Subject: [llvm-commits] CVS: llvm-www/releases/index.html
Message-ID: <200812151652.mBFGq7YQ023822@zion.cs.uiuc.edu>



Changes in directory llvm-www/releases:

index.html updated: 1.44 -> 1.45
---
Log message:

Added link to release 2.4 docs.


---
Diffs of the changes:  (+1 -0)

 index.html |    1 +
 1 files changed, 1 insertion(+)


Index: llvm-www/releases/index.html
diff -u llvm-www/releases/index.html:1.44 llvm-www/releases/index.html:1.45
--- llvm-www/releases/index.html:1.44	Mon Nov 10 00:18:55 2008
+++ llvm-www/releases/index.html	Mon Dec 15 10:51:12 2008
@@ -82,6 +82,7 @@
 
 <ul>
 <li><a href="http://llvm.org/docs/">Current LLVM SVN HEAD documentation</a></li>
+<li><a href="2.4/docs/index.html">Documentation for LLVM 2.4</a></li>
 <li><a href="2.3/docs/index.html">Documentation for LLVM 2.3</a></li>
 <li><a href="2.2/docs/index.html">Documentation for LLVM 2.2</a></li>
 <li><a href="2.1/docs/index.html">Documentation for LLVM 2.1</a></li>





From gohman at apple.com  Mon Dec 15 11:26:52 2008
From: gohman at apple.com (Dan Gohman)
Date: Mon, 15 Dec 2008 17:26:52 -0000
Subject: [llvm-commits] [llvm] r61035 -
	/llvm/trunk/include/llvm/Target/TargetInstrInfo.h
Message-ID: <200812151726.mBFHQqkP024930@zion.cs.uiuc.edu>

Author: djg
Date: Mon Dec 15 11:26:50 2008
New Revision: 61035

URL: http://llvm.org/viewvc/llvm-project?rev=61035&view=rev
Log:
Fix a typo in a comment.

Modified:
    llvm/trunk/include/llvm/Target/TargetInstrInfo.h

Modified: llvm/trunk/include/llvm/Target/TargetInstrInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetInstrInfo.h?rev=61035&r1=61034&r2=61035&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetInstrInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetInstrInfo.h Mon Dec 15 11:26:50 2008
@@ -340,7 +340,7 @@
   }
 
 public:
-  /// canFoldMemoryOperand - Returns true if the specified load / store is
+  /// canFoldMemoryOperand - Returns true for the specified load / store if
   /// folding is possible.
   virtual
   bool canFoldMemoryOperand(const MachineInstr *MI,




From gohman at apple.com  Mon Dec 15 11:28:10 2008
From: gohman at apple.com (Dan Gohman)
Date: Mon, 15 Dec 2008 17:28:10 -0000
Subject: [llvm-commits] [llvm] r61036 -
	/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp
Message-ID: <200812151728.mBFHSAwO024981@zion.cs.uiuc.edu>

Author: djg
Date: Mon Dec 15 11:28:10 2008
New Revision: 61036

URL: http://llvm.org/viewvc/llvm-project?rev=61036&view=rev
Log:
Fix printing of PseudoSourceValues in SDNode graphs.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp?rev=61036&r1=61035&r2=61036&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGPrinter.cpp Mon Dec 15 11:28:10 2008
@@ -202,12 +202,10 @@
     Op += '<';
     if (!V) {
       Op += "(unknown)";
-    } else if (isa<PseudoSourceValue>(V)) {
+    } else if (const PseudoSourceValue *PSV = dyn_cast<PseudoSourceValue>(V)) {
       // PseudoSourceValues don't have names, so use their print method.
-      {
-        raw_string_ostream OSS(Op);
-        OSS << *M->MO.getValue();
-      }
+      raw_string_ostream OSS(Op);
+      PSV->print(OSS);
     } else {
       Op += V->getName();
     }




From brukman at cs.uiuc.edu  Mon Dec 15 11:42:01 2008
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Mon, 15 Dec 2008 11:42:01 -0600
Subject: [llvm-commits] CVS: llvm-www/releases/index.html
Message-ID: <200812151742.mBFHg1Zb025569@zion.cs.uiuc.edu>



Changes in directory llvm-www/releases:

index.html updated: 1.45 -> 1.46
---
Log message:

* Converted bulleted list of releases and download links to a table
* Instead of copy-pasting HTML, now use Javascript to fill the data


---
Diffs of the changes:  (+42 -34)

 index.html |   76 +++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 42 insertions(+), 34 deletions(-)


Index: llvm-www/releases/index.html
diff -u llvm-www/releases/index.html:1.45 llvm-www/releases/index.html:1.46
--- llvm-www/releases/index.html:1.45	Mon Dec 15 10:51:12 2008
+++ llvm-www/releases/index.html	Mon Dec 15 11:41:08 2008
@@ -36,40 +36,48 @@
 
 <div class="rel_boxtext">
 
-<ul>
-<li>Always - <a href="download.html#svn">Anonymous SVN access</a>; <a
-href="../docs/ReleaseNotes.html">release notes</a>.</li>
-<li>09 Nov 2008 - 2.4 release <a href="download.html#2.4">download</a>; <a
-href="2.4/docs/ReleaseNotes.html">release notes</a>.</li>
-<li>09 Jun 2008 - 2.3 release <a href="download.html#2.3">download</a>; <a
-href="2.3/docs/ReleaseNotes.html">release notes</a>.</li>
-<li>11 Feb 2008 - 2.2 release <a href="download.html#2.2">download</a>; <a
-href="2.2/docs/ReleaseNotes.html">release notes</a>.</li>
-<li>26 Sep 2007 - 2.1 release <a href="download.html#2.1">download</a>; <a
-href="2.1/docs/ReleaseNotes.html">release notes</a>.</li>
-<li>23 May 2007 - 2.0 release <a href="download.html#2.0">download</a>; <a
-href="2.0/docs/ReleaseNotes.html">release notes</a>.</li>
-<li>19 Nov 2006 - 1.9 release <a href="download.html#1.9">download</a>; <a
-href="1.9/docs/ReleaseNotes.html">release notes</a>.</li>
-<li>9 Aug 2006 - 1.8 release <a href="download.html#1.8">download</a>; <a
-href="1.8/docs/ReleaseNotes.html">release notes</a>.</li>
-<li>20 Apr 2006 - 1.7 release <a href="download.html#1.7">download</a>; <a
-href="1.7/docs/ReleaseNotes.html">release notes</a>.</li>
-<li>08 Nov 2005 - 1.6 release <a href="download.html#1.6">download</a>; <a
-href="1.6/docs/ReleaseNotes.html">release notes</a>.</li>
-<li>18 May 2005 - 1.5 release <a href="download.html#1.5">download</a>; <a
-href="1.5/docs/ReleaseNotes.html">release notes</a>.</li>
-<li>09 Dec 2004 - 1.4 release <a href="download.html#1.4">download</a>; <a
-href="1.4/docs/ReleaseNotes.html">release notes</a>.</li>
-<li>13 Aug 2004 - 1.3 release <a href="download.html#1.3">download</a>; <a
-href="1.3/docs/ReleaseNotes.html">release notes</a>.</li>
-<li>19 Mar 2004 - 1.2 release <a href="download.html#1.2">download</a>; <a
-href="1.2/docs/ReleaseNotes.html">release notes</a>.</li>
-<li>17 Dec 2003 - 1.1 release <a href="download.html#1.1">download</a>; <a
-href="1.1/docs/ReleaseNotes.html">release notes</a>.</li>
-<li>24 Oct 2003 - 1.0 release <a href="download.html#1.0">download</a>; <a
-href="1.0/docs/ReleaseNotes.html">release notes</a>.</li>
-</ul>
+<p>Always - <a href="download.html#svn">Anonymous SVN access</a>; <a
+href="../docs/ReleaseNotes.html">release notes</a>.</p>
+
+<table id="download">
+<tr style="font-weight:bold">
+  <td align=center>Date</td><td>Version</td><td>Download</td><td>Release Notes</td>
+</tr>
+</table>
+
+<script>
+function addReleases() {
+  var RELEASES = [
+    ['09 Nov 2008', '2.4'],
+    ['09 Jun 2008', '2.3'],
+    ['11 Feb 2008', '2.2'],
+    ['26 Sep 2007', '2.1'],
+    ['23 May 2007', '2.0'],
+    ['19 Nov 2006', '1.9'],
+    ['09 Aug 2006', '1.8'],
+    ['20 Apr 2006', '1.7'],
+    ['08 Nov 2005', '1.6'],
+    ['18 May 2005', '1.5'],
+    ['09 Dec 2004', '1.4'],
+    ['13 Aug 2004', '1.3'],
+    ['19 Mar 2004', '1.2'],
+    ['17 Dec 2003', '1.1'],
+    ['24 Oct 2003', '1.0']
+  ];
+  var table = document.getElementById('download');
+  for (var i = 0; i < RELEASES.length; ++i) {
+    var row = table.insertRow(-1);
+    var date = RELEASES[i][0];
+    var version = RELEASES[i][1];
+    row.innerHTML = 
+        '<td align=right>' + date + '</td>' +
+        '<td align=center>' + version + '</td>' +
+        '<td>' + '<a href="download.html#' + version + '">download</a></td>' +
+        '<td>' + '<a href="' + version + '/docs/ReleaseNotes.html">release notes</a></td>';
+  }
+}
+addReleases();
+</script>
 
 </div>
 





From brukman at cs.uiuc.edu  Mon Dec 15 12:00:05 2008
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Mon, 15 Dec 2008 12:00:05 -0600
Subject: [llvm-commits] CVS: llvm-www/releases/index.html
Message-ID: <200812151800.mBFI05EL026278@zion.cs.uiuc.edu>



Changes in directory llvm-www/releases:

index.html updated: 1.46 -> 1.47
---
Log message:

Made Javascript IE6-compatible.


---
Diffs of the changes:  (+16 -7)

 index.html |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)


Index: llvm-www/releases/index.html
diff -u llvm-www/releases/index.html:1.46 llvm-www/releases/index.html:1.47
--- llvm-www/releases/index.html:1.46	Mon Dec 15 11:41:08 2008
+++ llvm-www/releases/index.html	Mon Dec 15 11:59:46 2008
@@ -45,7 +45,7 @@
 </tr>
 </table>
 
-<script>
+<script language="javascript">
 function addReleases() {
   var RELEASES = [
     ['09 Nov 2008', '2.4'],
@@ -64,16 +64,25 @@
     ['17 Dec 2003', '1.1'],
     ['24 Oct 2003', '1.0']
   ];
+  function createCell(contents, align) {
+    var cell = document.createElement('td');
+    cell.innerHTML = contents;
+    if (align) {
+      cell.style.textAlign = align;
+    }
+    return cell;
+  }
   var table = document.getElementById('download');
   for (var i = 0; i < RELEASES.length; ++i) {
-    var row = table.insertRow(-1);
     var date = RELEASES[i][0];
     var version = RELEASES[i][1];
-    row.innerHTML = 
-        '<td align=right>' + date + '</td>' +
-        '<td align=center>' + version + '</td>' +
-        '<td>' + '<a href="download.html#' + version + '">download</a></td>' +
-        '<td>' + '<a href="' + version + '/docs/ReleaseNotes.html">release notes</a></td>';
+    // Note: IE6 doesn't suport the much simpler version:
+    // table.insertRow(-1).innerHTML = '...';
+    var row = table.insertRow(-1);
+    row.appendChild(createCell(date, 'right'));
+    row.appendChild(createCell(version, 'center'));
+    row.appendChild(createCell('<a href="download.html#' + version + '">download</a>'));
+    row.appendChild(createCell('<a href="' + version + '/docs/ReleaseNotes.html">release notes</a>'));
   }
 }
 addReleases();





From evan.cheng at apple.com  Mon Dec 15 12:37:40 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 15 Dec 2008 10:37:40 -0800
Subject: [llvm-commits] [PATCH] Debug info utilities and printer pass
In-Reply-To: <4940FF97.30204@gmail.com>
References: <4940122B.5040005@gmail.com>
	<F7DB7C4E-B5B7-4F5F-A428-9D941E59FE82@apple.com>
	<E94E8A20-2FE8-494B-8D3B-05B22CD867CC@apple.com>
	<4940FF97.30204@gmail.com>
Message-ID: <9A898E37-139F-4E76-BEA0-76161870E4FD@apple.com>


On Dec 11, 2008, at 3:55 AM, T?r?k Edwin wrote:

> On 2008-12-11 04:13, Chris Lattner wrote:
>> On Dec 10, 2008, at 1:13 PM, Devang Patel wrote:
>>>> 02-intrin.patch:
>>>> Introduce DbgFuncStart::getDisplayName() (which refers to  
>>>> unmangled C
>>>> ++
>>>> name!), and DbgDeclareInst::getVariableName()
>>>> Introduce include/llvm/Support/DebugInfo.h:
>>>
>>> We already have include/llvm/Analysis/DebugInfo.h, so I suggest that
>>> you use another name for this new header.
>>
>> More strongly, why do we need this new code when we have
>> llvm/Analysis/Debuginfo.h?  What does this do that
>> llvm/Analysis/DebugInfo doesn't, or shouldn't do?
>
> llvm/Analysis/DebugInfo.h doesn't search for the debug info, you  
> have to
> give it that as a parameter to the constructor.
> My functions search for the llvm.dbg.stoppoint given an
> Instruction*/BasicBlock*, and for llvm.dbg.declare given a Value*.
>> I'd really rather make Analysis/DebugInfo.h better rather than
>> introduce a new parallel way to analyze debug info.
>
> I moved the functions to include/llvm/Analysis/DebugInfo.h, see
> 02-dbginfo-utils.patch.
>
> Attachments:
> 01-dbginfo.patch:
> -  fix getFieldAs(), it was always looking at field 6, instead of Elt!
> -  DIVariable.getType() was leading to linker error: undefined  
> reference
> to DIType::DIType(GlobalVariable *GV), define the constructor

I don't quite understand this:

+// needed by DIVariable::getType()
+DIType::DIType(GlobalVariable *GV) : DIDescriptor(GV)
+{
+  if (GV) {
+    unsigned tag = getTag();
+    if (tag != dwarf::DW_TAG_base_type && ! 
DIDerivedType::isDerivedType(tag) &&
+        !DICompositeType::isCompositeType(tag))
+      GV = 0;
+  }
+}

What exactly is it trying to accomplish by changing the parameter GV  
to 0?


>
>
> 02-dbginfo-utils.patch:
> - in my previous patch this was include/llvm/Support/DebugInfo.h, it
> introduces:
> - findStopPoint
> - findBBStopPoint
> - findDbgDeclare

+      // a BB consisting only of a terminator, can't have a stoppoint

Please start with a capital 'A' and don't forget periods.

+      // this BB didn't have a stoppoint, if there is only one
+      // predecessor, look for a stoppoint there
+      // we could use getIDom(), but that would require dominator info

Here as well.

+  const DbgDeclareInst *findDbgDeclare(const Value *V, bool stripCasts)
+  {
+    if (stripCasts) {
+      V = V->stripPointerCasts();
+      // look for the bitcast
+      for (Value::use_const_iterator I = V->use_begin(), E =V- 
 >use_end(); I != E; ++I) {

80 column?

>
>
> 03-pass.patch:
> - the -print-dbginfo pass from my previous email, now it uses
> llvm/Analysis/DebugInfo.h
> - caveats: derived types are printed as "", no testcase (should I  
> add one?)
>
+    // a dbgstoppoint's information is valid until we encounter a new  
one
+    const DbgStopPointInst *LastDSP = DSI;
+    bool printed = !!DSI;

Why the "!!"?


+        } else if (const DbgFuncStartInst *FS =  
dyn_cast<DbgFuncStartInst>(i)) {
+
+          printFuncStart(FS);
+
+        }

Why the blank lines?

Thanks,

Evan

> Best regards,
> --Edwin
> <01-dbginfo.patch><02-dbginfo-utils.patch><03- 
> pass.patch>_______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits




From sabre at nondot.org  Mon Dec 15 12:59:22 2008
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Dec 2008 18:59:22 -0000
Subject: [llvm-commits] [llvm] r61040 - in /llvm/trunk:
 lib/Analysis/BasicAliasAnalysis.cpp test/Analysis/BasicAA/nocapture.ll
Message-ID: <200812151859.mBFIxMTJ028232@zion.cs.uiuc.edu>

Author: lattner
Date: Mon Dec 15 12:59:22 2008
New Revision: 61040

URL: http://llvm.org/viewvc/llvm-project?rev=61040&view=rev
Log:
Teach basicaa to use the nocapture attribute when possible.  When the
intrinsics are properly marked nocapture, the fixme should be addressed.


Added:
    llvm/trunk/test/Analysis/BasicAA/nocapture.ll
Modified:
    llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp

Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=61040&r1=61039&r2=61040&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original)
+++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Mon Dec 15 12:59:22 2008
@@ -63,12 +63,23 @@
       // callees could modify it.
       break; // next use
     case Instruction::Call:
-      // If the call is to a few known safe intrinsics, we know that it does
-      // not escape.
-      // TODO: Eventually just check the 'nocapture' attribute.
-      if (!isa<MemIntrinsic>(I))
-        return true;
-      break;  // next use
+      // If the argument to the call has the nocapture attribute, then the call
+      // may store or load to the pointer, but it cannot escape.
+      if (cast<CallInst>(I)->paramHasAttr(UI.getOperandNo(), 
+                                          Attribute::NoCapture))
+        continue;
+
+      // FIXME: MemIntrinsics should have their operands marked nocapture!
+      if (isa<MemIntrinsic>(I))
+        continue;  // next use
+      return true;
+    case Instruction::Invoke:
+      // If the argument to the call has the nocapture attribute, then the call
+      // may store or load to the pointer, but it cannot escape.
+      if (cast<InvokeInst>(I)->paramHasAttr(UI.getOperandNo()-2,
+                                            Attribute::NoCapture))
+        continue;
+      return true;
     default:
       return true;
     }

Added: llvm/trunk/test/Analysis/BasicAA/nocapture.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/BasicAA/nocapture.ll?rev=61040&view=auto

==============================================================================
--- llvm/trunk/test/Analysis/BasicAA/nocapture.ll (added)
+++ llvm/trunk/test/Analysis/BasicAA/nocapture.ll Mon Dec 15 12:59:22 2008
@@ -0,0 +1,13 @@
+; RUN: llvm-as < %s | opt -basicaa -gvn -instcombine | llvm-dis | grep {ret i32 0}
+
+declare i32* @test(i32* nocapture)
+
+define i32 @test2() {
+	%P = alloca i32
+	%Q = call i32* @test(i32* %P)
+	%a = load i32* %P
+	store i32 4, i32* %Q   ;; cannot clobber P since it is nocapture.
+	%b = load i32* %P
+	%c = sub i32 %a, %b
+	ret i32 %c
+}




From edwintorok at gmail.com  Mon Dec 15 13:22:42 2008
From: edwintorok at gmail.com (=?ISO-8859-1?Q?T=F6r=F6k_Edwin?=)
Date: Mon, 15 Dec 2008 21:22:42 +0200
Subject: [llvm-commits] [PATCH] Debug info utilities and printer pass
In-Reply-To: <9A898E37-139F-4E76-BEA0-76161870E4FD@apple.com>
References: <4940122B.5040005@gmail.com>	<F7DB7C4E-B5B7-4F5F-A428-9D941E59FE82@apple.com>	<E94E8A20-2FE8-494B-8D3B-05B22CD867CC@apple.com>	<4940FF97.30204@gmail.com>
	<9A898E37-139F-4E76-BEA0-76161870E4FD@apple.com>
Message-ID: <4946AE82.5040606@gmail.com>

On 2008-12-15 20:37, Evan Cheng wrote:
> I don't quite understand this:
>
> +// needed by DIVariable::getType()
> +DIType::DIType(GlobalVariable *GV) : DIDescriptor(GV)
> +{
> +  if (GV) {
> +    unsigned tag = getTag();
> +    if (tag != dwarf::DW_TAG_base_type && ! 
> DIDerivedType::isDerivedType(tag) &&
> +        !DICompositeType::isCompositeType(tag))
> +      GV = 0;
> +  }
> +}
>
> What exactly is it trying to accomplish by changing the parameter GV  
> to 0?
>   

There is a comment at the top of the file explaining
// If this is non-null, check to see if the Tag matches.  If not, set to
null.

That comment is not duplicated in other places that set GV to 0, so I
didn't duplicate it either.

If GV is NULL, all the getters in DIDescriptor return a default object,
instead of trying to read it.

I think it is a way of saying: this object shouldn't have been
constructed, but it is too late now, and we don't want to throw
exceptions either,
so just return default constructed objects from now on.

>
>   
>> 02-dbginfo-utils.patch:
>> - in my previous patch this was include/llvm/Support/DebugInfo.h, it
>> introduces:
>> - findStopPoint
>> - findBBStopPoint
>> - findDbgDeclare
>>     
>
> +      // a BB consisting only of a terminator, can't have a stoppoint
>
> Please start with a capital 'A' and don't forget periods.
>
> +      // this BB didn't have a stoppoint, if there is only one
> +      // predecessor, look for a stoppoint there
> +      // we could use getIDom(), but that would require dominator info
>
> Here as well.
>
> +  const DbgDeclareInst *findDbgDeclare(const Value *V, bool stripCasts)
> +  {
> +    if (stripCasts) {
> +      V = V->stripPointerCasts();
> +      // look for the bitcast
> +      for (Value::use_const_iterator I = V->use_begin(), E =V- 
>  >use_end(); I != E; ++I) {
>
> 80 column?
>
>   

Thanks, fixed.

>> 03-pass.patch:
>> - the -print-dbginfo pass from my previous email, now it uses
>> llvm/Analysis/DebugInfo.h
>> - caveats: derived types are printed as "", no testcase (should I  
>> add one?)
>>
>>     
> +    // a dbgstoppoint's information is valid until we encounter a new  
> one
> +    const DbgStopPointInst *LastDSP = DSI;
> +    bool printed = !!DSI;
>
> Why the "!!"?
>   

It is a nice way to transform anything into a bool, I got used to it due
to writing C macros like:
#define UNLIKELY(cond) __builtin_expect(!!(cond), 0)

>
> +        } else if (const DbgFuncStartInst *FS =  
> dyn_cast<DbgFuncStartInst>(i)) {
> +
> +          printFuncStart(FS);
> +
> +        }
>
> Why the blank lines?
>   

Initially printFuncStart wasn't a function, but all the code was there.
I've removed these lines now.

As for the blank line after this one:
if ((DSI = dyn_cast<DbgStopPointInst>(i))) {

It was to make the code more readable.

Thanks for the comments, do you see any other major problems, or can I
commit these patches?

Best regards,
--Edwin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dbginfo-utils.patch
Type: text/x-diff
Size: 4175 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081215/769c3878/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pass.patch
Type: text/x-diff
Size: 5934 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081215/769c3878/attachment-0001.bin 

From sabre at nondot.org  Mon Dec 15 13:42:06 2008
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Dec 2008 19:42:06 -0000
Subject: [llvm-commits] [llvm] r61041 -
	/llvm/trunk/test/Transforms/GlobalOpt/heap-sra-1.ll
Message-ID: <200812151942.mBFJg6QS029902@zion.cs.uiuc.edu>

Author: lattner
Date: Mon Dec 15 13:42:05 2008
New Revision: 61041

URL: http://llvm.org/viewvc/llvm-project?rev=61041&view=rev
Log:
add a basic test for heap-sra

Added:
    llvm/trunk/test/Transforms/GlobalOpt/heap-sra-1.ll

Added: llvm/trunk/test/Transforms/GlobalOpt/heap-sra-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/heap-sra-1.ll?rev=61041&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/heap-sra-1.ll (added)
+++ llvm/trunk/test/Transforms/GlobalOpt/heap-sra-1.ll Mon Dec 15 13:42:05 2008
@@ -0,0 +1,34 @@
+; RUN: llvm-as < %s | opt -globalopt | llvm-dis | grep {@X.f0}
+; RUN: llvm-as < %s | opt -globalopt | llvm-dis | grep {@X.f1}
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+target triple = "i386-apple-darwin7"
+
+	%struct.foo = type { i32, i32 }
+ at X = internal global %struct.foo* null
+
+define void @bar(i32 %Size) nounwind noinline {
+entry:
+	%.sub = malloc %struct.foo, i32 %Size	
+	store %struct.foo* %.sub, %struct.foo** @X, align 4
+	ret void
+}
+
+define i32 @baz() nounwind readonly noinline {
+bb1.thread:
+	%0 = load %struct.foo** @X, align 4		
+	br label %bb1
+
+bb1:		; preds = %bb1, %bb1.thread
+	%i.0.reg2mem.0 = phi i32 [ 0, %bb1.thread ], [ %indvar.next, %bb1 ]
+	%sum.0.reg2mem.0 = phi i32 [ 0, %bb1.thread ], [ %3, %bb1 ]
+	%1 = getelementptr %struct.foo* %0, i32 %i.0.reg2mem.0, i32 0
+	%2 = load i32* %1, align 4
+	%3 = add i32 %2, %sum.0.reg2mem.0	
+	%indvar.next = add i32 %i.0.reg2mem.0, 1	
+	%exitcond = icmp eq i32 %indvar.next, 1200		
+	br i1 %exitcond, label %bb2, label %bb1
+
+bb2:		; preds = %bb1
+	ret i32 %3
+}
+




From edwintorok at gmail.com  Mon Dec 15 14:12:00 2008
From: edwintorok at gmail.com (=?ISO-8859-1?Q?T=F6r=F6k_Edwin?=)
Date: Mon, 15 Dec 2008 22:12:00 +0200
Subject: [llvm-commits] [PATCH] Debug info utilities and printer pass
In-Reply-To: <4946AE82.5040606@gmail.com>
References: <4940122B.5040005@gmail.com>	<F7DB7C4E-B5B7-4F5F-A428-9D941E59FE82@apple.com>	<E94E8A20-2FE8-494B-8D3B-05B22CD867CC@apple.com>	<4940FF97.30204@gmail.com>
	<9A898E37-139F-4E76-BEA0-76161870E4FD@apple.com>
	<4946AE82.5040606@gmail.com>
Message-ID: <4946BA10.9070402@gmail.com>

On 2008-12-15 21:22, T?r?k Edwin wrote:
> On 2008-12-15 20:37, Evan Cheng wrote:
>   
>> I don't quite understand this:
>>
>> +// needed by DIVariable::getType()
>> +DIType::DIType(GlobalVariable *GV) : DIDescriptor(GV)
>> +{
>> +  if (GV) {
>> +    unsigned tag = getTag();
>> +    if (tag != dwarf::DW_TAG_base_type && ! 
>> DIDerivedType::isDerivedType(tag) &&
>> +        !DICompositeType::isCompositeType(tag))
>> +      GV = 0;
>> +  }
>> +}
>>
>> What exactly is it trying to accomplish by changing the parameter GV  
>> to 0?
>>   
>>     
>
> There is a comment at the top of the file explaining
> // If this is non-null, check to see if the Tag matches.  If not, set to
> null.
>
> That comment is not duplicated in other places that set GV to 0, so I
> didn't duplicate it either.
>
> If GV is NULL, all the getters in DIDescriptor return a default object,
> instead of trying to read it.
>
> I think it is a way of saying: this object shouldn't have been
> constructed, but it is too late now, and we don't want to throw
> exceptions either,
> so just return default constructed objects from now on.
>
>   
>>   
>>     
>>> 02-dbginfo-utils.patch:
>>> - in my previous patch this was include/llvm/Support/DebugInfo.h, it
>>> introduces:
>>> - findStopPoint
>>> - findBBStopPoint
>>> - findDbgDeclare
>>>     
>>>       
>> +      // a BB consisting only of a terminator, can't have a stoppoint
>>
>> Please start with a capital 'A' and don't forget periods.
>>
>> +      // this BB didn't have a stoppoint, if there is only one
>> +      // predecessor, look for a stoppoint there
>> +      // we could use getIDom(), but that would require dominator info
>>
>> Here as well.
>>
>> +  const DbgDeclareInst *findDbgDeclare(const Value *V, bool stripCasts)
>> +  {
>> +    if (stripCasts) {
>> +      V = V->stripPointerCasts();
>> +      // look for the bitcast
>> +      for (Value::use_const_iterator I = V->use_begin(), E =V- 
>>  >use_end(); I != E; ++I) {
>>
>> 80 column?
>>
>>   
>>     
>
> Thanks, fixed.
>
>   
>>> 03-pass.patch:
>>> - the -print-dbginfo pass from my previous email, now it uses
>>> llvm/Analysis/DebugInfo.h
>>> - caveats: derived types are printed as "", no testcase (should I  
>>> add one?)
>>>
>>>     
>>>       
>> +    // a dbgstoppoint's information is valid until we encounter a new  
>> one
>> +    const DbgStopPointInst *LastDSP = DSI;
>> +    bool printed = !!DSI;
>>
>> Why the "!!"?
>>   
>>     
>
> It is a nice way to transform anything into a bool, I got used to it due
> to writing C macros like:
> #define UNLIKELY(cond) __builtin_expect(!!(cond), 0)
>
>   
>> +        } else if (const DbgFuncStartInst *FS =  
>> dyn_cast<DbgFuncStartInst>(i)) {
>> +
>> +          printFuncStart(FS);
>> +
>> +        }
>>
>> Why the blank lines?
>>   
>>     
>
> Initially printFuncStart wasn't a function, but all the code was there.
> I've removed these lines now.
>
> As for the blank line after this one:
> if ((DSI = dyn_cast<DbgStopPointInst>(i))) {
>
> It was to make the code more readable.
>
> Thanks for the comments, do you see any other major problems, or can I
> commit these patches?
>
> Best regards,
> --Edwin
>   


Sorry, here is the  correct version, the previous patch had a bug (Inst
instead of I).

Best regards,
--Edwin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: dbginfo-utils.patch
Type: text/x-diff
Size: 4172 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081215/a468e040/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: pass.patch
Type: text/x-diff
Size: 5934 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081215/a468e040/attachment-0001.bin 

From sabre at nondot.org  Mon Dec 15 15:02:26 2008
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Dec 2008 21:02:26 -0000
Subject: [llvm-commits] [llvm] r61045 -
	/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
Message-ID: <200812152102.mBFL2QPq032670@zion.cs.uiuc.edu>

Author: lattner
Date: Mon Dec 15 15:02:25 2008
New Revision: 61045

URL: http://llvm.org/viewvc/llvm-project?rev=61045&view=rev
Log:
refactor some code into a new TryToOptimizeStoreOfMallocToGlobal function.
Use GetElementPtrInst::hasAllZeroIndices where possible.

Modified:
    llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp

Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=61045&r1=61044&r2=61045&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Mon Dec 15 15:02:25 2008
@@ -1272,6 +1272,69 @@
   return FieldGlobals[0];
 }
 
+/// TryToOptimizeStoreOfMallocToGlobal - This function is called when we see a
+/// pointer global variable with a single value stored it that is a malloc or
+/// cast of malloc.
+static bool TryToOptimizeStoreOfMallocToGlobal(GlobalVariable *GV,
+                                               MallocInst *MI,
+                                               Module::global_iterator &GVI,
+                                               TargetData &TD) {
+  // If this is a malloc of an abstract type, don't touch it.
+  if (!MI->getAllocatedType()->isSized())
+    return false;
+  
+  // We can't optimize this global unless all uses of it are *known* to be
+  // of the malloc value, not of the null initializer value (consider a use
+  // that compares the global's value against zero to see if the malloc has
+  // been reached).  To do this, we check to see if all uses of the global
+  // would trap if the global were null: this proves that they must all
+  // happen after the malloc.
+  if (!AllUsesOfLoadedValueWillTrapIfNull(GV))
+    return false;
+  
+  // We can't optimize this if the malloc itself is used in a complex way,
+  // for example, being stored into multiple globals.  This allows the
+  // malloc to be stored into the specified global, loaded setcc'd, and
+  // GEP'd.  These are all things we could transform to using the global
+  // for.
+  {
+    SmallPtrSet<PHINode*, 8> PHIs;
+    if (!ValueIsOnlyUsedLocallyOrStoredToOneGlobal(MI, GV, PHIs))
+      return false;
+  }
+  
+  
+  // If we have a global that is only initialized with a fixed size malloc,
+  // transform the program to use global memory instead of malloc'd memory.
+  // This eliminates dynamic allocation, avoids an indirection accessing the
+  // data, and exposes the resultant global to further GlobalOpt.
+  if (ConstantInt *NElements = dyn_cast<ConstantInt>(MI->getArraySize())) {
+    // Restrict this transformation to only working on small allocations
+    // (2048 bytes currently), as we don't want to introduce a 16M global or
+    // something.
+    if (NElements->getZExtValue()*
+        TD.getABITypeSize(MI->getAllocatedType()) < 2048) {
+      GVI = OptimizeGlobalAddressOfMalloc(GV, MI);
+      return true;
+    }
+  }
+  
+  // If the allocation is an array of structures, consider transforming this
+  // into multiple malloc'd arrays, one for each field.  This is basically
+  // SRoA for malloc'd memory.
+  if (const StructType *AllocTy = 
+      dyn_cast<StructType>(MI->getAllocatedType())) {
+    // This the structure has an unreasonable number of fields, leave it
+    // alone.
+    if (AllocTy->getNumElements() <= 16 && AllocTy->getNumElements() > 0 &&
+        GlobalLoadUsesSimpleEnoughForHeapSRA(GV, MI)) {
+      GVI = PerformHeapAllocSRoA(GV, MI);
+      return true;
+    }
+  }
+  
+  return false;
+}  
 
 // OptimizeOnceStoredGlobal - Try to optimize globals based on the knowledge
 // that only one value (besides its initializer) is ever stored to the global.
@@ -1282,15 +1345,7 @@
     StoredOnceVal = CI->getOperand(0);
   else if (GetElementPtrInst *GEPI =dyn_cast<GetElementPtrInst>(StoredOnceVal)){
     // "getelementptr Ptr, 0, 0, 0" is really just a cast.
-    bool IsJustACast = true;
-    for (User::op_iterator i = GEPI->op_begin() + 1, e = GEPI->op_end();
-         i != e; ++i)
-      if (!isa<Constant>(*i) ||
-          !cast<Constant>(*i)->isNullValue()) {
-        IsJustACast = false;
-        break;
-      }
-    if (IsJustACast)
+    if (GEPI->hasAllZeroIndices())
       StoredOnceVal = GEPI->getOperand(0);
   }
 
@@ -1308,59 +1363,8 @@
       if (OptimizeAwayTrappingUsesOfLoads(GV, SOVC))
         return true;
     } else if (MallocInst *MI = dyn_cast<MallocInst>(StoredOnceVal)) {
-      // If this is a malloc of an abstract type, don't touch it.
-      if (!MI->getAllocatedType()->isSized())
-        return false;
-      
-      // We can't optimize this global unless all uses of it are *known* to be
-      // of the malloc value, not of the null initializer value (consider a use
-      // that compares the global's value against zero to see if the malloc has
-      // been reached).  To do this, we check to see if all uses of the global
-      // would trap if the global were null: this proves that they must all
-      // happen after the malloc.
-      if (!AllUsesOfLoadedValueWillTrapIfNull(GV))
-        return false;
-
-      // We can't optimize this if the malloc itself is used in a complex way,
-      // for example, being stored into multiple globals.  This allows the
-      // malloc to be stored into the specified global, loaded setcc'd, and
-      // GEP'd.  These are all things we could transform to using the global
-      // for.
-      {
-        SmallPtrSet<PHINode*, 8> PHIs;
-        if (!ValueIsOnlyUsedLocallyOrStoredToOneGlobal(MI, GV, PHIs))
-          return false;
-      }
-
-      
-      // If we have a global that is only initialized with a fixed size malloc,
-      // transform the program to use global memory instead of malloc'd memory.
-      // This eliminates dynamic allocation, avoids an indirection accessing the
-      // data, and exposes the resultant global to further GlobalOpt.
-      if (ConstantInt *NElements = dyn_cast<ConstantInt>(MI->getArraySize())) {
-        // Restrict this transformation to only working on small allocations
-        // (2048 bytes currently), as we don't want to introduce a 16M global or
-        // something.
-        if (NElements->getZExtValue()*
-                     TD.getABITypeSize(MI->getAllocatedType()) < 2048) {
-          GVI = OptimizeGlobalAddressOfMalloc(GV, MI);
-          return true;
-        }
-      }
-
-      // If the allocation is an array of structures, consider transforming this
-      // into multiple malloc'd arrays, one for each field.  This is basically
-      // SRoA for malloc'd memory.
-      if (const StructType *AllocTy = 
-                  dyn_cast<StructType>(MI->getAllocatedType())) {
-        // This the structure has an unreasonable number of fields, leave it
-        // alone.
-        if (AllocTy->getNumElements() <= 16 && AllocTy->getNumElements() > 0 &&
-            GlobalLoadUsesSimpleEnoughForHeapSRA(GV, MI)) {
-          GVI = PerformHeapAllocSRoA(GV, MI);
-          return true;
-        }
-      }
+      if (TryToOptimizeStoreOfMallocToGlobal(GV, MI, GVI, TD))
+        return true;
     }
   }
 




From sabre at nondot.org  Mon Dec 15 15:08:55 2008
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Dec 2008 21:08:55 -0000
Subject: [llvm-commits] [llvm] r61046 -
	/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
Message-ID: <200812152108.mBFL8t6k000387@zion.cs.uiuc.edu>

Author: lattner
Date: Mon Dec 15 15:08:54 2008
New Revision: 61046

URL: http://llvm.org/viewvc/llvm-project?rev=61046&view=rev
Log:
minor tweaks for formatting, allow bitcast in ValueIsOnlyUsedLocallyOrStoredToOneGlobal.

Modified:
    llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp

Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=61046&r1=61045&r2=61046&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Mon Dec 15 15:08:54 2008
@@ -927,26 +927,43 @@
 static bool ValueIsOnlyUsedLocallyOrStoredToOneGlobal(Instruction *V,
                                                       GlobalVariable *GV,
                                               SmallPtrSet<PHINode*, 8> &PHIs) {
-  for (Value::use_iterator UI = V->use_begin(), E = V->use_end(); UI != E; ++UI)
-    if (isa<LoadInst>(*UI) || isa<CmpInst>(*UI)) {
-      // Fine, ignore.
-    } else if (StoreInst *SI = dyn_cast<StoreInst>(*UI)) {
+  for (Value::use_iterator UI = V->use_begin(), E = V->use_end(); UI != E;++UI){
+    Instruction *Inst = dyn_cast<Instruction>(*UI);
+    if (Inst == 0) return false;
+    
+    if (isa<LoadInst>(Inst) || isa<CmpInst>(Inst)) {
+      continue; // Fine, ignore.
+    }
+    
+    if (StoreInst *SI = dyn_cast<StoreInst>(Inst)) {
       if (SI->getOperand(0) == V && SI->getOperand(1) != GV)
         return false;  // Storing the pointer itself... bad.
-      // Otherwise, storing through it, or storing into GV... fine.
-    } else if (isa<GetElementPtrInst>(*UI)) {
-      if (!ValueIsOnlyUsedLocallyOrStoredToOneGlobal(cast<Instruction>(*UI),
-                                                     GV, PHIs))
+      continue; // Otherwise, storing through it, or storing into GV... fine.
+    }
+    
+    if (isa<GetElementPtrInst>(Inst)) {
+      if (!ValueIsOnlyUsedLocallyOrStoredToOneGlobal(Inst, GV, PHIs))
         return false;
-    } else if (PHINode *PN = dyn_cast<PHINode>(*UI)) {
+      continue;
+    }
+    
+    if (PHINode *PN = dyn_cast<PHINode>(Inst)) {
       // PHIs are ok if all uses are ok.  Don't infinitely recurse through PHI
       // cycles.
       if (PHIs.insert(PN))
         if (!ValueIsOnlyUsedLocallyOrStoredToOneGlobal(PN, GV, PHIs))
           return false;
-    } else {
-      return false;
+      continue;
     }
+    
+    if (BitCastInst *BCI = dyn_cast<BitCastInst>(Inst)) {
+      if (!ValueIsOnlyUsedLocallyOrStoredToOneGlobal(BCI, GV, PHIs))
+        return false;
+      continue;
+    }
+    
+    return false;
+  }
   return true;
 }
 
@@ -1341,7 +1358,7 @@
 static bool OptimizeOnceStoredGlobal(GlobalVariable *GV, Value *StoredOnceVal,
                                      Module::global_iterator &GVI,
                                      TargetData &TD) {
-  if (CastInst *CI = dyn_cast<CastInst>(StoredOnceVal))
+  if (BitCastInst *CI = dyn_cast<BitCastInst>(StoredOnceVal))
     StoredOnceVal = CI->getOperand(0);
   else if (GetElementPtrInst *GEPI =dyn_cast<GetElementPtrInst>(StoredOnceVal)){
     // "getelementptr Ptr, 0, 0, 0" is really just a cast.




From sabre at nondot.org  Mon Dec 15 15:20:32 2008
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Dec 2008 21:20:32 -0000
Subject: [llvm-commits] [llvm] r61047 -
	/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
Message-ID: <200812152120.mBFLKWJI000808@zion.cs.uiuc.edu>

Author: lattner
Date: Mon Dec 15 15:20:32 2008
New Revision: 61047

URL: http://llvm.org/viewvc/llvm-project?rev=61047&view=rev
Log:
Use stripPointerCasts.

Modified:
    llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp

Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=61047&r1=61046&r2=61047&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Mon Dec 15 15:20:32 2008
@@ -1358,13 +1358,8 @@
 static bool OptimizeOnceStoredGlobal(GlobalVariable *GV, Value *StoredOnceVal,
                                      Module::global_iterator &GVI,
                                      TargetData &TD) {
-  if (BitCastInst *CI = dyn_cast<BitCastInst>(StoredOnceVal))
-    StoredOnceVal = CI->getOperand(0);
-  else if (GetElementPtrInst *GEPI =dyn_cast<GetElementPtrInst>(StoredOnceVal)){
-    // "getelementptr Ptr, 0, 0, 0" is really just a cast.
-    if (GEPI->hasAllZeroIndices())
-      StoredOnceVal = GEPI->getOperand(0);
-  }
+  // Ignore no-op GEPs and bitcasts.
+  StoredOnceVal = StoredOnceVal->stripPointerCasts();
 
   // If we are dealing with a pointer global that is initialized to null and
   // only has one (non-null) value stored into it, then we can optimize any




From brukman at cs.uiuc.edu  Mon Dec 15 15:27:28 2008
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Mon, 15 Dec 2008 15:27:28 -0600
Subject: [llvm-commits] CVS: llvm-www/releases/index.html
Message-ID: <200812152127.mBFLRSa5001108@zion.cs.uiuc.edu>



Changes in directory llvm-www/releases:

index.html updated: 1.47 -> 1.48
---
Log message:

Fix spelling.


---
Diffs of the changes:  (+1 -1)

 index.html |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm-www/releases/index.html
diff -u llvm-www/releases/index.html:1.47 llvm-www/releases/index.html:1.48
--- llvm-www/releases/index.html:1.47	Mon Dec 15 11:59:46 2008
+++ llvm-www/releases/index.html	Mon Dec 15 15:26:05 2008
@@ -76,7 +76,7 @@
   for (var i = 0; i < RELEASES.length; ++i) {
     var date = RELEASES[i][0];
     var version = RELEASES[i][1];
-    // Note: IE6 doesn't suport the much simpler version:
+    // Note: IE6 doesn't support the much simpler version:
     // table.insertRow(-1).innerHTML = '...';
     var row = table.insertRow(-1);
     row.appendChild(createCell(date, 'right'));





From dpatel at apple.com  Mon Dec 15 15:28:25 2008
From: dpatel at apple.com (Devang Patel)
Date: Mon, 15 Dec 2008 21:28:25 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61049 -
	/llvm-gcc-4.2/trunk/gcc/config/darwin.h
Message-ID: <200812152128.mBFLSPTe001145@zion.cs.uiuc.edu>

Author: dpatel
Date: Mon Dec 15 15:28:24 2008
New Revision: 61049

URL: http://llvm.org/viewvc/llvm-project?rev=61049&view=rev
Log:

Do not supply -emit-llvm to the linker.

Modified:
    llvm-gcc-4.2/trunk/gcc/config/darwin.h

Modified: llvm-gcc-4.2/trunk/gcc/config/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/darwin.h?rev=61049&r1=61048&r2=61049&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Mon Dec 15 15:28:24 2008
@@ -344,7 +344,8 @@
 #define LINK_COMMAND_SPEC "\
 %{!fdump=*:%{!fsyntax-only:%{!precomp:%{!c:%{!M:%{!MM:%{!E:%{!S:\
     %(linker) %l %X %{d} %{s} %{t} %{Z} %{u*} \
-    %{A} %{e*} %{m} %{r} %{x} \
+"/* LLVM LOCAL lto */"\
+    %{A} %<emit-llvm %{e*} %{m} %{r} %{x} \
     %{o*}%{!o:-o a.out} \
     %{!A:%{!nostdlib:%{!nostartfiles:%S}}} \
     %{L*} %{fopenmp:%:include(libgomp.spec)%(link_gomp)}   \




From wangmp at apple.com  Mon Dec 15 15:44:00 2008
From: wangmp at apple.com (Mon P Wang)
Date: Mon, 15 Dec 2008 21:44:00 -0000
Subject: [llvm-commits] [llvm] r61050 - in /llvm/trunk:
 lib/CodeGen/SelectionDAG/LegalizeTypes.h
 lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
 test/CodeGen/X86/vshift_scalar.ll test/CodeGen/X86/vshift_split2.ll
Message-ID: <200812152144.mBFLi0pB001651@zion.cs.uiuc.edu>

Author: wangmp
Date: Mon Dec 15 15:44:00 2008
New Revision: 61050

URL: http://llvm.org/viewvc/llvm-project?rev=61050&view=rev
Log:
Added support for splitting and scalarizing vector shifts.

Added:
    llvm/trunk/test/CodeGen/X86/vshift_scalar.ll
    llvm/trunk/test/CodeGen/X86/vshift_split2.ll
Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h?rev=61050&r1=61049&r2=61050&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h Mon Dec 15 15:44:00 2008
@@ -496,6 +496,7 @@
   // Vector Result Scalarization: <1 x ty> -> ty.
   void ScalarizeVectorResult(SDNode *N, unsigned OpNo);
   SDValue ScalarizeVecRes_BinOp(SDNode *N);
+  SDValue ScalarizeVecRes_ShiftOp(SDNode *N);
   SDValue ScalarizeVecRes_UnaryOp(SDNode *N);
 
   SDValue ScalarizeVecRes_BIT_CONVERT(SDNode *N);

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp?rev=61050&r1=61049&r2=61050&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp Mon Dec 15 15:44:00 2008
@@ -91,6 +91,10 @@
   case ISD::UDIV:
   case ISD::UREM:
   case ISD::XOR:  R = ScalarizeVecRes_BinOp(N); break;
+
+  case ISD::SHL:
+  case ISD::SRA:
+  case ISD::SRL: R = ScalarizeVecRes_ShiftOp(N); break;
   }
 
   // If R is null, the sub-method took care of registering the result.
@@ -104,6 +108,17 @@
   return DAG.getNode(N->getOpcode(), LHS.getValueType(), LHS, RHS);
 }
 
+SDValue DAGTypeLegalizer::ScalarizeVecRes_ShiftOp(SDNode *N) {
+  SDValue LHS = GetScalarizedVector(N->getOperand(0));
+  SDValue ShiftAmt = GetScalarizedVector(N->getOperand(1));
+  if (TLI.getShiftAmountTy().bitsLT(ShiftAmt.getValueType()))
+    ShiftAmt = DAG.getNode(ISD::TRUNCATE, TLI.getShiftAmountTy(), ShiftAmt);
+  else if (TLI.getShiftAmountTy().bitsGT(ShiftAmt.getValueType()))
+    ShiftAmt = DAG.getNode(ISD::ANY_EXTEND, TLI.getShiftAmountTy(), ShiftAmt);
+
+  return DAG.getNode(N->getOpcode(), LHS.getValueType(), LHS, ShiftAmt);
+}
+
 SDValue DAGTypeLegalizer::ScalarizeVecRes_BIT_CONVERT(SDNode *N) {
   MVT NewVT = N->getValueType(0).getVectorElementType();
   return DAG.getNode(ISD::BIT_CONVERT, NewVT, N->getOperand(0));
@@ -392,6 +407,9 @@
   case ISD::AND:
   case ISD::OR:
   case ISD::XOR:
+  case ISD::SHL:
+  case ISD::SRA:
+  case ISD::SRL: 
   case ISD::UREM:
   case ISD::SREM:
   case ISD::FREM: SplitVecRes_BinOp(N, Lo, Hi); break;

Added: llvm/trunk/test/CodeGen/X86/vshift_scalar.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/vshift_scalar.ll?rev=61050&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/vshift_scalar.ll (added)
+++ llvm/trunk/test/CodeGen/X86/vshift_scalar.ll Mon Dec 15 15:44:00 2008
@@ -0,0 +1,11 @@
+; RUN: llvm-as < %s | llc
+
+; Legalization test that requires scalarizing a vector.
+
+define void @update(<1 x i32> %val, <1 x i32>* %dst) nounwind {
+entry:
+	%shl = shl <1 x i32> %val, < i32 2>
+	%shr = ashr <1 x i32> %val, < i32 4>
+	store <1 x i32> %shr, <1 x i32>* %dst
+	ret void
+}

Added: llvm/trunk/test/CodeGen/X86/vshift_split2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/vshift_split2.ll?rev=61050&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/vshift_split2.ll (added)
+++ llvm/trunk/test/CodeGen/X86/vshift_split2.ll Mon Dec 15 15:44:00 2008
@@ -0,0 +1,11 @@
+; RUN: llvm-as < %s | llc
+
+; Legalization example that requires splitting a large vector into smaller pieces.
+
+define void @update(<8 x i32> %val, <8 x i32>* %dst) nounwind {
+entry:
+	%shl = shl <8 x i32> %val, < i32 2, i32 2, i32 2, i32 2, i32 4, i32 4, i32 4, i32 4 >
+	%shr = ashr <8 x i32> %val, < i32 2, i32 2, i32 2, i32 2, i32 4, i32 4, i32 4, i32 4 >
+	store <8 x i32> %shr, <8 x i32>* %dst
+	ret void
+}




From sabre at nondot.org  Mon Dec 15 15:44:34 2008
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Dec 2008 21:44:34 -0000
Subject: [llvm-commits] [llvm] r61051 -
	/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
Message-ID: <200812152144.mBFLiYTk001686@zion.cs.uiuc.edu>

Author: lattner
Date: Mon Dec 15 15:44:34 2008
New Revision: 61051

URL: http://llvm.org/viewvc/llvm-project?rev=61051&view=rev
Log:
enhance heap-sra to apply to fixed sized array allocations, not just
variable sized array allocations.

Modified:
    llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp

Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=61051&r1=61050&r2=61051&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Mon Dec 15 15:44:34 2008
@@ -988,8 +988,25 @@
       // PHI.
       unsigned PredNo = Alloc->use_begin().getOperandNo()/2;
       InsertPt = PN->getIncomingBlock(PredNo)->getTerminator();
+    } else if (isa<BitCastInst>(U)) {
+      // Must be bitcast between the malloc and store to initialize the global.
+      ReplaceUsesOfMallocWithGlobal(U, GV);
+      U->eraseFromParent();
+      continue;
+    } else if (GetElementPtrInst *GEPI = dyn_cast<GetElementPtrInst>(U)) {
+      // If this is a "GEP bitcast" and the user is a store to the global, then
+      // just process it as a bitcast.
+      if (GEPI->hasAllZeroIndices() && GEPI->hasOneUse())
+        if (StoreInst *SI = dyn_cast<StoreInst>(GEPI->use_back()))
+          if (SI->getOperand(1) == GV) {
+            // Must be bitcast GEP between the malloc and store to initialize
+            // the global.
+            ReplaceUsesOfMallocWithGlobal(GEPI, GV);
+            GEPI->eraseFromParent();
+            continue;
+          }
     }
-    
+      
     // Insert a load from the global, and use it instead of the malloc.
     Value *NL = new LoadInst(GV, GV->getName()+".val", InsertPt);
     U->replaceUsesOfWith(Alloc, NL);
@@ -1339,12 +1356,34 @@
   // If the allocation is an array of structures, consider transforming this
   // into multiple malloc'd arrays, one for each field.  This is basically
   // SRoA for malloc'd memory.
-  if (const StructType *AllocTy = 
-      dyn_cast<StructType>(MI->getAllocatedType())) {
+  const Type *AllocTy = MI->getAllocatedType();
+  
+  // If this is an allocation of a fixed size array of structs, analyze as a
+  // variable size array.  malloc [100 x struct],1 -> malloc struct, 100
+  if (!MI->isArrayAllocation())
+    if (const ArrayType *AT = dyn_cast<ArrayType>(AllocTy))
+      AllocTy = AT->getElementType();
+  
+  if (const StructType *AllocSTy = dyn_cast<StructType>(AllocTy)) {
     // This the structure has an unreasonable number of fields, leave it
     // alone.
-    if (AllocTy->getNumElements() <= 16 && AllocTy->getNumElements() > 0 &&
+    if (AllocSTy->getNumElements() <= 16 && AllocSTy->getNumElements() != 0 &&
         GlobalLoadUsesSimpleEnoughForHeapSRA(GV, MI)) {
+      
+      // If this is a fixed size array, transform the Malloc to be an alloc of
+      // structs.  malloc [100 x struct],1 -> malloc struct, 100
+      if (const ArrayType *AT = dyn_cast<ArrayType>(MI->getAllocatedType())) {
+        MallocInst *NewMI = 
+          new MallocInst(AllocSTy, 
+                         ConstantInt::get(Type::Int32Ty, AT->getNumElements()),
+                         "", MI);
+        NewMI->takeName(MI);
+        Value *Cast = new BitCastInst(NewMI, MI->getType(), "tmp", MI);
+        MI->replaceAllUsesWith(Cast);
+        MI->eraseFromParent();
+        MI = NewMI;
+      }
+      
       GVI = PerformHeapAllocSRoA(GV, MI);
       return true;
     }




From sabre at nondot.org  Mon Dec 15 15:46:23 2008
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Dec 2008 21:46:23 -0000
Subject: [llvm-commits] [llvm] r61052 -
	/llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll
Message-ID: <200812152146.mBFLkN2O001764@zion.cs.uiuc.edu>

Author: lattner
Date: Mon Dec 15 15:46:23 2008
New Revision: 61052

URL: http://llvm.org/viewvc/llvm-project?rev=61052&view=rev
Log:
add  testcase for r61051

Added:
    llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll

Added: llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll?rev=61052&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll (added)
+++ llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll Mon Dec 15 15:46:23 2008
@@ -0,0 +1,42 @@
+; RUN: llvm-as < %s | opt -globalopt | llvm-dis | grep {@X.f0}
+; RUN: llvm-as < %s | opt -globalopt | llvm-dis | grep {@X.f1}
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+target triple = "i386-apple-darwin7"
+	%struct.foo = type { i32, i32 }
+ at X = internal global %struct.foo* null		; <%struct.foo**> [#uses=2]
+
+define internal fastcc void @bar(i32 %Size) nounwind noinline {
+entry:
+	%0 = malloc [1000000 x %struct.foo]
+        ;%.sub = bitcast [1000000 x %struct.foo]* %0 to %struct.foo*
+	%.sub = getelementptr [1000000 x %struct.foo]* %0, i32 0, i32 0		; <%struct.foo*> [#uses=1]
+	store %struct.foo* %.sub, %struct.foo** @X, align 4
+	ret void
+}
+
+define internal fastcc i32 @baz() nounwind readonly noinline {
+bb1.thread:
+	%0 = load %struct.foo** @X, align 4		; <%struct.foo*> [#uses=1]
+	br label %bb1
+
+bb1:		; preds = %bb1, %bb1.thread
+	%i.0.reg2mem.0 = phi i32 [ 0, %bb1.thread ], [ %indvar.next, %bb1 ]		; <i32> [#uses=2]
+	%sum.0.reg2mem.0 = phi i32 [ 0, %bb1.thread ], [ %3, %bb1 ]		; <i32> [#uses=1]
+	%1 = getelementptr %struct.foo* %0, i32 %i.0.reg2mem.0, i32 0		; <i32*> [#uses=1]
+	%2 = load i32* %1, align 4		; <i32> [#uses=1]
+	%3 = add i32 %2, %sum.0.reg2mem.0		; <i32> [#uses=2]
+	%indvar.next = add i32 %i.0.reg2mem.0, 1		; <i32> [#uses=2]
+	%exitcond = icmp eq i32 %indvar.next, 1200		; <i1> [#uses=1]
+	br i1 %exitcond, label %bb2, label %bb1
+
+bb2:		; preds = %bb1
+	ret i32 %3
+}
+
+define i32 @main(i32 %argc, i8** %argv) nounwind {
+entry:
+	tail call fastcc void @bar(i32 %argc) nounwind noinline
+	%0 = tail call fastcc i32 @baz() nounwind		; <i32> [#uses=1]
+	ret i32 %0
+}




From sabre at nondot.org  Mon Dec 15 15:53:48 2008
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 15 Dec 2008 21:53:48 -0000
Subject: [llvm-commits] [test-suite] r61053 - in /test-suite/trunk:
	Makefile.rules Makefile.tests
Message-ID: <200812152153.mBFLrmp4001989@zion.cs.uiuc.edu>

Author: lattner
Date: Mon Dec 15 15:53:47 2008
New Revision: 61053

URL: http://llvm.org/viewvc/llvm-project?rev=61053&view=rev
Log:
remove some old llvm-upgrade cruft. 
Instead of emitting the full command line to build each file with 
llvm-gcc, just emit a nice "Compiling" line.

Modified:
    test-suite/trunk/Makefile.rules
    test-suite/trunk/Makefile.tests

Modified: test-suite/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.rules?rev=61053&r1=61052&r2=61053&view=diff

==============================================================================
--- test-suite/trunk/Makefile.rules (original)
+++ test-suite/trunk/Makefile.rules Mon Dec 15 15:53:47 2008
@@ -283,12 +283,6 @@
 LBUGPOINT = $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT)
 LFINDMISOPT= $(LLVM_SRC_ROOT)/utils/findmisopt
 LLVMC     = $(LLVMTOOLCURRENT)/llvmc$(EXEEXT)
-LUPGRADE  = $(LLVMTOOLCURRENT)/llvm-upgrade$(EXEEXT)
-ifeq ($(LLVMGCC_MAJVERS),3)
-UPGRADE_LL= $(LUPGRADE) $(1) -o $(1).up.tmp -f ; $(MV) $(1).up.tmp $(1)
-else
-UPGRADE_LL=
-endif
 
 
 

Modified: test-suite/trunk/Makefile.tests
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.tests?rev=61053&r1=61052&r2=61053&view=diff

==============================================================================
--- test-suite/trunk/Makefile.tests (original)
+++ test-suite/trunk/Makefile.tests Mon Dec 15 15:53:47 2008
@@ -43,33 +43,33 @@
 
 # Compile from X.c to Output/X.bc
 Output/%.bc: %.c $(LCC1) Output/.dir $(INCLUDES)
-	-$(LLVMGCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
-	-$(call UPGRADE_LL,$@)
+	@echo Compiling $(notdir $<) to $@
+	-$(VERB) $(LLVMGCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.cpp to Output/X.bc
 Output/%.bc: %.cpp $(LCC1XX) Output/.dir $(INCLUDES)
-	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
-	-$(call UPGRADE_LL,$@)
+	@echo Compiling $(notdir $<) to $@
+	-$(VERB) $(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.cc to Output/X.bc
 Output/%.bc: %.cc $(LCC1XX) Output/.dir $(INCLUDES)
-	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
-	-$(call UPGRADE_LL,$@)
+	@echo Compiling $(notdir $<) to $@
+	-$(VERB) $(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.C to Output/X.bc
 Output/%.bc: %.C $(LCC1XX) Output/.dir $(INCLUDES)
-	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
-	-$(call UPGRADE_LL,$@)
+	@echo Compiling $(notdir $<) to $@
+	-$(VERB) $(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.m to Output/X.bc
 Output/%.bc: %.m $(LCC1) Output/.dir $(INCLUDES)
-	-$(LLVMGCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
-	-$(call UPGRADE_LL,$@)
+	@echo Compiling $(notdir $<) to $@
+	-$(VERB) $(LLVMGCC) $(CPPFLAGS) $(CFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # Compile from X.mm to Output/X.bc
 Output/%.bc: %.mm $(LCC1XX) Output/.dir $(INCLUDES)
-	-$(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
-	-$(call UPGRADE_LL,$@)
+	@echo Compiling $(notdir $<) to $@
+	-$(VERB) $(LLVMGXX) $(CPPFLAGS) $(CXXFLAGS) $(LOPTFLAGS) $(TARGET_FLAGS) -c $< -o $@ -emit-llvm
 
 # LLVM Assemble from X.ll to Output/X.bc.  Because we are coming directly from
 # LLVM source, use the non-transforming assembler.




From evan.cheng at apple.com  Mon Dec 15 16:09:31 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 15 Dec 2008 14:09:31 -0800
Subject: [llvm-commits] [PATCH] Debug info utilities and printer pass
In-Reply-To: <4946AE82.5040606@gmail.com>
References: <4940122B.5040005@gmail.com>
	<F7DB7C4E-B5B7-4F5F-A428-9D941E59FE82@apple.com>
	<E94E8A20-2FE8-494B-8D3B-05B22CD867CC@apple.com>
	<4940FF97.30204@gmail.com>
	<9A898E37-139F-4E76-BEA0-76161870E4FD@apple.com>
	<4946AE82.5040606@gmail.com>
Message-ID: <A697F3F7-CBA6-4879-9173-4C8C920616A1@apple.com>


On Dec 15, 2008, at 11:22 AM, T?r?k Edwin wrote:

> On 2008-12-15 20:37, Evan Cheng wrote:
>> I don't quite understand this:
>>
>> +// needed by DIVariable::getType()
>> +DIType::DIType(GlobalVariable *GV) : DIDescriptor(GV)
>> +{
>> +  if (GV) {
>> +    unsigned tag = getTag();
>> +    if (tag != dwarf::DW_TAG_base_type && !
>> DIDerivedType::isDerivedType(tag) &&
>> +        !DICompositeType::isCompositeType(tag))
>> +      GV = 0;
>> +  }
>> +}
>>
>> What exactly is it trying to accomplish by changing the parameter GV
>> to 0?
>>
>
> There is a comment at the top of the file explaining
> // If this is non-null, check to see if the Tag matches.  If not,  
> set to
> null.
>
> That comment is not duplicated in other places that set GV to 0, so I
> didn't duplicate it either.
>
> If GV is NULL, all the getters in DIDescriptor return a default  
> object,
> instead of trying to read it.
>
> I think it is a way of saying: this object shouldn't have been
> constructed, but it is too late now, and we don't want to throw
> exceptions either,
> so just return default constructed objects from now on.

So you are setting DIDescriptor::GV to null? If so, please don't use  
the same name for the parameter. It's confusing.


>
>
>>
>>
>>> 02-dbginfo-utils.patch:
>>> - in my previous patch this was include/llvm/Support/DebugInfo.h, it
>>> introduces:
>>> - findStopPoint
>>> - findBBStopPoint
>>> - findDbgDeclare
>>>
>>
>> +      // a BB consisting only of a terminator, can't have a  
>> stoppoint
>>
>> Please start with a capital 'A' and don't forget periods.
>>
>> +      // this BB didn't have a stoppoint, if there is only one
>> +      // predecessor, look for a stoppoint there
>> +      // we could use getIDom(), but that would require dominator  
>> info
>>
>> Here as well.
>>
>> +  const DbgDeclareInst *findDbgDeclare(const Value *V, bool  
>> stripCasts)
>> +  {
>> +    if (stripCasts) {
>> +      V = V->stripPointerCasts();
>> +      // look for the bitcast
>> +      for (Value::use_const_iterator I = V->use_begin(), E =V-
>>> use_end(); I != E; ++I) {
>>
>> 80 column?
>>
>>
>
> Thanks, fixed.
>
>>> 03-pass.patch:
>>> - the -print-dbginfo pass from my previous email, now it uses
>>> llvm/Analysis/DebugInfo.h
>>> - caveats: derived types are printed as "", no testcase (should I
>>> add one?)
>>>
>>>
>> +    // a dbgstoppoint's information is valid until we encounter a  
>> new
>> one
>> +    const DbgStopPointInst *LastDSP = DSI;
>> +    bool printed = !!DSI;
>>
>> Why the "!!"?
>>
>
> It is a nice way to transform anything into a bool, I got used to it  
> due
> to writing C macros like:
> #define UNLIKELY(cond) __builtin_expect(!!(cond), 0)

I think it's better to write something like
bool printed = DSI != 0;

>
>
>>
>> +        } else if (const DbgFuncStartInst *FS =
>> dyn_cast<DbgFuncStartInst>(i)) {
>> +
>> +          printFuncStart(FS);
>> +
>> +        }
>>
>> Why the blank lines?
>>
>
> Initially printFuncStart wasn't a function, but all the code was  
> there.
> I've removed these lines now.
>
> As for the blank line after this one:
> if ((DSI = dyn_cast<DbgStopPointInst>(i))) {
>
> It was to make the code more readable.
>
> Thanks for the comments, do you see any other major problems, or can I
> commit these patches?

Yes, please. Thanks.

Evan

>
>
> Best regards,
> --Edwin
> <dbginfo- 
> utils 
> .patch><pass.patch>_______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits




From isanbard at gmail.com  Mon Dec 15 18:42:25 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Dec 2008 00:42:25 -0000
Subject: [llvm-commits] [llvm] r61061 - /llvm/trunk/utils/buildit/build_llvm
Message-ID: <200812160042.mBG0gP9o007573@zion.cs.uiuc.edu>

Author: void
Date: Mon Dec 15 18:42:25 2008
New Revision: 61061

URL: http://llvm.org/viewvc/llvm-project?rev=61061&view=rev
Log:
Change so that buildit won't need a parent directory with only the build scripts in them.

Modified:
    llvm/trunk/utils/buildit/build_llvm

Modified: llvm/trunk/utils/buildit/build_llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/buildit/build_llvm?rev=61061&r1=61060&r2=61061&view=diff

==============================================================================
--- llvm/trunk/utils/buildit/build_llvm (original)
+++ llvm/trunk/utils/buildit/build_llvm Mon Dec 15 18:42:25 2008
@@ -82,7 +82,7 @@
 cd $DIR/obj-llvm || exit 1
 
 if [ \! -f Makefile.config ]; then
-    $SRC_DIR/llvm/configure --prefix=$DT_HOME/local \
+    $SRC_DIR/configure --prefix=$DT_HOME/local \
         --enable-targets=arm,x86,powerpc,cbe \
         --enable-assertions=$LLVM_ASSERTIONS \
         --enable-optimized=$LLVM_OPTIMIZED \




From gohman at apple.com  Mon Dec 15 18:47:19 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 00:47:19 -0000
Subject: [llvm-commits] [llvm] r61062 -
	/llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
Message-ID: <200812160047.mBG0lJf2007706@zion.cs.uiuc.edu>

Author: djg
Date: Mon Dec 15 18:47:19 2008
New Revision: 61062

URL: http://llvm.org/viewvc/llvm-project?rev=61062&view=rev
Log:
SDep's operator== should compare the Latency field too.

Modified:
    llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h

Modified: llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h?rev=61062&r1=61061&r2=61062&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h (original)
+++ llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h Mon Dec 15 18:47:19 2008
@@ -118,7 +118,7 @@
     }
 
     bool operator==(const SDep &Other) const {
-      if (Dep != Other.Dep) return false;
+      if (Dep != Other.Dep || Latency != Other.Latency) return false;
       switch (Dep.getInt()) {
       case Data:
       case Anti:




From gohman at apple.com  Mon Dec 15 18:48:54 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 00:48:54 -0000
Subject: [llvm-commits] [llvm] r61063 -
	/llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
Message-ID: <200812160048.mBG0msfe007755@zion.cs.uiuc.edu>

Author: djg
Date: Mon Dec 15 18:48:53 2008
New Revision: 61063

URL: http://llvm.org/viewvc/llvm-project?rev=61063&view=rev
Log:
Reorder some SDep methods. No functionality change.

Modified:
    llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h

Modified: llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h?rev=61063&r1=61062&r2=61063&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h (original)
+++ llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h Mon Dec 15 18:48:53 2008
@@ -166,12 +166,6 @@
       return getKind() != Data;
     }
 
-    /// isArtificial - Test if this is an Order dependence that is marked
-    /// as "artificial", meaning it isn't necessary for correctness.
-    bool isArtificial() const {
-      return getKind() == Order && Contents.Order.isArtificial;
-    }
-
     /// isMustAlias - Test if this is an Order dependence that is marked
     /// as "must alias", meaning that the SUnits at either end of the edge
     /// have a memory dependence on a known memory location.
@@ -179,6 +173,12 @@
       return getKind() == Order && Contents.Order.isMustAlias;
     }
 
+    /// isArtificial - Test if this is an Order dependence that is marked
+    /// as "artificial", meaning it isn't necessary for correctness.
+    bool isArtificial() const {
+      return getKind() == Order && Contents.Order.isArtificial;
+    }
+
     /// isAssignedRegDep - Test if this is a Data dependence that is
     /// associated with a register.
     bool isAssignedRegDep() const {




From gohman at apple.com  Mon Dec 15 18:51:34 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 00:51:34 -0000
Subject: [llvm-commits] [llvm] r61064 -
	/llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
Message-ID: <200812160051.mBG0pYWO007850@zion.cs.uiuc.edu>

Author: djg
Date: Mon Dec 15 18:51:33 2008
New Revision: 61064

URL: http://llvm.org/viewvc/llvm-project?rev=61064&view=rev
Log:
Add a getSDep() access function to SUnitIterator to return the
current SDep.

Modified:
    llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h

Modified: llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h?rev=61064&r1=61063&r2=61064&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h (original)
+++ llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h Mon Dec 15 18:51:33 2008
@@ -549,10 +549,13 @@
     const SUnit *getNode() const { return Node; }
     /// isCtrlDep - Test if this is not an SDep::Data dependence.
     bool isCtrlDep() const {
-      return Node->Preds[Operand].isCtrl();
+      return getSDep().isCtrl();
     }
     bool isArtificialDep() const {
-      return Node->Preds[Operand].isArtificial();
+      return getSDep().isArtificial();
+    }
+    const SDep &getSDep() const {
+      return Node->Preds[Operand];
     }
   };
 




From gohman at apple.com  Mon Dec 15 18:55:00 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 00:55:00 -0000
Subject: [llvm-commits] [llvm] r61065 -
	/llvm/trunk/lib/CodeGen/ScheduleDAGPrinter.cpp
Message-ID: <200812160055.mBG0t0IC007937@zion.cs.uiuc.edu>

Author: djg
Date: Mon Dec 15 18:55:00 2008
New Revision: 61065

URL: http://llvm.org/viewvc/llvm-project?rev=61065&view=rev
Log:
This getEdgeAttributes doesn't need a template argument.

Modified:
    llvm/trunk/lib/CodeGen/ScheduleDAGPrinter.cpp

Modified: llvm/trunk/lib/CodeGen/ScheduleDAGPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/ScheduleDAGPrinter.cpp?rev=61065&r1=61064&r2=61065&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/ScheduleDAGPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/ScheduleDAGPrinter.cpp Mon Dec 15 18:55:00 2008
@@ -48,8 +48,8 @@
     
     /// If you want to override the dot attributes printed for a particular
     /// edge, override this method.
-    template<typename EdgeIter>
-    static std::string getEdgeAttributes(const void *Node, EdgeIter EI) {
+    static std::string getEdgeAttributes(const SUnit *Node,
+                                         SUnitIterator EI) {
       if (EI.isArtificialDep())
         return "color=cyan,style=dashed";
       if (EI.isCtrlDep())




From gohman at apple.com  Mon Dec 15 19:00:55 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 01:00:55 -0000
Subject: [llvm-commits] [llvm] r61066 - in /llvm/trunk:
 include/llvm/CodeGen/ScheduleDAG.h
 lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
 lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
Message-ID: <200812160100.mBG10txC008163@zion.cs.uiuc.edu>

Author: djg
Date: Mon Dec 15 19:00:55 2008
New Revision: 61066

URL: http://llvm.org/viewvc/llvm-project?rev=61066&view=rev
Log:
Make addPred and removePred return void, since the return value is not
currently used by anything.

Modified:
    llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
    llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp

Modified: llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h?rev=61066&r1=61065&r2=61066&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h (original)
+++ llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h Mon Dec 15 19:00:55 2008
@@ -299,12 +299,12 @@
 
     /// addPred - This adds the specified edge as a pred of the current node if
     /// not already.  It also adds the current node as a successor of the
-    /// specified node.  This returns true if this is a new pred.
-    bool addPred(const SDep &D) {
+    /// specified node.
+    void addPred(const SDep &D) {
       // If this node already has this depenence, don't add a redundant one.
       for (unsigned i = 0, e = (unsigned)Preds.size(); i != e; ++i)
         if (Preds[i] == D)
-          return false;
+          return;
       // Add a pred to this SUnit.
       Preds.push_back(D);
       // Now add a corresponding succ to N.
@@ -321,14 +321,12 @@
         ++NumPredsLeft;
       if (!isScheduled)
         ++N->NumSuccsLeft;
-      return true;
     }
 
     /// removePred - This removes the specified edge as a pred of the current
     /// node if it exists.  It also removes the current node as a successor of
-    /// the specified node.  This returns true if the edge existed and was
-    /// removed.
-    bool removePred(const SDep &D) {
+    /// the specified node.
+    void removePred(const SDep &D) {
       // Find the matching predecessor.
       for (SmallVector<SDep, 4>::iterator I = Preds.begin(), E = Preds.end();
            I != E; ++I)
@@ -356,9 +354,8 @@
             --NumPredsLeft;
           if (!isScheduled)
             --N->NumSuccsLeft;
-          return true;
+          return;
         }
-      return false;
     }
 
     bool isPred(SUnit *N) {

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp?rev=61066&r1=61065&r2=61066&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp Mon Dec 15 19:00:55 2008
@@ -79,14 +79,14 @@
 
   /// AddPred - adds a predecessor edge to SUnit SU.
   /// This returns true if this is a new predecessor.
-  bool AddPred(SUnit *SU, const SDep &D) {
-    return SU->addPred(D);
+  void AddPred(SUnit *SU, const SDep &D) {
+    SU->addPred(D);
   }
 
   /// RemovePred - removes a predecessor edge from SUnit SU.
   /// This returns true if an edge was removed.
-  bool RemovePred(SUnit *SU, const SDep &D) {
-    return SU->removePred(D);
+  void RemovePred(SUnit *SU, const SDep &D) {
+    SU->removePred(D);
   }
 
 private:

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp?rev=61066&r1=61065&r2=61066&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp Mon Dec 15 19:00:55 2008
@@ -101,17 +101,17 @@
   /// AddPred - adds a predecessor edge to SUnit SU.
   /// This returns true if this is a new predecessor.
   /// Updates the topological ordering if required.
-  bool AddPred(SUnit *SU, const SDep &D) {
+  void AddPred(SUnit *SU, const SDep &D) {
     Topo.AddPred(SU, D.getSUnit());
-    return SU->addPred(D);
+    SU->addPred(D);
   }
 
   /// RemovePred - removes a predecessor edge from SUnit SU.
   /// This returns true if an edge was removed.
   /// Updates the topological ordering if required.
-  bool RemovePred(SUnit *SU, const SDep &D) {
+  void RemovePred(SUnit *SU, const SDep &D) {
     Topo.RemovePred(SU, D.getSUnit());
-    return SU->removePred(D);
+    SU->removePred(D);
   }
 
 private:




From gohman at apple.com  Mon Dec 15 19:05:52 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 01:05:52 -0000
Subject: [llvm-commits] [llvm] r61067 - in /llvm/trunk:
 include/llvm/CodeGen/ScheduleDAG.h lib/CodeGen/ScheduleDAG.cpp
Message-ID: <200812160105.mBG15qMN008302@zion.cs.uiuc.edu>

Author: djg
Date: Mon Dec 15 19:05:52 2008
New Revision: 61067

URL: http://llvm.org/viewvc/llvm-project?rev=61067&view=rev
Log:
Move addPred and removePred out-of-line.

Modified:
    llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
    llvm/trunk/lib/CodeGen/ScheduleDAG.cpp

Modified: llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h?rev=61067&r1=61066&r2=61067&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h (original)
+++ llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h Mon Dec 15 19:05:52 2008
@@ -300,63 +300,12 @@
     /// addPred - This adds the specified edge as a pred of the current node if
     /// not already.  It also adds the current node as a successor of the
     /// specified node.
-    void addPred(const SDep &D) {
-      // If this node already has this depenence, don't add a redundant one.
-      for (unsigned i = 0, e = (unsigned)Preds.size(); i != e; ++i)
-        if (Preds[i] == D)
-          return;
-      // Add a pred to this SUnit.
-      Preds.push_back(D);
-      // Now add a corresponding succ to N.
-      SDep P = D;
-      P.setSUnit(this);
-      SUnit *N = D.getSUnit();
-      N->Succs.push_back(P);
-      // Update the bookkeeping.
-      if (D.getKind() == SDep::Data) {
-        ++NumPreds;
-        ++N->NumSuccs;
-      }
-      if (!N->isScheduled)
-        ++NumPredsLeft;
-      if (!isScheduled)
-        ++N->NumSuccsLeft;
-    }
+    void addPred(const SDep &D);
 
     /// removePred - This removes the specified edge as a pred of the current
     /// node if it exists.  It also removes the current node as a successor of
     /// the specified node.
-    void removePred(const SDep &D) {
-      // Find the matching predecessor.
-      for (SmallVector<SDep, 4>::iterator I = Preds.begin(), E = Preds.end();
-           I != E; ++I)
-        if (*I == D) {
-          bool FoundSucc = false;
-          // Find the corresponding successor in N.
-          SDep P = D;
-          P.setSUnit(this);
-          SUnit *N = D.getSUnit();
-          for (SmallVector<SDep, 4>::iterator II = N->Succs.begin(),
-                 EE = N->Succs.end(); II != EE; ++II)
-            if (*II == P) {
-              FoundSucc = true;
-              N->Succs.erase(II);
-              break;
-            }
-          assert(FoundSucc && "Mismatching preds / succs lists!");
-          Preds.erase(I);
-          // Update the bookkeeping;
-          if (D.getKind() == SDep::Data) {
-            --NumPreds;
-            --N->NumSuccs;
-          }
-          if (!N->isScheduled)
-            --NumPredsLeft;
-          if (!isScheduled)
-            --N->NumSuccsLeft;
-          return;
-        }
-    }
+    void removePred(const SDep &D);
 
     bool isPred(SUnit *N) {
       for (unsigned i = 0, e = (unsigned)Preds.size(); i != e; ++i)

Modified: llvm/trunk/lib/CodeGen/ScheduleDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/ScheduleDAG.cpp?rev=61067&r1=61066&r2=61067&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/ScheduleDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/ScheduleDAG.cpp Mon Dec 15 19:05:52 2008
@@ -163,6 +163,67 @@
   DOUT << "\n";
 }
 
+/// addPred - This adds the specified edge as a pred of the current node if
+/// not already.  It also adds the current node as a successor of the
+/// specified node.
+void SUnit::addPred(const SDep &D) {
+  // If this node already has this depenence, don't add a redundant one.
+  for (unsigned i = 0, e = (unsigned)Preds.size(); i != e; ++i)
+    if (Preds[i] == D)
+      return;
+  // Add a pred to this SUnit.
+  Preds.push_back(D);
+  // Now add a corresponding succ to N.
+  SDep P = D;
+  P.setSUnit(this);
+  SUnit *N = D.getSUnit();
+  N->Succs.push_back(P);
+  // Update the bookkeeping.
+  if (D.getKind() == SDep::Data) {
+    ++NumPreds;
+    ++N->NumSuccs;
+  }
+  if (!N->isScheduled)
+    ++NumPredsLeft;
+  if (!isScheduled)
+    ++N->NumSuccsLeft;
+}
+
+/// removePred - This removes the specified edge as a pred of the current
+/// node if it exists.  It also removes the current node as a successor of
+/// the specified node.
+void SUnit::removePred(const SDep &D) {
+  // Find the matching predecessor.
+  for (SmallVector<SDep, 4>::iterator I = Preds.begin(), E = Preds.end();
+       I != E; ++I)
+    if (*I == D) {
+      bool FoundSucc = false;
+      // Find the corresponding successor in N.
+      SDep P = D;
+      P.setSUnit(this);
+      SUnit *N = D.getSUnit();
+      for (SmallVector<SDep, 4>::iterator II = N->Succs.begin(),
+             EE = N->Succs.end(); II != EE; ++II)
+        if (*II == P) {
+          FoundSucc = true;
+          N->Succs.erase(II);
+          break;
+        }
+      assert(FoundSucc && "Mismatching preds / succs lists!");
+      Preds.erase(I);
+      // Update the bookkeeping;
+      if (D.getKind() == SDep::Data) {
+        --NumPreds;
+        --N->NumSuccs;
+      }
+      if (!N->isScheduled)
+        --NumPredsLeft;
+      if (!isScheduled)
+        --N->NumSuccsLeft;
+      return;
+    }
+}
+
 /// SUnit - Scheduling unit. It's an wrapper around either a single SDNode or
 /// a group of nodes flagged together.
 void SUnit::dump(const ScheduleDAG *G) const {




From gohman at apple.com  Mon Dec 15 20:38:22 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 02:38:22 -0000
Subject: [llvm-commits] [llvm] r61070 -
	/llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp
Message-ID: <200812160238.mBG2cMoK011284@zion.cs.uiuc.edu>

Author: djg
Date: Mon Dec 15 20:38:22 2008
New Revision: 61070

URL: http://llvm.org/viewvc/llvm-project?rev=61070&view=rev
Log:
Add a simple target-independent heuristic to allow targets with no
instruction itinerary data to back-schedule loads.

Modified:
    llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp

Modified: llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp?rev=61070&r1=61069&r2=61070&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp (original)
+++ llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp Mon Dec 15 20:38:22 2008
@@ -225,6 +225,12 @@
   // all nodes flagged together into this SUnit.
   SU->Latency =
     InstrItins.getLatency(SU->getInstr()->getDesc().getSchedClass());
+
+  // Simplistic target-independent heuristic: assume that loads take
+  // extra time.
+  if (InstrItins.isEmpty())
+    if (SU->getInstr()->getDesc().mayLoad())
+      SU->Latency += 2;
 }
 
 void ScheduleDAGInstrs::dumpNode(const SUnit *SU) const {




From brukman+llvm at gmail.com  Mon Dec 15 20:54:22 2008
From: brukman+llvm at gmail.com (Misha Brukman)
Date: Tue, 16 Dec 2008 02:54:22 -0000
Subject: [llvm-commits] [llvm] r61071 -
	/llvm/trunk/docs/SourceLevelDebugging.html
Message-ID: <200812160254.mBG2sMX1011909@zion.cs.uiuc.edu>

Author: brukman
Date: Mon Dec 15 20:54:22 2008
New Revision: 61071

URL: http://llvm.org/viewvc/llvm-project?rev=61071&view=rev
Log:
* Comply with HTML 4.01 Strict standard
* Converted absolute links to llvm.org/docs to relative links
* Fixed spelling and s/;/:/, as needed

Modified:
    llvm/trunk/docs/SourceLevelDebugging.html

Modified: llvm/trunk/docs/SourceLevelDebugging.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/SourceLevelDebugging.html?rev=61071&r1=61070&r2=61071&view=diff

==============================================================================
--- llvm/trunk/docs/SourceLevelDebugging.html (original)
+++ llvm/trunk/docs/SourceLevelDebugging.html Mon Dec 15 20:54:22 2008
@@ -208,9 +208,9 @@
 and call functions where were optimized out of the program, or inlined away
 completely.</p>
 
-<p> <a href=http://llvm.org/docs/TestingGuide.html#quicktestsuite> 
-LLVM test suite </a> provides a framework to test optimizer's handling of
-debugging information. It can be run like this:</p>
+<p><a href="TestingGuide.html#quicktestsuite">LLVM test suite</a> provides a
+framework to test optimizer's handling of debugging information. It can be run
+like this:</p>
 
 <div class="doc_code">
 <pre>
@@ -222,8 +222,8 @@
 <p>
 This will test impact of debugging information on optimization passes. If
 debugging information influences optimization passes then it will be reported
-as a failure. See <a href=//llvm.org/docs/TestingGuide.html> TestingGuide</a>
-for more information on LLVM test infratsture and how to run various tests.
+as a failure. See <a href="TestingGuide.html">TestingGuide</a>
+for more information on LLVM test infrastructure and how to run various tests.
 </p>
 
 </div>
@@ -503,7 +503,7 @@
 type</a>.</p>
 
 <p>The type encoding provides the details of the type.  The values are typically
-one of the following;</p>
+one of the following:</p>
 
 <pre>
   DW_ATE_address = 1
@@ -540,7 +540,7 @@
 
 <p>These descriptors are used to define types derived from other types.  The
 value of the tag varies depending on the meaning.  The following are possible
-tag values;</p>
+tag values:</p>
 
 <pre>
   DW_TAG_formal_parameter = 5
@@ -604,7 +604,7 @@
 
 <p>These descriptors are used to define types that are composed of 0 or more
 elements.  The value of the tag varies depending on the meaning.  The following
-are possible tag values;</p>
+are possible tag values:</p>
 
 <pre>
   DW_TAG_array_type = 1
@@ -721,7 +721,7 @@
 </pre>
 
 <p>These descriptors are used to define variables local to a sub program.  The
-value of the tag depends on the usage of the variable;</p>
+value of the tag depends on the usage of the variable:</p>
 
 <pre>
   DW_TAG_auto_variable = 256
@@ -1054,7 +1054,7 @@
 <div class="doc_text">
 
 <p>Given the source files "MySource.cpp" and "MyHeader.h" located in the
-directory "/Users/mine/sources", the following code;</p>
+directory "/Users/mine/sources", the following code:</p>
 
 <pre>
 #include "MyHeader.h"
@@ -1064,7 +1064,7 @@
 }
 </pre>
 
-<p>a C/C++ front-end would generate the following descriptors;</p>
+<p>a C/C++ front-end would generate the following descriptors:</p>
 
 <pre>
 ...
@@ -1125,13 +1125,13 @@
 
 <div class="doc_text">
 
-<p>Given an integer global variable declared as follows;</p>
+<p>Given an integer global variable declared as follows:</p>
 
 <pre>
 int MyGlobal = 100;
 </pre>
 
-<p>a C/C++ front-end would generate the following descriptors;</p>
+<p>a C/C++ front-end would generate the following descriptors:</p>
 
 <pre>
 ;;
@@ -1205,7 +1205,7 @@
 
 <div class="doc_text">
 
-<p>Given a function declared as follows;</p>
+<p>Given a function declared as follows:</p>
 
 <pre>
 int main(int argc, char *argv[]) {
@@ -1213,7 +1213,7 @@
 }
 </pre>
 
-<p>a C/C++ front-end would generate the following descriptors;</p>
+<p>a C/C++ front-end would generate the following descriptors:</p>
 
 <pre>
 ;;
@@ -1270,7 +1270,7 @@
 
 <div class="doc_text">
 
-<p>The following are the basic type descriptors for C/C++ core types;</p>
+<p>The following are the basic type descriptors for C/C++ core types:</p>
 
 </div>
 
@@ -1534,13 +1534,13 @@
 
 <div class="doc_text">
 
-<p>Given the following as an example of C/C++ derived type;</p>
+<p>Given the following as an example of C/C++ derived type:</p>
 
 <pre>
 typedef const int *IntPtr;
 </pre>
 
-<p>a C/C++ front-end would generate the following descriptors;</p>
+<p>a C/C++ front-end would generate the following descriptors:</p>
 
 <pre>
 ;;
@@ -1611,7 +1611,7 @@
 
 <div class="doc_text">
 
-<p>Given the following as an example of C/C++ struct type;</p>
+<p>Given the following as an example of C/C++ struct type:</p>
 
 <pre>
 struct Color {
@@ -1621,7 +1621,7 @@
 };
 </pre>
 
-<p>a C/C++ front-end would generate the following descriptors;</p>
+<p>a C/C++ front-end would generate the following descriptors:</p>
 
 <pre>
 ;;
@@ -1718,7 +1718,7 @@
 
 <div class="doc_text">
 
-<p>Given the following as an example of C/C++ enumeration type;</p>
+<p>Given the following as an example of C/C++ enumeration type:</p>
 
 <pre>
 enum Trees {
@@ -1728,7 +1728,7 @@
 };
 </pre>
 
-<p>a C/C++ front-end would generate the following descriptors;</p>
+<p>a C/C++ front-end would generate the following descriptors:</p>
 
 <pre>
 ;;




From brukman+llvm at gmail.com  Mon Dec 15 21:07:49 2008
From: brukman+llvm at gmail.com (Misha Brukman)
Date: Tue, 16 Dec 2008 03:07:49 -0000
Subject: [llvm-commits] [llvm] r61072 - in /llvm/trunk/docs:
	LinkTimeOptimization.html llvm.css
Message-ID: <200812160307.mBG37ook012338@zion.cs.uiuc.edu>

Author: brukman
Date: Mon Dec 15 21:07:49 2008
New Revision: 61072

URL: http://llvm.org/viewvc/llvm-project?rev=61072&view=rev
Log:
* Comply with HTML 4.01 Strict
* Added code-region markings to code sections to make them stand out
* Added pre.doc_code class to llvm.css to simplify marking code regions

Modified:
    llvm/trunk/docs/LinkTimeOptimization.html
    llvm/trunk/docs/llvm.css

Modified: llvm/trunk/docs/LinkTimeOptimization.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LinkTimeOptimization.html?rev=61072&r1=61071&r2=61072&view=diff

==============================================================================
--- llvm/trunk/docs/LinkTimeOptimization.html (original)
+++ llvm/trunk/docs/LinkTimeOptimization.html Mon Dec 15 21:07:49 2008
@@ -85,7 +85,7 @@
     <li> Input source file <tt>a.c</tt> is compiled into LLVM bitcode form.
     <li> Input source file <tt>main.c</tt> is compiled into native object code.
   </ul>
-<div class="doc_code"><pre>
+<pre class="doc_code">
 --- a.h ---
 extern int foo1(void);
 extern void foo2(void);
@@ -129,7 +129,7 @@
 $ llvm-gcc --emit-llvm -c a.c -o a.o  # &lt;-- a.o is LLVM bitcode file
 $ llvm-gcc -c main.c -o main.o # &lt;-- main.o is native object file
 $ llvm-gcc a.o main.o -o main # &lt;-- standard link command without any modifications
-</pre></div>
+</pre>
   <p>In this example, the linker recognizes that <tt>foo2()</tt> is an 
   externally visible symbol defined in LLVM bitcode file. The linker completes 
   its usual symbol resolution 
@@ -286,26 +286,42 @@
 </div>
 
 <div class="doc_text">
-   <p>A non-native object file is handled via an <tt>lto_module_t</tt>.  
-   The following functions allow the linker to check if a file (on disk
-   or in a memory buffer) is a file which libLTO can process: <pre>
-   lto_module_is_object_file(const char*)
-   lto_module_is_object_file_for_target(const char*, const char*)
-   lto_module_is_object_file_in_memory(const void*, size_t)
-   lto_module_is_object_file_in_memory_for_target(const void*, size_t, const char*)</pre>
-  If the object file can be processed by libLTO, the linker creates a
-  <tt>lto_module_t</tt> by using one of <pre>
-   lto_module_create(const char*)
-   lto_module_create_from_memory(const void*, size_t)</pre>
-  and when done, the handle is released via<pre>
-   lto_module_dispose(lto_module_t)</pre>
-  The linker can introspect the non-native object file by getting the number
-  of symbols and getting the name and attributes of each symbol via: <pre>
-   lto_module_get_num_symbols(lto_module_t)
-   lto_module_get_symbol_name(lto_module_t, unsigned int)
-   lto_module_get_symbol_attribute(lto_module_t, unsigned int)</pre>
-  The attributes of a symbol include the alignment, visibility, and kind.
-</p>
+
+<p>A non-native object file is handled via an <tt>lto_module_t</tt>.  
+The following functions allow the linker to check if a file (on disk
+or in a memory buffer) is a file which libLTO can process:</p>
+
+<pre class="doc_code">
+lto_module_is_object_file(const char*)
+lto_module_is_object_file_for_target(const char*, const char*)
+lto_module_is_object_file_in_memory(const void*, size_t)
+lto_module_is_object_file_in_memory_for_target(const void*, size_t, const char*)
+</pre>
+
+<p>If the object file can be processed by libLTO, the linker creates a
+<tt>lto_module_t</tt> by using one of</p>
+
+<pre class="doc_code">
+lto_module_create(const char*)
+lto_module_create_from_memory(const void*, size_t)
+</pre>
+
+<p>and when done, the handle is released via</p>
+
+<pre class="doc_code">
+lto_module_dispose(lto_module_t)
+</pre>
+
+<p>The linker can introspect the non-native object file by getting the number of
+symbols and getting the name and attributes of each symbol via:</p>
+
+<pre class="doc_code">
+lto_module_get_num_symbols(lto_module_t)
+lto_module_get_symbol_name(lto_module_t, unsigned int)
+lto_module_get_symbol_attribute(lto_module_t, unsigned int)
+</pre>
+
+<p>The attributes of a symbol include the alignment, visibility, and kind.</p>
 </div>
 
 <!-- ======================================================================= -->
@@ -314,27 +330,45 @@
 </div>
 
 <div class="doc_text">
-  <p>Once the linker has loaded each non-native object files into an
-  <tt>lto_module_t</tt>, it can request libLTO to process them all and
-  generate a native object file.  This is done in a couple of steps.
-  First a code generator is created with:<pre>
-    lto_codegen_create() </pre>
-  then each non-native object file is added to the code generator with:<pre>
-    lto_codegen_add_module(lto_code_gen_t, lto_module_t)</pre>
-  The linker then has the option of setting some codegen options.  Whether
-  or not to generate DWARF debug info is set with: <pre>
-    lto_codegen_set_debug_model(lto_code_gen_t) </pre>
-  Which kind of position independence is set with: <pre>
-    lto_codegen_set_pic_model(lto_code_gen_t) </pre>
-  And each symbol that is referenced by a native object file or otherwise
-  must not be optimized away is set with: <pre>
-    lto_codegen_add_must_preserve_symbol(lto_code_gen_t, const char*)</pre>
-  After all these settings are done, the linker requests that a native 
-  object file be created from the modules with the settings using:
-    lto_codegen_compile(lto_code_gen_t, size*)</pre>
-  which returns a pointer to a buffer containing the generated native
-  object file.  The linker then parses that and links it with the rest 
-  of the native object files.  
+
+<p>Once the linker has loaded each non-native object files into an
+<tt>lto_module_t</tt>, it can request libLTO to process them all and
+generate a native object file.  This is done in a couple of steps.
+First, a code generator is created with:</p>
+
+<pre class="doc_code">lto_codegen_create()</pre>
+
+<p>Then, each non-native object file is added to the code generator with:</p>
+
+<pre class="doc_code">
+lto_codegen_add_module(lto_code_gen_t, lto_module_t)
+</pre>
+
+<p>The linker then has the option of setting some codegen options.  Whether or
+not to generate DWARF debug info is set with:</p>
+  
+<pre class="doc_code">lto_codegen_set_debug_model(lto_code_gen_t)</pre>
+
+<p>Which kind of position independence is set with:</p>
+
+<pre class="doc_code">lto_codegen_set_pic_model(lto_code_gen_t) </pre>
+  
+<p>And each symbol that is referenced by a native object file or otherwise must
+not be optimized away is set with:</p>
+
+<pre class="doc_code">
+lto_codegen_add_must_preserve_symbol(lto_code_gen_t, const char*)
+</pre>
+
+<p>After all these settings are done, the linker requests that a native object
+file be created from the modules with the settings using:</p>
+
+<pre class="doc_code">lto_codegen_compile(lto_code_gen_t, size*)</pre>
+
+<p>which returns a pointer to a buffer containing the generated native
+object file.  The linker then parses that and links it with the rest 
+of the native object files.</p>
+
 </div>
 
 <!-- *********************************************************************** -->

Modified: llvm/trunk/docs/llvm.css
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/llvm.css?rev=61072&r1=61071&r2=61072&view=diff

==============================================================================
--- llvm/trunk/docs/llvm.css (original)
+++ llvm/trunk/docs/llvm.css Mon Dec 15 21:07:49 2008
@@ -62,6 +62,7 @@
 
 .doc_warning    { color: red; font-weight: bold }
 
+/* <div class="doc_code"> would use this class, and <div> adds more padding */
 .doc_code, .literal-block
                 { border: solid 1px gray; background: #eeeeee;
                   margin: 0 1em 0 1em;
@@ -69,6 +70,14 @@
                   display: table;
                 }
 
+/* It is preferrable to use <pre class="doc_code"> everywhere instead of the
+ * <div class="doc_code"><pre>...</ptr></div> construct.
+ * 
+ * Once all docs use <pre> for code regions, this style can  be merged with the
+ * one above, and we can drop the [pre] qualifier.
+ */
+pre.doc_code, .literal-block { padding: 1em 2em 1em 1em }
+
 .doc_notes      { background: #fafafa; border: 1px solid #cecece;
                   padding: 0.1em }
 
@@ -88,5 +97,4 @@
 .title { margin-top: 0 }
 #contents { display: none }
 div.contents ul { list-style-type: decimal }
-.literal-block { padding: 1em 2em 1em 1em }
 .toc-backref    { color: black; text-decoration: none; }




From gohman at apple.com  Mon Dec 15 21:25:46 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 03:25:46 -0000
Subject: [llvm-commits] [llvm] r61073 - in /llvm/trunk:
 include/llvm/CodeGen/LatencyPriorityQueue.h
 include/llvm/CodeGen/ScheduleDAG.h include/llvm/CodeGen/ScheduleDAGInstrs.h
 lib/CodeGen/LatencyPriorityQueue.cpp lib/CodeGen/PostRASchedulerList.cpp
 lib/CodeGen/ScheduleDAG.cpp lib/CodeGen/ScheduleDAGInstrs.cpp
 lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
 lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp
 lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
 lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
 test/CodeGen/X86/fold-pcmpeqd-0.ll
Message-ID: <200812160325.mBG3Plnm013003@zion.cs.uiuc.edu>

Author: djg
Date: Mon Dec 15 21:25:46 2008
New Revision: 61073

URL: http://llvm.org/viewvc/llvm-project?rev=61073&view=rev
Log:
Fix some register-alias-related bugs in the post-RA scheduler liveness
computation code. Also, avoid adding output-depenency edges when both
defs are dead, which frequently happens with EFLAGS defs.

Compute Depth and Height lazily, and always in terms of edge latency
values. For the schedulers that don't care about latency, edge latencies
are set to 1.

Eliminate Cycle and CycleBound, and LatencyPriorityQueue's Latencies array.
These are all subsumed by the Depth and Height fields.

Modified:
    llvm/trunk/include/llvm/CodeGen/LatencyPriorityQueue.h
    llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
    llvm/trunk/include/llvm/CodeGen/ScheduleDAGInstrs.h
    llvm/trunk/lib/CodeGen/LatencyPriorityQueue.cpp
    llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp
    llvm/trunk/lib/CodeGen/ScheduleDAG.cpp
    llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
    llvm/trunk/test/CodeGen/X86/fold-pcmpeqd-0.ll

Modified: llvm/trunk/include/llvm/CodeGen/LatencyPriorityQueue.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LatencyPriorityQueue.h?rev=61073&r1=61072&r2=61073&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/LatencyPriorityQueue.h (original)
+++ llvm/trunk/include/llvm/CodeGen/LatencyPriorityQueue.h Mon Dec 15 21:25:46 2008
@@ -34,10 +34,6 @@
     // SUnits - The SUnits for the current graph.
     std::vector<SUnit> *SUnits;
     
-    // Latencies - The latency (max of latency from this node to the bb exit)
-    // for each node.
-    std::vector<int> Latencies;
-
     /// NumNodesSolelyBlocking - This vector contains, for every node in the
     /// Queue, the number of nodes that the node is the sole unscheduled
     /// predecessor for.  This is used as a tie-breaker heuristic for better
@@ -51,29 +47,23 @@
     
     void initNodes(std::vector<SUnit> &sunits) {
       SUnits = &sunits;
-      // Calculate node priorities.
-      CalculatePriorities();
+      NumNodesSolelyBlocking.resize(SUnits->size(), 0);
     }
 
     void addNode(const SUnit *SU) {
-      Latencies.resize(SUnits->size(), -1);
       NumNodesSolelyBlocking.resize(SUnits->size(), 0);
-      CalcLatency(*SU);
     }
 
     void updateNode(const SUnit *SU) {
-      Latencies[SU->NodeNum] = -1;
-      CalcLatency(*SU);
     }
 
     void releaseState() {
       SUnits = 0;
-      Latencies.clear();
     }
     
     unsigned getLatency(unsigned NodeNum) const {
-      assert(NodeNum < Latencies.size());
-      return Latencies[NodeNum];
+      assert(NodeNum < (*SUnits).size());
+      return (*SUnits)[NodeNum].getHeight();
     }
     
     unsigned getNumSolelyBlockNodes(unsigned NodeNum) const {
@@ -114,8 +104,6 @@
     void ScheduledNode(SUnit *Node);
 
 private:
-    void CalculatePriorities();
-    void CalcLatency(const SUnit &SU);
     void AdjustPriorityOfUnscheduledPreds(SUnit *SU);
     SUnit *getSingleUnscheduledPred(SUnit *SU);
   };

Modified: llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h?rev=61073&r1=61072&r2=61073&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h (original)
+++ llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h Mon Dec 15 21:25:46 2008
@@ -242,10 +242,12 @@
     bool isPending        : 1;          // True once pending.
     bool isAvailable      : 1;          // True once available.
     bool isScheduled      : 1;          // True once scheduled.
-    unsigned CycleBound;                // Upper/lower cycle to be scheduled at.
-    unsigned Cycle;                     // Once scheduled, the cycle of the op.
-    unsigned Depth;                     // Node depth;
-    unsigned Height;                    // Node height;
+  private:
+    bool isDepthCurrent   : 1;          // True if Depth is current.
+    bool isHeightCurrent  : 1;          // True if Height is current.
+    unsigned Depth;                     // Node depth.
+    unsigned Height;                    // Node height.
+  public:
     const TargetRegisterClass *CopyDstRC; // Is a special copy node if not null.
     const TargetRegisterClass *CopySrcRC;
     
@@ -256,7 +258,8 @@
         Latency(0), NumPreds(0), NumSuccs(0), NumPredsLeft(0), NumSuccsLeft(0),
         isTwoAddress(false), isCommutable(false), hasPhysRegDefs(false),
         isPending(false), isAvailable(false), isScheduled(false),
-        CycleBound(0), Cycle(~0u), Depth(0), Height(0),
+        isDepthCurrent(false), isHeightCurrent(false),
+        Depth(0), Height(0),
         CopyDstRC(NULL), CopySrcRC(NULL) {}
 
     /// SUnit - Construct an SUnit for post-regalloc scheduling to represent
@@ -266,7 +269,8 @@
         Latency(0), NumPreds(0), NumSuccs(0), NumPredsLeft(0), NumSuccsLeft(0),
         isTwoAddress(false), isCommutable(false), hasPhysRegDefs(false),
         isPending(false), isAvailable(false), isScheduled(false),
-        CycleBound(0), Cycle(~0u), Depth(0), Height(0),
+        isDepthCurrent(false), isHeightCurrent(false),
+        Depth(0), Height(0),
         CopyDstRC(NULL), CopySrcRC(NULL) {}
 
     /// setNode - Assign the representative SDNode for this SUnit.
@@ -307,6 +311,41 @@
     /// the specified node.
     void removePred(const SDep &D);
 
+    /// getHeight - Return the height of this node, which is the length of the
+    /// maximum path down to any node with has no successors.
+    unsigned getDepth() const {
+      if (!isDepthCurrent) const_cast<SUnit *>(this)->ComputeDepth();
+      return Depth;
+    }
+
+    /// getHeight - Return the height of this node, which is the length of the
+    /// maximum path up to any node with has no predecessors.
+    unsigned getHeight() const {
+      if (!isHeightCurrent) const_cast<SUnit *>(this)->ComputeHeight();
+      return Height;
+    }
+
+    /// setDepthToAtLeast - If NewDepth is greater than this node's depth
+    /// value, set it to be the new depth value. This also recursively
+    /// marks successor nodes dirty.
+    void setDepthToAtLeast(unsigned NewDepth);
+
+    /// setDepthToAtLeast - If NewDepth is greater than this node's depth
+    /// value, set it to be the new height value. This also recursively
+    /// marks predecessor nodes dirty.
+    void setHeightToAtLeast(unsigned NewHeight);
+
+    /// setDepthDirty - Set a flag in this node to indicate that its
+    /// stored Depth value will require recomputation the next time
+    /// getDepth() is called.
+    void setDepthDirty();
+
+    /// setHeightDirty - Set a flag in this node to indicate that its
+    /// stored Height value will require recomputation the next time
+    /// getHeight() is called.
+    void setHeightDirty();
+
+    /// isPred - Test if node N is a predecessor of this node.
     bool isPred(SUnit *N) {
       for (unsigned i = 0, e = (unsigned)Preds.size(); i != e; ++i)
         if (Preds[i].getSUnit() == N)
@@ -314,6 +353,7 @@
       return false;
     }
     
+    /// isSucc - Test if node N is a successor of this node.
     bool isSucc(SUnit *N) {
       for (unsigned i = 0, e = (unsigned)Succs.size(); i != e; ++i)
         if (Succs[i].getSUnit() == N)
@@ -324,6 +364,10 @@
     void dump(const ScheduleDAG *G) const;
     void dumpAll(const ScheduleDAG *G) const;
     void print(raw_ostream &O, const ScheduleDAG *G) const;
+
+  private:
+    void ComputeDepth();
+    void ComputeHeight();
   };
 
   //===--------------------------------------------------------------------===//
@@ -397,12 +441,7 @@
 
     /// ComputeLatency - Compute node latency.
     ///
-    virtual void ComputeLatency(SUnit *SU) { SU->Latency = 1; }
-
-    /// CalculateDepths, CalculateHeights - Calculate node depth / height.
-    ///
-    void CalculateDepths();
-    void CalculateHeights();
+    virtual void ComputeLatency(SUnit *SU) = 0;
 
   protected:
     /// EmitNoop - Emit a noop instruction.
@@ -440,6 +479,11 @@
 
     void EmitCrossRCCopy(SUnit *SU, DenseMap<SUnit*, unsigned> &VRBaseMap);
 
+    /// ForceUnitLatencies - Return true if all scheduling edges should be given a
+    /// latency value of one.  The default is to return false; schedulers may
+    /// override this as needed.
+    virtual bool ForceUnitLatencies() const { return false; }
+
   private:
     /// EmitLiveInCopy - Emit a copy for a live in physical register. If the
     /// physical register has only a single copy use, then coalesced the copy

Modified: llvm/trunk/include/llvm/CodeGen/ScheduleDAGInstrs.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ScheduleDAGInstrs.h?rev=61073&r1=61072&r2=61073&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/ScheduleDAGInstrs.h (original)
+++ llvm/trunk/include/llvm/CodeGen/ScheduleDAGInstrs.h Mon Dec 15 21:25:46 2008
@@ -18,10 +18,18 @@
 #include "llvm/CodeGen/ScheduleDAG.h"
 
 namespace llvm {
+  class MachineLoopInfo;
+  class MachineDominatorTree;
+
   class ScheduleDAGInstrs : public ScheduleDAG {
+    const MachineLoopInfo &MLI;
+    const MachineDominatorTree &MDT;
+
   public:
     ScheduleDAGInstrs(MachineBasicBlock *bb,
-                      const TargetMachine &tm);
+                      const TargetMachine &tm,
+                      const MachineLoopInfo &mli,
+                      const MachineDominatorTree &mdt);
 
     virtual ~ScheduleDAGInstrs() {}
 

Modified: llvm/trunk/lib/CodeGen/LatencyPriorityQueue.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LatencyPriorityQueue.cpp?rev=61073&r1=61072&r2=61073&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LatencyPriorityQueue.cpp (original)
+++ llvm/trunk/lib/CodeGen/LatencyPriorityQueue.cpp Mon Dec 15 21:25:46 2008
@@ -41,47 +41,6 @@
 }
 
 
-/// CalcNodePriority - Calculate the maximal path from the node to the exit.
-///
-void LatencyPriorityQueue::CalcLatency(const SUnit &SU) {
-  int &Latency = Latencies[SU.NodeNum];
-  if (Latency != -1)
-    return;
-
-  std::vector<const SUnit*> WorkList;
-  WorkList.push_back(&SU);
-  while (!WorkList.empty()) {
-    const SUnit *Cur = WorkList.back();
-    bool AllDone = true;
-    unsigned MaxSuccLatency = 0;
-    for (SUnit::const_succ_iterator I = Cur->Succs.begin(),E = Cur->Succs.end();
-         I != E; ++I) {
-      int SuccLatency = Latencies[I->getSUnit()->NodeNum];
-      if (SuccLatency == -1) {
-        AllDone = false;
-        WorkList.push_back(I->getSUnit());
-      } else {
-        unsigned NewLatency = SuccLatency + I->getLatency();
-        MaxSuccLatency = std::max(MaxSuccLatency, NewLatency);
-      }
-    }
-    if (AllDone) {
-      Latencies[Cur->NodeNum] = MaxSuccLatency;
-      WorkList.pop_back();
-    }
-  }
-}
-
-/// CalculatePriorities - Calculate priorities of all scheduling units.
-void LatencyPriorityQueue::CalculatePriorities() {
-  Latencies.assign(SUnits->size(), -1);
-  NumNodesSolelyBlocking.assign(SUnits->size(), 0);
-
-  // For each node, calculate the maximal path from the node to the exit.
-  for (unsigned i = 0, e = SUnits->size(); i != e; ++i)
-    CalcLatency((*SUnits)[i]);
-}
-
 /// getSingleUnscheduledPred - If there is exactly one unscheduled predecessor
 /// of SU, return it, otherwise return null.
 SUnit *LatencyPriorityQueue::getSingleUnscheduledPred(SUnit *SU) {

Modified: llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp?rev=61073&r1=61072&r2=61073&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp (original)
+++ llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp Mon Dec 15 21:25:46 2008
@@ -23,7 +23,9 @@
 #include "llvm/CodeGen/ScheduleDAGInstrs.h"
 #include "llvm/CodeGen/LatencyPriorityQueue.h"
 #include "llvm/CodeGen/SchedulerRegistry.h"
+#include "llvm/CodeGen/MachineDominators.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
+#include "llvm/CodeGen/MachineLoopInfo.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetRegisterInfo.h"
@@ -49,6 +51,14 @@
     static char ID;
     PostRAScheduler() : MachineFunctionPass(&ID) {}
 
+    void getAnalysisUsage(AnalysisUsage &AU) const {
+      AU.addRequired<MachineDominatorTree>();
+      AU.addPreserved<MachineDominatorTree>();
+      AU.addRequired<MachineLoopInfo>();
+      AU.addPreserved<MachineLoopInfo>();
+      MachineFunctionPass::getAnalysisUsage(AU);
+    }
+
     const char *getPassName() const {
       return "Post RA top-down list latency scheduler";
     }
@@ -72,8 +82,10 @@
     ScheduleDAGTopologicalSort Topo;
 
   public:
-    SchedulePostRATDList(MachineBasicBlock *mbb, const TargetMachine &tm)
-      : ScheduleDAGInstrs(mbb, tm), Topo(SUnits) {}
+    SchedulePostRATDList(MachineBasicBlock *mbb, const TargetMachine &tm,
+                         const MachineLoopInfo &MLI,
+                         const MachineDominatorTree &MDT)
+      : ScheduleDAGInstrs(mbb, tm, MLI, MDT), Topo(SUnits) {}
 
     void Schedule();
 
@@ -88,11 +100,14 @@
 bool PostRAScheduler::runOnMachineFunction(MachineFunction &Fn) {
   DOUT << "PostRAScheduler\n";
 
+  const MachineLoopInfo &MLI = getAnalysis<MachineLoopInfo>();
+  const MachineDominatorTree &MDT = getAnalysis<MachineDominatorTree>();
+
   // Loop over all of the basic blocks
   for (MachineFunction::iterator MBB = Fn.begin(), MBBe = Fn.end();
        MBB != MBBe; ++MBB) {
 
-    SchedulePostRATDList Scheduler(MBB, Fn.getTarget());
+    SchedulePostRATDList Scheduler(MBB, Fn.getTarget(), MLI, MDT);
 
     Scheduler.Run();
 
@@ -142,6 +157,28 @@
   return TRI->getRegClass(II.OpInfo[Op].RegClass);
 }
 
+/// CriticalPathStep - Return the next SUnit after SU on the bottom-up
+/// critical path.
+static SDep *CriticalPathStep(SUnit *SU) {
+  SDep *Next = 0;
+  unsigned NextDepth = 0;
+  // Find the predecessor edge with the greatest depth.
+  for (SUnit::pred_iterator P = SU->Preds.begin(), PE = SU->Preds.end();
+       P != PE; ++P) {
+    SUnit *PredSU = P->getSUnit();
+    unsigned PredLatency = P->getLatency();
+    unsigned PredTotalLatency = PredSU->getDepth() + PredLatency;
+    // In the case of a latency tie, prefer an anti-dependency edge over
+    // other types of edges.
+    if (NextDepth < PredTotalLatency ||
+        (NextDepth == PredTotalLatency && P->getKind() == SDep::Anti)) {
+      NextDepth = PredTotalLatency;
+      Next = &*P;
+    }
+  }
+  return Next;
+}
+
 /// BreakAntiDependencies - Identifiy anti-dependencies along the critical path
 /// of the ScheduleDAG and break them by renaming registers.
 ///
@@ -150,34 +187,16 @@
   // so just duck out immediately if the block is empty.
   if (BB->empty()) return false;
 
-  Topo.InitDAGTopologicalSorting();
-
-  // Compute a critical path for the DAG.
+  // Find the node at the bottom of the critical path.
   SUnit *Max = 0;
-  std::vector<SDep *> CriticalPath(SUnits.size());
-  for (ScheduleDAGTopologicalSort::const_iterator I = Topo.begin(),
-       E = Topo.end(); I != E; ++I) {
-    SUnit *SU = &SUnits[*I];
-    for (SUnit::pred_iterator P = SU->Preds.begin(), PE = SU->Preds.end();
-         P != PE; ++P) {
-      SUnit *PredSU = P->getSUnit();
-      // This assumes that there's no delay for reusing registers.
-      unsigned PredLatency = P->getLatency();
-      unsigned PredTotalLatency = PredSU->CycleBound + PredLatency;
-      if (SU->CycleBound < PredTotalLatency ||
-          (SU->CycleBound == PredTotalLatency &&
-           P->getKind() == SDep::Anti)) {
-        SU->CycleBound = PredTotalLatency;
-        CriticalPath[*I] = &*P;
-      }
-    }
-    // Keep track of the node at the end of the critical path.
-    if (!Max || SU->CycleBound + SU->Latency > Max->CycleBound + Max->Latency)
+  for (unsigned i = 0, e = SUnits.size(); i != e; ++i) {
+    SUnit *SU = &SUnits[i];
+    if (!Max || SU->getDepth() + SU->Latency > Max->getDepth() + Max->Latency)
       Max = SU;
   }
 
   DOUT << "Critical path has total latency "
-       << (Max ? Max->CycleBound + Max->Latency : 0) << "\n";
+       << (Max ? Max->getDepth() + Max->Latency : 0) << "\n";
 
   // Walk the critical path from the bottom up. Collect all anti-dependence
   // edges on the critical path. Skip anti-dependencies between SUnits that
@@ -195,9 +214,9 @@
   // the anti-dependencies in an instruction in order to be effective.
   BitVector AllocatableSet = TRI->getAllocatableSet(*MF);
   DenseMap<MachineInstr *, unsigned> CriticalAntiDeps;
-  for (SUnit *SU = Max; CriticalPath[SU->NodeNum];
-       SU = CriticalPath[SU->NodeNum]->getSUnit()) {
-    SDep *Edge = CriticalPath[SU->NodeNum];
+  SUnit *SU = Max;
+  for (SDep *Edge = CriticalPathStep(SU); Edge;
+       Edge = CriticalPathStep(SU = Edge->getSUnit())) {
     SUnit *NextSU = Edge->getSUnit();
     // Only consider anti-dependence edges.
     if (Edge->getKind() != SDep::Anti)
@@ -494,6 +513,11 @@
         Classes[SubregReg] = 0;
         RegRefs.erase(SubregReg);
       }
+      for (const unsigned *Super = TRI->getSuperRegisters(Reg);
+           *Super; ++Super) {
+        unsigned SuperReg = *Super;
+        Classes[SuperReg] = reinterpret_cast<TargetRegisterClass *>(-1);
+      }
     }
     for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
       MachineOperand &MO = MI->getOperand(i);
@@ -556,8 +580,7 @@
   // Compute how many cycles it will be before this actually becomes
   // available.  This is the max of the start time of all predecessors plus
   // their latencies.
-  unsigned PredDoneCycle = SU->Cycle + SuccEdge->getLatency();
-  SuccSU->CycleBound = std::max(SuccSU->CycleBound, PredDoneCycle);
+  SuccSU->setDepthToAtLeast(SU->getDepth() + SuccEdge->getLatency());
   
   if (SuccSU->NumPredsLeft == 0) {
     PendingQueue.push_back(SuccSU);
@@ -572,7 +595,8 @@
   DEBUG(SU->dump(this));
   
   Sequence.push_back(SU);
-  SU->Cycle = CurCycle;
+  assert(CurCycle >= SU->getDepth() && "Node scheduled above its depth!");
+  SU->setDepthToAtLeast(CurCycle);
 
   // Top down: release successors.
   for (SUnit::succ_iterator I = SU->Succs.begin(), E = SU->Succs.end();
@@ -603,21 +627,21 @@
   while (!AvailableQueue.empty() || !PendingQueue.empty()) {
     // Check to see if any of the pending instructions are ready to issue.  If
     // so, add them to the available queue.
+    unsigned MinDepth = ~0u;
     for (unsigned i = 0, e = PendingQueue.size(); i != e; ++i) {
-      if (PendingQueue[i]->CycleBound == CurCycle) {
+      if (PendingQueue[i]->getDepth() <= CurCycle) {
         AvailableQueue.push(PendingQueue[i]);
         PendingQueue[i]->isAvailable = true;
         PendingQueue[i] = PendingQueue.back();
         PendingQueue.pop_back();
         --i; --e;
-      } else {
-        assert(PendingQueue[i]->CycleBound > CurCycle && "Non-positive latency?");
-      }
+      } else if (PendingQueue[i]->getDepth() < MinDepth)
+        MinDepth = PendingQueue[i]->getDepth();
     }
     
     // If there are no instructions available, don't try to issue anything.
     if (AvailableQueue.empty()) {
-      ++CurCycle;
+      CurCycle = MinDepth != ~0u ? MinDepth : CurCycle + 1;
       continue;
     }
 

Modified: llvm/trunk/lib/CodeGen/ScheduleDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/ScheduleDAG.cpp?rev=61073&r1=61072&r2=61073&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/ScheduleDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/ScheduleDAG.cpp Mon Dec 15 21:25:46 2008
@@ -33,115 +33,6 @@
 
 ScheduleDAG::~ScheduleDAG() {}
 
-/// CalculateDepths - compute depths using algorithms for the longest
-/// paths in the DAG
-void ScheduleDAG::CalculateDepths() {
-  unsigned DAGSize = SUnits.size();
-  std::vector<SUnit*> WorkList;
-  WorkList.reserve(DAGSize);
-
-  // Initialize the data structures
-  for (unsigned i = 0, e = DAGSize; i != e; ++i) {
-    SUnit *SU = &SUnits[i];
-    unsigned Degree = SU->Preds.size();
-    // Temporarily use the Depth field as scratch space for the degree count.
-    SU->Depth = Degree;
-
-    // Is it a node without dependencies?
-    if (Degree == 0) {
-      assert(SU->Preds.empty() && "SUnit should have no predecessors");
-      // Collect leaf nodes
-      WorkList.push_back(SU);
-    }
-  }
-
-  // Process nodes in the topological order
-  while (!WorkList.empty()) {
-    SUnit *SU = WorkList.back();
-    WorkList.pop_back();
-    unsigned SUDepth = 0;
-
-    // Use dynamic programming:
-    // When current node is being processed, all of its dependencies
-    // are already processed.
-    // So, just iterate over all predecessors and take the longest path
-    for (SUnit::const_pred_iterator I = SU->Preds.begin(), E = SU->Preds.end();
-         I != E; ++I) {
-      unsigned PredDepth = I->getSUnit()->Depth;
-      if (PredDepth+1 > SUDepth) {
-        SUDepth = PredDepth + 1;
-      }
-    }
-
-    SU->Depth = SUDepth;
-
-    // Update degrees of all nodes depending on current SUnit
-    for (SUnit::const_succ_iterator I = SU->Succs.begin(), E = SU->Succs.end();
-         I != E; ++I) {
-      SUnit *SU = I->getSUnit();
-      if (!--SU->Depth)
-        // If all dependencies of the node are processed already,
-        // then the longest path for the node can be computed now
-        WorkList.push_back(SU);
-    }
-  }
-}
-
-/// CalculateHeights - compute heights using algorithms for the longest
-/// paths in the DAG
-void ScheduleDAG::CalculateHeights() {
-  unsigned DAGSize = SUnits.size();
-  std::vector<SUnit*> WorkList;
-  WorkList.reserve(DAGSize);
-
-  // Initialize the data structures
-  for (unsigned i = 0, e = DAGSize; i != e; ++i) {
-    SUnit *SU = &SUnits[i];
-    unsigned Degree = SU->Succs.size();
-    // Temporarily use the Height field as scratch space for the degree count.
-    SU->Height = Degree;
-
-    // Is it a node without dependencies?
-    if (Degree == 0) {
-      assert(SU->Succs.empty() && "Something wrong");
-      assert(WorkList.empty() && "Should be empty");
-      // Collect leaf nodes
-      WorkList.push_back(SU);
-    }
-  }
-
-  // Process nodes in the topological order
-  while (!WorkList.empty()) {
-    SUnit *SU = WorkList.back();
-    WorkList.pop_back();
-    unsigned SUHeight = 0;
-
-    // Use dynamic programming:
-    // When current node is being processed, all of its dependencies
-    // are already processed.
-    // So, just iterate over all successors and take the longest path
-    for (SUnit::const_succ_iterator I = SU->Succs.begin(), E = SU->Succs.end();
-         I != E; ++I) {
-      unsigned SuccHeight = I->getSUnit()->Height;
-      if (SuccHeight+1 > SUHeight) {
-        SUHeight = SuccHeight + 1;
-      }
-    }
-
-    SU->Height = SUHeight;
-
-    // Update degrees of all nodes depending on current SUnit
-    for (SUnit::const_pred_iterator I = SU->Preds.begin(), E = SU->Preds.end();
-         I != E; ++I) {
-      SUnit *SU = I->getSUnit();
-      if (!--SU->Height)
-        // If all dependencies of the node are processed already,
-        // then the longest path for the node can be computed now
-        WorkList.push_back(SU);
-    }
-  }
-}
-
 /// dump - dump the schedule.
 void ScheduleDAG::dumpSchedule() const {
   for (unsigned i = 0, e = Sequence.size(); i != e; i++) {
@@ -171,13 +62,10 @@
   for (unsigned i = 0, e = (unsigned)Preds.size(); i != e; ++i)
     if (Preds[i] == D)
       return;
-  // Add a pred to this SUnit.
-  Preds.push_back(D);
   // Now add a corresponding succ to N.
   SDep P = D;
   P.setSUnit(this);
   SUnit *N = D.getSUnit();
-  N->Succs.push_back(P);
   // Update the bookkeeping.
   if (D.getKind() == SDep::Data) {
     ++NumPreds;
@@ -187,6 +75,10 @@
     ++NumPredsLeft;
   if (!isScheduled)
     ++N->NumSuccsLeft;
+  N->Succs.push_back(P);
+  Preds.push_back(D);
+  this->setDepthDirty();
+  N->setHeightDirty();
 }
 
 /// removePred - This removes the specified edge as a pred of the current
@@ -220,10 +112,128 @@
         --NumPredsLeft;
       if (!isScheduled)
         --N->NumSuccsLeft;
+      this->setDepthDirty();
+      N->setHeightDirty();
       return;
     }
 }
 
+void SUnit::setDepthDirty() {
+  SmallVector<SUnit*, 8> WorkList;
+  WorkList.push_back(this);
+  while (!WorkList.empty()) {
+    SUnit *SU = WorkList.back();
+    WorkList.pop_back();
+    if (!SU->isDepthCurrent) continue;
+    SU->isDepthCurrent = false;
+    for (SUnit::const_succ_iterator I = Succs.begin(),
+         E = Succs.end(); I != E; ++I)
+      WorkList.push_back(I->getSUnit());
+  }
+}
+
+void SUnit::setHeightDirty() {
+  SmallVector<SUnit*, 8> WorkList;
+  WorkList.push_back(this);
+  while (!WorkList.empty()) {
+    SUnit *SU = WorkList.back();
+    WorkList.pop_back();
+    if (!SU->isHeightCurrent) continue;
+    SU->isHeightCurrent = false;
+    for (SUnit::const_pred_iterator I = Preds.begin(),
+         E = Preds.end(); I != E; ++I)
+      WorkList.push_back(I->getSUnit());
+  }
+}
+
+/// setDepthToAtLeast - Update this node's successors to reflect the
+/// fact that this node's depth just increased.
+///
+void SUnit::setDepthToAtLeast(unsigned NewDepth) {
+  if (NewDepth <= Depth)
+    return;
+  setDepthDirty();
+  Depth = NewDepth;
+  isDepthCurrent = true;
+}
+
+/// setHeightToAtLeast - Update this node's predecessors to reflect the
+/// fact that this node's height just increased.
+///
+void SUnit::setHeightToAtLeast(unsigned NewHeight) {
+  if (NewHeight <= Height)
+    return;
+  setHeightDirty();
+  Height = NewHeight;
+  isHeightCurrent = true;
+}
+
+/// ComputeDepth - Calculate the maximal path from the node to the exit.
+///
+void SUnit::ComputeDepth() {
+  SmallVector<SUnit*, 8> WorkList;
+  WorkList.push_back(this);
+  while (!WorkList.empty()) {
+    SUnit *Cur = WorkList.back();
+
+    bool Done = true;
+    unsigned MaxPredDepth = 0;
+    for (SUnit::const_pred_iterator I = Cur->Preds.begin(),
+         E = Cur->Preds.end(); I != E; ++I) {
+      SUnit *PredSU = I->getSUnit();
+      if (PredSU->isDepthCurrent)
+        MaxPredDepth = std::max(MaxPredDepth,
+                                PredSU->Depth + I->getLatency());
+      else {
+        Done = false;
+        WorkList.push_back(PredSU);
+      }
+    }
+
+    if (Done) {
+      WorkList.pop_back();
+      if (MaxPredDepth != Cur->Depth) {
+        Cur->setDepthDirty();
+        Cur->Depth = MaxPredDepth;
+      }
+      Cur->isDepthCurrent = true;
+    }
+  }
+}
+
+/// ComputeHeight - Calculate the maximal path from the node to the entry.
+///
+void SUnit::ComputeHeight() {
+  SmallVector<SUnit*, 8> WorkList;
+  WorkList.push_back(this);
+  while (!WorkList.empty()) {
+    SUnit *Cur = WorkList.back();
+
+    bool Done = true;
+    unsigned MaxSuccHeight = 0;
+    for (SUnit::const_succ_iterator I = Cur->Succs.begin(),
+         E = Cur->Succs.end(); I != E; ++I) {
+      SUnit *SuccSU = I->getSUnit();
+      if (SuccSU->isHeightCurrent)
+        MaxSuccHeight = std::max(MaxSuccHeight,
+                                 SuccSU->Height + I->getLatency());
+      else {
+        Done = false;
+        WorkList.push_back(SuccSU);
+      }
+    }
+
+    if (Done) {
+      WorkList.pop_back();
+      if (MaxSuccHeight != Cur->Height) {
+        Cur->setHeightDirty();
+        Cur->Height = MaxSuccHeight;
+      }
+      Cur->isHeightCurrent = true;
+    }
+  }
+}
+
 /// SUnit - Scheduling unit. It's an wrapper around either a single SDNode or
 /// a group of nodes flagged together.
 void SUnit::dump(const ScheduleDAG *G) const {
@@ -299,11 +309,14 @@
       cerr << "has not been scheduled!\n";
       AnyNotSched = true;
     }
-    if (SUnits[i].isScheduled && SUnits[i].Cycle > (unsigned)INT_MAX) {
+    if (SUnits[i].isScheduled &&
+        (isBottomUp ? SUnits[i].getHeight() : SUnits[i].getHeight()) >
+          unsigned(INT_MAX)) {
       if (!AnyNotSched)
         cerr << "*** Scheduling failed! ***\n";
       SUnits[i].dump(this);
-      cerr << "has an unexpected Cycle value!\n";
+      cerr << "has an unexpected "
+           << (isBottomUp ? "Height" : "Depth") << " value!\n";
       AnyNotSched = true;
     }
     if (isBottomUp) {

Modified: llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp?rev=61073&r1=61072&r2=61073&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp (original)
+++ llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp Mon Dec 15 21:25:46 2008
@@ -13,19 +13,27 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "sched-instrs"
+#include "llvm/CodeGen/MachineDominators.h"
+#include "llvm/CodeGen/MachineFunctionPass.h"
+#include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/ScheduleDAGInstrs.h"
 #include "llvm/CodeGen/PseudoSourceValue.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetRegisterInfo.h"
+#include "llvm/Target/TargetSubtarget.h"
+#include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/ADT/SmallSet.h"
 #include <map>
 using namespace llvm;
 
 ScheduleDAGInstrs::ScheduleDAGInstrs(MachineBasicBlock *bb,
-                                     const TargetMachine &tm)
-  : ScheduleDAG(0, bb, tm) {}
+                                     const TargetMachine &tm,
+                                     const MachineLoopInfo &mli,
+                                     const MachineDominatorTree &mdt)
+  : ScheduleDAG(0, bb, tm), MLI(mli), MDT(mdt) {}
 
 void ScheduleDAGInstrs::BuildSchedUnits() {
   SUnits.clear();
@@ -35,7 +43,7 @@
   // to top.
 
   // Remember where defs and uses of each physical register are as we procede.
-  SUnit *Defs[TargetRegisterInfo::FirstVirtualRegister] = {};
+  std::vector<SUnit *> Defs[TargetRegisterInfo::FirstVirtualRegister] = {};
   std::vector<SUnit *> Uses[TargetRegisterInfo::FirstVirtualRegister] = {};
 
   // Remember where unknown loads are after the most recent unknown store
@@ -57,13 +65,20 @@
   // all the work of the block is done before the terminator.
   SUnit *Terminator = 0;
 
+  // Check to see if the scheduler cares about latencies.
+  bool UnitLatencies = ForceUnitLatencies();
+
   for (MachineBasicBlock::iterator MII = BB->end(), MIE = BB->begin();
        MII != MIE; --MII) {
     MachineInstr *MI = prior(MII);
+    const TargetInstrDesc &TID = MI->getDesc();
     SUnit *SU = NewSUnit(MI);
 
     // Assign the Latency field of SU using target-provided information.
-    ComputeLatency(SU);
+    if (UnitLatencies)
+      SU->Latency = 1;
+    else
+      ComputeLatency(SU);
 
     // Add register-based dependencies (data, anti, and output).
     for (unsigned j = 0, n = MI->getNumOperands(); j != n; ++j) {
@@ -74,33 +89,51 @@
 
       assert(TRI->isPhysicalRegister(Reg) && "Virtual register encountered!");
       std::vector<SUnit *> &UseList = Uses[Reg];
-      SUnit *&Def = Defs[Reg];
+      std::vector<SUnit *> &DefList = Defs[Reg];
       // Optionally add output and anti dependencies.
       // TODO: Using a latency of 1 here assumes there's no cost for
       //       reusing registers.
       SDep::Kind Kind = MO.isUse() ? SDep::Anti : SDep::Output;
-      if (Def && Def != SU)
-        Def->addPred(SDep(SU, Kind, /*Latency=*/1, /*Reg=*/Reg));
+      for (unsigned i = 0, e = DefList.size(); i != e; ++i) {
+        SUnit *DefSU = DefList[i];
+        if (DefSU != SU &&
+            (Kind != SDep::Output || !MO.isDead() ||
+             !DefSU->getInstr()->registerDefIsDead(Reg)))
+          DefSU->addPred(SDep(SU, Kind, /*Latency=*/1, /*Reg=*/Reg));
+      }
       for (const unsigned *Alias = TRI->getAliasSet(Reg); *Alias; ++Alias) {
-        SUnit *&Def = Defs[*Alias];
-        if (Def && Def != SU)
-          Def->addPred(SDep(SU, Kind, /*Latency=*/1, /*Reg=*/ *Alias));
+        std::vector<SUnit *> &DefList = Defs[*Alias];
+        for (unsigned i = 0, e = DefList.size(); i != e; ++i) {
+          SUnit *DefSU = DefList[i];
+          if (DefSU != SU &&
+              (Kind != SDep::Output || !MO.isDead() ||
+               !DefSU->getInstr()->registerDefIsDead(Reg)))
+            DefSU->addPred(SDep(SU, Kind, /*Latency=*/1, /*Reg=*/ *Alias));
+        }
       }
 
       if (MO.isDef()) {
         // Add any data dependencies.
-        for (unsigned i = 0, e = UseList.size(); i != e; ++i)
-          if (UseList[i] != SU)
-            UseList[i]->addPred(SDep(SU, SDep::Data, SU->Latency, Reg));
+        unsigned DataLatency = SU->Latency;
+        for (unsigned i = 0, e = UseList.size(); i != e; ++i) {
+          SUnit *UseSU = UseList[i];
+          if (UseSU != SU) {
+            UseSU->addPred(SDep(SU, SDep::Data, DataLatency, Reg));
+          }
+        }
         for (const unsigned *Alias = TRI->getAliasSet(Reg); *Alias; ++Alias) {
           std::vector<SUnit *> &UseList = Uses[*Alias];
-          for (unsigned i = 0, e = UseList.size(); i != e; ++i)
-            if (UseList[i] != SU)
-              UseList[i]->addPred(SDep(SU, SDep::Data, SU->Latency, *Alias));
+          for (unsigned i = 0, e = UseList.size(); i != e; ++i) {
+            SUnit *UseSU = UseList[i];
+            if (UseSU != SU)
+              UseSU->addPred(SDep(SU, SDep::Data, DataLatency, *Alias));
+          }
         }
 
         UseList.clear();
-        Def = SU;
+        if (!MO.isDead())
+          DefList.clear();
+        DefList.push_back(SU);
       } else {
         UseList.push_back(SU);
       }
@@ -111,7 +144,6 @@
     // after stack slots are lowered to actual addresses.
     // TODO: Use an AliasAnalysis and do real alias-analysis queries, and
     // produce more precise dependence information.
-    const TargetInstrDesc &TID = MI->getDesc();
     if (TID.isCall() || TID.isReturn() || TID.isBranch() ||
         TID.hasUnmodeledSideEffects()) {
     new_chain:

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp?rev=61073&r1=61072&r2=61073&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGFast.cpp Mon Dec 15 21:25:46 2008
@@ -99,6 +99,9 @@
                                   SmallVector<SUnit*, 2>&);
   bool DelayForLiveRegsBottomUp(SUnit*, SmallVector<unsigned, 4>&);
   void ListScheduleBottomUp();
+
+  /// ForceUnitLatencies - The fast scheduler doesn't care about real latencies.
+  bool ForceUnitLatencies() const { return true; }
 };
 }  // end anonymous namespace
 
@@ -153,7 +156,8 @@
   DOUT << "*** Scheduling [" << CurCycle << "]: ";
   DEBUG(SU->dump(this));
 
-  SU->Cycle = CurCycle;
+  assert(CurCycle >= SU->getHeight() && "Node scheduled below its height!");
+  SU->setHeightToAtLeast(CurCycle);
   Sequence.push_back(SU);
 
   // Bottom up: release predecessors
@@ -177,7 +181,7 @@
   for (SUnit::succ_iterator I = SU->Succs.begin(), E = SU->Succs.end();
        I != E; ++I) {
     if (I->isAssignedRegDep()) {
-      if (LiveRegCycles[I->getReg()] == I->getSUnit()->Cycle) {
+      if (LiveRegCycles[I->getReg()] == I->getSUnit()->getHeight()) {
         assert(NumLiveRegs > 0 && "NumLiveRegs is already zero!");
         assert(LiveRegDefs[I->getReg()] == SU &&
                "Physical register dependency violated?");
@@ -247,9 +251,6 @@
     }
     if (TID.isCommutable())
       NewSU->isCommutable = true;
-    // FIXME: Calculate height / depth and propagate the changes?
-    NewSU->Depth = SU->Depth;
-    NewSU->Height = SU->Height;
 
     // LoadNode may already exist. This can happen when there is another
     // load from the same location and producing the same type of value
@@ -262,9 +263,6 @@
     } else {
       LoadSU = NewSUnit(LoadNode);
       LoadNode->setNodeId(LoadSU->NodeNum);
-
-      LoadSU->Depth = SU->Depth;
-      LoadSU->Height = SU->Height;
     }
 
     SDep ChainPred;
@@ -344,10 +342,8 @@
   // New SUnit has the exact same predecessors.
   for (SUnit::pred_iterator I = SU->Preds.begin(), E = SU->Preds.end();
        I != E; ++I)
-    if (!I->isArtificial()) {
+    if (!I->isArtificial())
       AddPred(NewSU, *I);
-      NewSU->Depth = std::max(NewSU->Depth, I->getSUnit()->Depth+1);
-    }
 
   // Only copy scheduled successors. Cut them from old node's successor
   // list and move them over.
@@ -358,7 +354,6 @@
       continue;
     SUnit *SuccSU = I->getSUnit();
     if (SuccSU->isScheduled) {
-      NewSU->Height = std::max(NewSU->Height, SuccSU->Height+1);
       SDep D = *I;
       D.setSUnit(NewSU);
       AddPred(SuccSU, D);

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp?rev=61073&r1=61072&r2=61073&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGList.cpp Mon Dec 15 21:25:46 2008
@@ -120,10 +120,7 @@
   }
 #endif
   
-  // Compute the cycle when this SUnit actually becomes available.  This
-  // is the max of the start time of all predecessors plus their latencies.
-  unsigned PredDoneCycle = SU->Cycle + SU->Latency;
-  SuccSU->CycleBound = std::max(SuccSU->CycleBound, PredDoneCycle);
+  SuccSU->setDepthToAtLeast(SU->getDepth() + D.getLatency());
   
   if (SuccSU->NumPredsLeft == 0) {
     PendingQueue.push_back(SuccSU);
@@ -138,7 +135,8 @@
   DEBUG(SU->dump(this));
   
   Sequence.push_back(SU);
-  SU->Cycle = CurCycle;
+  assert(CurCycle >= SU->getDepth() && "Node scheduled above its depth!");
+  SU->setDepthToAtLeast(CurCycle);
 
   // Top down: release successors.
   for (SUnit::succ_iterator I = SU->Succs.begin(), E = SU->Succs.end();
@@ -171,14 +169,14 @@
     // Check to see if any of the pending instructions are ready to issue.  If
     // so, add them to the available queue.
     for (unsigned i = 0, e = PendingQueue.size(); i != e; ++i) {
-      if (PendingQueue[i]->CycleBound == CurCycle) {
+      if (PendingQueue[i]->getDepth() == CurCycle) {
         AvailableQueue->push(PendingQueue[i]);
         PendingQueue[i]->isAvailable = true;
         PendingQueue[i] = PendingQueue.back();
         PendingQueue.pop_back();
         --i; --e;
       } else {
-        assert(PendingQueue[i]->CycleBound > CurCycle && "Negative latency?");
+        assert(PendingQueue[i]->getDepth() > CurCycle && "Negative latency?");
       }
     }
     

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp?rev=61073&r1=61072&r2=61073&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp Mon Dec 15 21:25:46 2008
@@ -154,6 +154,10 @@
       Topo.InitDAGTopologicalSorting();
     return NewNode;
   }
+
+  /// ForceUnitLatencies - Return true, since register-pressure-reducing
+  /// scheduling doesn't need actual latency information.
+  bool ForceUnitLatencies() const { return true; }
 };
 }  // end anonymous namespace
 
@@ -171,8 +175,6 @@
 
   DEBUG(for (unsigned su = 0, e = SUnits.size(); su != e; ++su)
           SUnits[su].dumpAll(this));
-  CalculateDepths();
-  CalculateHeights();
   Topo.InitDAGTopologicalSorting();
 
   AvailableQueue->initNodes(SUnits);
@@ -272,7 +274,8 @@
   DOUT << "*** Scheduling [" << CurCycle << "]: ";
   DEBUG(SU->dump(this));
 
-  SU->Cycle = CurCycle;
+  assert(CurCycle >= SU->getHeight() && "Node scheduled below its height!");
+  SU->setHeightToAtLeast(CurCycle);
   Sequence.push_back(SU);
 
   // Bottom up: release predecessors
@@ -296,7 +299,7 @@
   for (SUnit::succ_iterator I = SU->Succs.begin(), E = SU->Succs.end();
        I != E; ++I) {
     if (I->isAssignedRegDep()) {
-      if (LiveRegCycles[I->getReg()] == I->getSUnit()->Cycle) {
+      if (LiveRegCycles[I->getReg()] == I->getSUnit()->getHeight()) {
         assert(NumLiveRegs > 0 && "NumLiveRegs is already zero!");
         assert(LiveRegDefs[I->getReg()] == SU &&
                "Physical register dependency violated?");
@@ -328,7 +331,7 @@
 /// UnscheduleNodeBottomUp - Remove the node from the schedule, update its and
 /// its predecessor states to reflect the change.
 void ScheduleDAGRRList::UnscheduleNodeBottomUp(SUnit *SU) {
-  DOUT << "*** Unscheduling [" << SU->Cycle << "]: ";
+  DOUT << "*** Unscheduling [" << SU->getHeight() << "]: ";
   DEBUG(SU->dump(this));
 
   AvailableQueue->UnscheduledNode(SU);
@@ -336,7 +339,7 @@
   for (SUnit::pred_iterator I = SU->Preds.begin(), E = SU->Preds.end();
        I != E; ++I) {
     CapturePred(&*I);
-    if (I->isAssignedRegDep() && SU->Cycle == LiveRegCycles[I->getReg()]) {
+    if (I->isAssignedRegDep() && SU->getHeight() == LiveRegCycles[I->getReg()]) {
       assert(NumLiveRegs > 0 && "NumLiveRegs is already zero!");
       assert(LiveRegDefs[I->getReg()] == I->getSUnit() &&
              "Physical register dependency violated?");
@@ -353,12 +356,12 @@
         LiveRegDefs[I->getReg()] = SU;
         ++NumLiveRegs;
       }
-      if (I->getSUnit()->Cycle < LiveRegCycles[I->getReg()])
-        LiveRegCycles[I->getReg()] = I->getSUnit()->Cycle;
+      if (I->getSUnit()->getHeight() < LiveRegCycles[I->getReg()])
+        LiveRegCycles[I->getReg()] = I->getSUnit()->getHeight();
     }
   }
 
-  SU->Cycle = 0;
+  SU->setHeightDirty();
   SU->isScheduled = false;
   SU->isAvailable = true;
   AvailableQueue->push(SU);
@@ -443,9 +446,6 @@
     } else {
       LoadSU = CreateNewSUnit(LoadNode);
       LoadNode->setNodeId(LoadSU->NodeNum);
-
-      LoadSU->Depth = SU->Depth;
-      LoadSU->Height = SU->Height;
       ComputeLatency(LoadSU);
     }
 
@@ -462,9 +462,6 @@
     }
     if (TID.isCommutable())
       NewSU->isCommutable = true;
-    // FIXME: Calculate height / depth and propagate the changes?
-    NewSU->Depth = SU->Depth;
-    NewSU->Height = SU->Height;
     ComputeLatency(NewSU);
 
     SDep ChainPred;
@@ -548,10 +545,8 @@
   // New SUnit has the exact same predecessors.
   for (SUnit::pred_iterator I = SU->Preds.begin(), E = SU->Preds.end();
        I != E; ++I)
-    if (!I->isArtificial()) {
+    if (!I->isArtificial())
       AddPred(NewSU, *I);
-      NewSU->Depth = std::max(NewSU->Depth, I->getSUnit()->Depth+1);
-    }
 
   // Only copy scheduled successors. Cut them from old node's successor
   // list and move them over.
@@ -562,7 +557,6 @@
       continue;
     SUnit *SuccSU = I->getSUnit();
     if (SuccSU->isScheduled) {
-      NewSU->Height = std::max(NewSU->Height, SuccSU->Height+1);
       SDep D = *I;
       D.setSUnit(NewSU);
       AddPred(SuccSU, D);
@@ -570,9 +564,8 @@
       DelDeps.push_back(std::make_pair(SuccSU, D));
     }
   }
-  for (unsigned i = 0, e = DelDeps.size(); i != e; ++i) {
+  for (unsigned i = 0, e = DelDeps.size(); i != e; ++i)
     RemovePred(DelDeps[i].first, DelDeps[i].second);
-  }
 
   AvailableQueue->updateNode(SU);
   AvailableQueue->addNode(NewSU);
@@ -590,8 +583,6 @@
   SUnit *CopyFromSU = CreateNewSUnit(NULL);
   CopyFromSU->CopySrcRC = SrcRC;
   CopyFromSU->CopyDstRC = DestRC;
-  CopyFromSU->Depth = SU->Depth;
-  CopyFromSU->Height = SU->Height;
 
   SUnit *CopyToSU = CreateNewSUnit(NULL);
   CopyToSU->CopySrcRC = DestRC;
@@ -870,7 +861,8 @@
   DOUT << "*** Scheduling [" << CurCycle << "]: ";
   DEBUG(SU->dump(this));
 
-  SU->Cycle = CurCycle;
+  assert(CurCycle >= SU->getDepth() && "Node scheduled above its depth!");
+  SU->setDepthToAtLeast(CurCycle);
   Sequence.push_back(SU);
 
   // Top down: release successors
@@ -1107,19 +1099,19 @@
 /// closestSucc - Returns the scheduled cycle of the successor which is
 /// closet to the current cycle.
 static unsigned closestSucc(const SUnit *SU) {
-  unsigned MaxCycle = 0;
+  unsigned MaxHeight = 0;
   for (SUnit::const_succ_iterator I = SU->Succs.begin(), E = SU->Succs.end();
        I != E; ++I) {
-    unsigned Cycle = I->getSUnit()->Cycle;
+    unsigned Height = I->getSUnit()->getHeight();
     // If there are bunch of CopyToRegs stacked up, they should be considered
     // to be at the same position.
     if (I->getSUnit()->getNode() &&
         I->getSUnit()->getNode()->getOpcode() == ISD::CopyToReg)
-      Cycle = closestSucc(I->getSUnit())+1;
-    if (Cycle > MaxCycle)
-      MaxCycle = Cycle;
+      Height = closestSucc(I->getSUnit())+1;
+    if (Height > MaxHeight)
+      MaxHeight = Height;
   }
-  return MaxCycle;
+  return MaxHeight;
 }
 
 /// calcMaxScratches - Returns an cost estimate of the worse case requirement
@@ -1182,11 +1174,11 @@
   if (LScratch != RScratch)
     return LScratch > RScratch;
 
-  if (left->Height != right->Height)
-    return left->Height > right->Height;
+  if (left->getHeight() != right->getHeight())
+    return left->getHeight() > right->getHeight();
   
-  if (left->Depth != right->Depth)
-    return left->Depth < right->Depth;
+  if (left->getDepth() != right->getDepth())
+    return left->getDepth() < right->getDepth();
 
   assert(left->NodeQueueId && right->NodeQueueId && 
          "NodeQueueId cannot be zero");
@@ -1294,7 +1286,8 @@
           continue;
         // Be conservative. Ignore if nodes aren't at roughly the same
         // depth and height.
-        if (SuccSU->Height < SU->Height && (SU->Height - SuccSU->Height) > 1)
+        if (SuccSU->getHeight() < SU->getHeight() &&
+            (SU->getHeight() - SuccSU->getHeight()) > 1)
           continue;
         if (!SuccSU->getNode() || !SuccSU->getNode()->isMachineOpcode())
           continue;
@@ -1384,8 +1377,8 @@
   if (LPriority+LBonus != RPriority+RBonus)
     return LPriority+LBonus < RPriority+RBonus;
 
-  if (left->Depth != right->Depth)
-    return left->Depth < right->Depth;
+  if (left->getDepth() != right->getDepth())
+    return left->getDepth() < right->getDepth();
 
   if (left->NumSuccsLeft != right->NumSuccsLeft)
     return left->NumSuccsLeft > right->NumSuccsLeft;

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp?rev=61073&r1=61072&r2=61073&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp Mon Dec 15 21:25:46 2008
@@ -80,6 +80,9 @@
        E = DAG->allnodes_end(); NI != E; ++NI)
     NI->setNodeId(-1);
 
+  // Check to see if the scheduler cares about latencies.
+  bool UnitLatencies = ForceUnitLatencies();
+
   for (SelectionDAG::allnodes_iterator NI = DAG->allnodes_begin(),
        E = DAG->allnodes_end(); NI != E; ++NI) {
     if (isPassiveNode(NI))  // Leaf node, e.g. a TargetImmediate.
@@ -133,7 +136,10 @@
     N->setNodeId(NodeSUnit->NodeNum);
 
     // Assign the Latency field of NodeSUnit using target-provided information.
-    ComputeLatency(NodeSUnit);
+    if (UnitLatencies)
+      NodeSUnit->Latency = 1;
+    else
+      ComputeLatency(NodeSUnit);
   }
   
   // Pass 2: add the preds, succs, etc.

Modified: llvm/trunk/test/CodeGen/X86/fold-pcmpeqd-0.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fold-pcmpeqd-0.ll?rev=61073&r1=61072&r2=61073&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/X86/fold-pcmpeqd-0.ll (original)
+++ llvm/trunk/test/CodeGen/X86/fold-pcmpeqd-0.ll Mon Dec 15 21:25:46 2008
@@ -1,10 +1,8 @@
-; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin   | not grep pcmpeqd
+; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin   | grep pcmpeqd | count 1
 ; RUN: llvm-as < %s | llc -mtriple=x86_64-apple-darwin | grep pcmpeqd | count 1
 
-; On x86-64, this testcase shouldn't need to spill the -1 value,
+; This testcase shouldn't need to spill the -1 value,
 ; so it should just use pcmpeqd to materialize an all-ones vector.
-; On x86-32, there aren't enough registers, so an all-ones
-; constant pool should be created so it can be folded.
 
 	%struct.__ImageExecInfo = type <{ <4 x i32>, <4 x float>, <2 x i64>, i8*, i8*, i8*, i32, i32, i32, i32, i32 }>
 	%struct._cl_image_format_t = type <{ i32, i32, i32 }>




From gohman at apple.com  Mon Dec 15 21:31:11 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 03:31:11 -0000
Subject: [llvm-commits] [llvm] r61074 -
	/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
Message-ID: <200812160331.mBG3VBng013150@zion.cs.uiuc.edu>

Author: djg
Date: Mon Dec 15 21:31:11 2008
New Revision: 61074

URL: http://llvm.org/viewvc/llvm-project?rev=61074&view=rev
Log:
Remove some special-case logic in ScheduleDAGSDNodes's 
latency computation code that is no longer needed with the
new method for handling latencies.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp?rev=61074&r1=61073&r2=61074&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp Mon Dec 15 21:31:11 2008
@@ -196,12 +196,6 @@
   
   // Compute the latency for the node.  We use the sum of the latencies for
   // all nodes flagged together into this SUnit.
-  if (InstrItins.isEmpty()) {
-    // No latency information.
-    SU->Latency = 1;
-    return;
-  }
-
   SU->Latency = 0;
   bool SawMachineOpcode = false;
   for (SDNode *N = SU->getNode(); N; N = N->getFlaggedNode())
@@ -210,10 +204,6 @@
       SU->Latency +=
         InstrItins.getLatency(TII->get(N->getMachineOpcode()).getSchedClass());
     }
-
-  // Ensure that CopyToReg and similar nodes have a non-zero latency.
-  if (!SawMachineOpcode)
-    SU->Latency = 1;
 }
 
 /// CountResults - The results of target nodes have register or immediate




From gohman at apple.com  Mon Dec 15 21:35:02 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 03:35:02 -0000
Subject: [llvm-commits] [llvm] r61075 - in /llvm/trunk:
 include/llvm/CodeGen/ScheduleDAG.h include/llvm/Target/TargetSubtarget.h
 lib/CodeGen/LatencyPriorityQueue.cpp lib/CodeGen/ScheduleDAGInstrs.cpp
 lib/Target/X86/X86Subtarget.cpp lib/Target/X86/X86Subtarget.h
Message-ID: <200812160335.mBG3Z2c9013270@zion.cs.uiuc.edu>

Author: djg
Date: Mon Dec 15 21:35:01 2008
New Revision: 61075

URL: http://llvm.org/viewvc/llvm-project?rev=61075&view=rev
Log:
Add initial support for back-scheduling address computations,
especially in the case of addresses computed from loop induction
variables.

Modified:
    llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
    llvm/trunk/include/llvm/Target/TargetSubtarget.h
    llvm/trunk/lib/CodeGen/LatencyPriorityQueue.cpp
    llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp
    llvm/trunk/lib/Target/X86/X86Subtarget.cpp
    llvm/trunk/lib/Target/X86/X86Subtarget.h

Modified: llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h?rev=61075&r1=61074&r2=61075&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h (original)
+++ llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h Mon Dec 15 21:35:01 2008
@@ -242,6 +242,7 @@
     bool isPending        : 1;          // True once pending.
     bool isAvailable      : 1;          // True once available.
     bool isScheduled      : 1;          // True once scheduled.
+    bool isScheduleHigh   : 1;          // True if preferable to schedule high.
   private:
     bool isDepthCurrent   : 1;          // True if Depth is current.
     bool isHeightCurrent  : 1;          // True if Height is current.
@@ -258,7 +259,7 @@
         Latency(0), NumPreds(0), NumSuccs(0), NumPredsLeft(0), NumSuccsLeft(0),
         isTwoAddress(false), isCommutable(false), hasPhysRegDefs(false),
         isPending(false), isAvailable(false), isScheduled(false),
-        isDepthCurrent(false), isHeightCurrent(false),
+        isScheduleHigh(false), isDepthCurrent(false), isHeightCurrent(false),
         Depth(0), Height(0),
         CopyDstRC(NULL), CopySrcRC(NULL) {}
 
@@ -269,7 +270,7 @@
         Latency(0), NumPreds(0), NumSuccs(0), NumPredsLeft(0), NumSuccsLeft(0),
         isTwoAddress(false), isCommutable(false), hasPhysRegDefs(false),
         isPending(false), isAvailable(false), isScheduled(false),
-        isDepthCurrent(false), isHeightCurrent(false),
+        isScheduleHigh(false), isDepthCurrent(false), isHeightCurrent(false),
         Depth(0), Height(0),
         CopyDstRC(NULL), CopySrcRC(NULL) {}
 

Modified: llvm/trunk/include/llvm/Target/TargetSubtarget.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetSubtarget.h?rev=61075&r1=61074&r2=61075&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetSubtarget.h (original)
+++ llvm/trunk/include/llvm/Target/TargetSubtarget.h Mon Dec 15 21:35:01 2008
@@ -29,6 +29,12 @@
   TargetSubtarget();
 public:
   virtual ~TargetSubtarget();
+
+  /// getSpecialAddressLatency - For targets where it is beneficial to
+  /// backschedule instructions that compute addresses, return a value
+  /// indicating the number of scheduling cycles of backscheduling that
+  /// should be attempted.
+  virtual unsigned getSpecialAddressLatency() const { return 0; }
 };
 
 } // End llvm namespace

Modified: llvm/trunk/lib/CodeGen/LatencyPriorityQueue.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LatencyPriorityQueue.cpp?rev=61075&r1=61074&r2=61075&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LatencyPriorityQueue.cpp (original)
+++ llvm/trunk/lib/CodeGen/LatencyPriorityQueue.cpp Mon Dec 15 21:35:01 2008
@@ -19,6 +19,14 @@
 using namespace llvm;
 
 bool latency_sort::operator()(const SUnit *LHS, const SUnit *RHS) const {
+  // The isScheduleHigh flag allows nodes with wraparound dependencies that
+  // cannot easily be modeled as edges with latencies to be scheduled as
+  // soon as possible in a top-down schedule.
+  if (LHS->isScheduleHigh && !RHS->isScheduleHigh)
+    return false;
+  if (!LHS->isScheduleHigh && RHS->isScheduleHigh)
+    return true;
+
   unsigned LHSNum = LHS->NodeNum;
   unsigned RHSNum = RHS->NodeNum;
 

Modified: llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp?rev=61075&r1=61074&r2=61075&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp (original)
+++ llvm/trunk/lib/CodeGen/ScheduleDAGInstrs.cpp Mon Dec 15 21:35:01 2008
@@ -15,6 +15,7 @@
 #define DEBUG_TYPE "sched-instrs"
 #include "llvm/CodeGen/MachineDominators.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
+#include "llvm/CodeGen/MachineLoopInfo.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
 #include "llvm/CodeGen/ScheduleDAGInstrs.h"
 #include "llvm/CodeGen/PseudoSourceValue.h"
@@ -29,6 +30,59 @@
 #include <map>
 using namespace llvm;
 
+namespace {
+  class VISIBILITY_HIDDEN LoopDependencies {
+    const MachineLoopInfo &MLI;
+    const MachineDominatorTree &MDT;
+
+  public:
+    typedef std::map<unsigned, std::pair<const MachineOperand *, unsigned> >
+      LoopDeps;
+    LoopDeps Deps;
+
+    LoopDependencies(const MachineLoopInfo &mli,
+                     const MachineDominatorTree &mdt) :
+      MLI(mli), MDT(mdt) {}
+
+    void VisitLoop(const MachineLoop *Loop) {
+      Deps.clear();
+      MachineBasicBlock *Header = Loop->getHeader();
+      SmallSet<unsigned, 8> LoopLiveIns;
+      for (MachineBasicBlock::livein_iterator LI = Header->livein_begin(),
+           LE = Header->livein_end(); LI != LE; ++LI)
+        LoopLiveIns.insert(*LI);
+
+      VisitRegion(MDT.getNode(Header), Loop, LoopLiveIns);
+    }
+
+  private:
+    void VisitRegion(const MachineDomTreeNode *Node,
+                     const MachineLoop *Loop,
+                     const SmallSet<unsigned, 8> &LoopLiveIns) {
+      MachineBasicBlock *MBB = Node->getBlock();
+      if (!Loop->contains(MBB)) return;
+
+      unsigned Count = 0;
+      for (MachineBasicBlock::const_iterator I = MBB->begin(), E = MBB->end();
+           I != E; ++I, ++Count) {
+        const MachineInstr *MI = I;
+        for (unsigned i = 0, e = MI->getNumOperands(); i != e; ++i) {
+          const MachineOperand &MO = MI->getOperand(i);
+          if (!MO.isReg() || !MO.isUse())
+            continue;
+          unsigned MOReg = MO.getReg();
+          if (LoopLiveIns.count(MOReg))
+            Deps.insert(std::make_pair(MOReg, std::make_pair(&MO, Count)));
+        }
+      }
+
+      const std::vector<MachineDomTreeNode*> &Children = Node->getChildren();
+      for (unsigned I = 0, E = Children.size(); I != E; ++I)
+        VisitRegion(Children[I], Loop, LoopLiveIns);
+    }
+  };
+}
+
 ScheduleDAGInstrs::ScheduleDAGInstrs(MachineBasicBlock *bb,
                                      const TargetMachine &tm,
                                      const MachineLoopInfo &mli,
@@ -65,9 +119,27 @@
   // all the work of the block is done before the terminator.
   SUnit *Terminator = 0;
 
+  LoopDependencies LoopRegs(MLI, MDT);
+
+  // Track which regs are live into a loop, to help guide back-edge-aware
+  // scheduling.
+  SmallSet<unsigned, 8> LoopLiveInRegs;
+  if (MachineLoop *ML = MLI.getLoopFor(BB))
+    if (BB == ML->getLoopLatch()) {
+      MachineBasicBlock *Header = ML->getHeader();
+      for (MachineBasicBlock::livein_iterator I = Header->livein_begin(),
+           E = Header->livein_end(); I != E; ++I)
+        LoopLiveInRegs.insert(*I);
+      LoopRegs.VisitLoop(ML);
+    }
+
   // Check to see if the scheduler cares about latencies.
   bool UnitLatencies = ForceUnitLatencies();
 
+  // Ask the target if address-backscheduling is desirable, and if so how much.
+  unsigned SpecialAddressLatency =
+    TM.getSubtarget<TargetSubtarget>().getSpecialAddressLatency();
+
   for (MachineBasicBlock::iterator MII = BB->end(), MIE = BB->begin();
        MII != MIE; --MII) {
     MachineInstr *MI = prior(MII);
@@ -118,7 +190,21 @@
         for (unsigned i = 0, e = UseList.size(); i != e; ++i) {
           SUnit *UseSU = UseList[i];
           if (UseSU != SU) {
-            UseSU->addPred(SDep(SU, SDep::Data, DataLatency, Reg));
+            unsigned LDataLatency = DataLatency;
+            // Optionally add in a special extra latency for nodes that
+            // feed addresses.
+            // TODO: Do this for register aliases too.
+            if (SpecialAddressLatency != 0 && !UnitLatencies) {
+              MachineInstr *UseMI = UseSU->getInstr();
+              const TargetInstrDesc &UseTID = UseMI->getDesc();
+              int RegUseIndex = UseMI->findRegisterUseOperandIdx(Reg);
+              assert(RegUseIndex >= 0 && "UseMI doesn's use register!");
+              if ((UseTID.mayLoad() || UseTID.mayStore()) &&
+                  (unsigned)RegUseIndex < UseTID.getNumOperands() &&
+                  UseTID.OpInfo[RegUseIndex].isLookupPtrRegClass())
+                LDataLatency += SpecialAddressLatency;
+            }
+            UseSU->addPred(SDep(SU, SDep::Data, LDataLatency, Reg));
           }
         }
         for (const unsigned *Alias = TRI->getAliasSet(Reg); *Alias; ++Alias) {
@@ -130,6 +216,51 @@
           }
         }
 
+        // If a def is going to wrap back around to the top of the loop,
+        // backschedule it.
+        // TODO: Blocks in loops without terminators can benefit too.
+        if (!UnitLatencies && Terminator && DefList.empty()) {
+          LoopDependencies::LoopDeps::iterator I = LoopRegs.Deps.find(Reg);
+          if (I != LoopRegs.Deps.end()) {
+            const MachineOperand *UseMO = I->second.first;
+            unsigned Count = I->second.second;
+            const MachineInstr *UseMI = UseMO->getParent();
+            unsigned UseMOIdx = UseMO - &UseMI->getOperand(0);
+            const TargetInstrDesc &UseTID = UseMI->getDesc();
+            // TODO: If we knew the total depth of the region here, we could
+            // handle the case where the whole loop is inside the region but
+            // is large enough that the isScheduleHigh trick isn't needed.
+            if (UseMOIdx < UseTID.getNumOperands()) {
+              // Currently, we only support scheduling regions consisting of
+              // single basic blocks. Check to see if the instruction is in
+              // the same region by checking to see if it has the same parent.
+              if (UseMI->getParent() != MI->getParent()) {
+                unsigned Latency = SU->Latency;
+                if (UseTID.OpInfo[UseMOIdx].isLookupPtrRegClass())
+                  Latency += SpecialAddressLatency;
+                // This is a wild guess as to the portion of the latency which
+                // will be overlapped by work done outside the current
+                // scheduling region.
+                Latency -= std::min(Latency, Count);
+                // Add the artifical edge.
+                Terminator->addPred(SDep(SU, SDep::Order, Latency,
+                                         /*Reg=*/0, /*isNormalMemory=*/false,
+                                         /*isMustAlias=*/false,
+                                         /*isArtificial=*/true));
+              } else if (SpecialAddressLatency > 0 &&
+                         UseTID.OpInfo[UseMOIdx].isLookupPtrRegClass()) {
+                // The entire loop body is within the current scheduling region
+                // and the latency of this operation is assumed to be greater
+                // than the latency of the loop.
+                // TODO: Recursively mark data-edge predecessors as
+                //       isScheduleHigh too.
+                SU->isScheduleHigh = true;
+              }
+            }
+            LoopRegs.Deps.erase(I);
+          }
+        }
+
         UseList.clear();
         if (!MO.isDead())
           DefList.clear();

Modified: llvm/trunk/lib/Target/X86/X86Subtarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Subtarget.cpp?rev=61075&r1=61074&r2=61075&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86Subtarget.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86Subtarget.cpp Mon Dec 15 21:35:01 2008
@@ -93,6 +93,17 @@
   return 0;
 }
 
+/// getSpecialAddressLatency - For targets where it is beneficial to
+/// backschedule instructions that compute addresses, return a value
+/// indicating the number of scheduling cycles of backscheduling that
+/// should be attempted.
+unsigned X86Subtarget::getSpecialAddressLatency() const {
+  // For x86 out-of-order targets, back-schedule address computations so
+  // that loads and stores aren't blocked.
+  // This value was chosen arbitrarily.
+  return 200;
+}
+
 /// GetCpuIDAndInfo - Execute the specified cpuid and return the 4 values in the
 /// specified arguments.  If we can't run cpuid on the host, return true.
 bool X86::GetCpuIDAndInfo(unsigned value, unsigned *rEAX, unsigned *rEBX,

Modified: llvm/trunk/lib/Target/X86/X86Subtarget.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Subtarget.h?rev=61075&r1=61074&r2=61075&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86Subtarget.h (original)
+++ llvm/trunk/lib/Target/X86/X86Subtarget.h Mon Dec 15 21:35:01 2008
@@ -191,6 +191,12 @@
   /// memset with zero passed as the second argument. Otherwise it
   /// returns null.
   const char *getBZeroEntry() const;
+
+  /// getSpecialAddressLatency - For targets where it is beneficial to
+  /// backschedule instructions that compute addresses, return a value
+  /// indicating the number of scheduling cycles of backscheduling that
+  /// should be attempted.
+  unsigned getSpecialAddressLatency() const;
 };
 
 namespace X86 {




From nicholas at mxc.ca  Mon Dec 15 22:41:44 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Mon, 15 Dec 2008 20:41:44 -0800
Subject: [llvm-commits] [llvm] r61030 - in /llvm/trunk:
 include/llvm/Attributes.h lib/AsmParser/llvmAsmParser.y
 lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Attributes.cpp
In-Reply-To: <200812151152.37244.baldrick@free.fr>
References: <200812150729.mBF7Ttg3027174@zion.cs.uiuc.edu>
	<200812151152.37244.baldrick@free.fr>
Message-ID: <49473188.2060606@mxc.ca>

Duncan Sands wrote:
> Hi Nick,
> 
>> It turns out that "align 1" and unaligned are different. Add a bias to the
>> alignment attribute such that 0 means unaligned.
> 
> what happens if a function is aligned 1024 or something huge like that?
> Also, I don't think 0 means unaligned, I think it means default alignment.

You're right, by unaligned I meant default alignment. I was trying to 
distinguish it from byte aligned (align 1).

We support "huge" alignments like 1024 just fine. It's a 5-bit integer 
[0..31]  whose mapping looks like this:

0 - default alignment
1 - align 1
2 - align 2
3 - align 4
4 - align 8
...
30 - align 2^29
31 - align 2^30

I should mention that previously, we were silently dropping any 
alignment larger than 32768.

Nick

> Ciao,
> 
> Duncan.
> 
>> +                                     // 0 means unaligned different from align 1
> 
> -> 0 means default alignment
> 
> Ciao,
> 
> Duncan.
> 



From bob.wilson at apple.com  Mon Dec 15 15:03:34 2008
From: bob.wilson at apple.com (Bob Wilson)
Date: Mon, 15 Dec 2008 13:03:34 -0800
Subject: [llvm-commits] Patch: remove extra llvm-gcc output for unsupported
	builtin
Message-ID: <102C0C68-253C-417B-8144-CB60EDF09AF7@apple.com>

I noticed that llvm-gcc emits some extra information before an error  
message for an unsupported builtin.  It appears to be left over debug  
output.  This patch removes the extra output, since this is an error  
that may occur in practice (as opposed to an internal assertion that  
should never occur) and the message is not something a user should see  
(at least in its current form).  Is this OK to commit?

-------------- next part --------------
A non-text attachment was scrubbed...
Name: llvm-error.patch
Type: application/octet-stream
Size: 552 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081215/d96f322c/attachment.obj 
-------------- next part --------------


From nicholas at mxc.ca  Mon Dec 15 23:26:23 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Mon, 15 Dec 2008 21:26:23 -0800
Subject: [llvm-commits] [llvm] r61019 - in /llvm/trunk:
 docs/AliasAnalysis.html docs/LangRef.html include/llvm/Attributes.h
 lib/AsmParser/LLLexer.cpp lib/AsmParser/llvmAsmParser.y
 lib/Bitcode/Reader/BitcodeReader.cpp lib/Bitcode/Writer/BitcodeWriter.cpp
 lib/VMCore/Attributes.cpp
In-Reply-To: <200812151157.35229.baldrick@free.fr>
References: <200812150134.mBF1YxKZ015699@zion.cs.uiuc.edu>
	<200812151157.35229.baldrick@free.fr>
Message-ID: <49473BFF.5000406@mxc.ca>

Duncan Sands wrote:
> Hi Nick,
> 
>> Introducing nocapture, a parameter attribute for pointers to indicate that the
>> callee will not introduce any new aliases of that pointer.
> 
> if I understand right, this attribute means that the pointer is only dereferenced:
> no bits of the pointer value itself are otherwise used or escape.
> 
>> +    <dt><tt>nocapture</tt></dt>
>> +    <dd>This indicates that the callee does not make any copies of the pointer
>> +    that outlive the callee itself. This is not a valid attribute for return
>> +    values.</dd>
> 
> I think you should mention that callee does not copy even one bit.  Because if
> it is allowed to, it is easy to construct examples where the whole pointer value
> escapes through multiple calls.

It's not allowed to. The pointer can be used, copied, etc., as much as 
you want by the callee and its tree of callees, so long as not one bit 
of the pointer is after the call has completed (so the copies made must 
be destroyed before returning).

I'm not sure I want to go into such detail in the LangRef. I think that 
if somebody really does write a function that leaks 1 bit of a pointer, 
marks it nocapture, then calls it in a loop, reconstitutes a pointer and 
makes a program that miscompiles, we can inform them that they have 
misused nocapture.

It's esoteric enough that I think explaining it in the LangRef will lead 
to more confusion, not more understanding. If you can come up with 
wording that would clarify the intent I think that'd be great, but I 
don't think it's needed.

Nick


From isanbard at gmail.com  Mon Dec 15 23:31:50 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Dec 2008 05:31:50 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61076 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
Message-ID: <200812160531.mBG5Vo6I016895@zion.cs.uiuc.edu>

Author: void
Date: Mon Dec 15 23:31:49 2008
New Revision: 61076

URL: http://llvm.org/viewvc/llvm-project?rev=61076&view=rev
Log:
Remove forgotten debug output. Patch by Bob Wilson.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=61076&r1=61075&r2=61076&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Mon Dec 15 23:31:49 2008
@@ -4496,7 +4496,6 @@
         if (EmitFrontendExpandedBuiltinCall(exp, fndecl, DestLoc, Result))
           return true;
         
-        std::cerr << "TYPE: " << *ConvertType(TREE_TYPE(fndecl)) << "\n";
         error("%Hunsupported target builtin %<%s%> used", &EXPR_LOCATION(exp),
               BuiltinName);
         const Type *ResTy = ConvertType(TREE_TYPE(exp));




From isanbard at gmail.com  Mon Dec 15 23:31:58 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Mon, 15 Dec 2008 21:31:58 -0800
Subject: [llvm-commits] Patch: remove extra llvm-gcc output for
	unsupported builtin
In-Reply-To: <102C0C68-253C-417B-8144-CB60EDF09AF7@apple.com>
References: <102C0C68-253C-417B-8144-CB60EDF09AF7@apple.com>
Message-ID: <5F8E5421-E2DE-4181-B79C-FB777ED03E19@gmail.com>

Applied. Thanks, Bob!

-bw

On Dec 15, 2008, at 1:03 PM, Bob Wilson wrote:

> I noticed that llvm-gcc emits some extra information before an error  
> message for an unsupported builtin.  It appears to be left over  
> debug output.  This patch removes the extra output, since this is an  
> error that may occur in practice (as opposed to an internal  
> assertion that should never occur) and the message is not something  
> a user should see (at least in its current form).  Is this OK to  
> commit?
>
> <llvm-error.patch>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From gohman at apple.com  Tue Dec 16 00:20:59 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 06:20:59 -0000
Subject: [llvm-commits] [llvm] r61077 -
	/llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp
Message-ID: <200812160621.mBG6L0QL018558@zion.cs.uiuc.edu>

Author: djg
Date: Tue Dec 16 00:20:58 2008
New Revision: 61077

URL: http://llvm.org/viewvc/llvm-project?rev=61077&view=rev
Log:
When breaking an anti-dependency, don't use a register which has seen
one of its aliases defined. This is conservative, but tricky subreg
corner cases are outside the primary aim of this pass.

Modified:
    llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp

Modified: llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp?rev=61077&r1=61076&r2=61077&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp (original)
+++ llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp Tue Dec 16 00:20:58 2008
@@ -454,6 +454,7 @@
         assert(((KillIndices[NewReg] == -1u) != (DefIndices[NewReg] == -1u)) &&
                "Kill and Def maps aren't consistent for NewReg!");
         if (KillIndices[NewReg] == -1u &&
+            Classes[NewReg] != reinterpret_cast<TargetRegisterClass *>(-1) &&
             KillIndices[AntiDepReg] <= DefIndices[NewReg]) {
           DOUT << "Breaking anti-dependence edge on "
                << TRI->getName(AntiDepReg)




From gohman at apple.com  Tue Dec 16 00:21:45 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 06:21:45 -0000
Subject: [llvm-commits] [llvm] r61078 - in /llvm/trunk:
 lib/CodeGen/PostRASchedulerList.cpp
 test/CodeGen/X86/break-anti-dependencies.ll
Message-ID: <200812160621.mBG6Lken018594@zion.cs.uiuc.edu>

Author: djg
Date: Tue Dec 16 00:21:45 2008
New Revision: 61078

URL: http://llvm.org/viewvc/llvm-project?rev=61078&view=rev
Log:
Enable anti-dependence breaking by default when post-RA scheduling is enabled.

Modified:
    llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp
    llvm/trunk/test/CodeGen/X86/break-anti-dependencies.ll

Modified: llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp?rev=61078&r1=61077&r2=61078&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp (original)
+++ llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp Tue Dec 16 00:21:45 2008
@@ -43,7 +43,7 @@
 static cl::opt<bool>
 EnableAntiDepBreaking("break-anti-dependencies",
                       cl::desc("Break scheduling anti-dependencies"),
-                      cl::init(false));
+                      cl::init(true));
 
 namespace {
   class VISIBILITY_HIDDEN PostRAScheduler : public MachineFunctionPass {

Modified: llvm/trunk/test/CodeGen/X86/break-anti-dependencies.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/break-anti-dependencies.ll?rev=61078&r1=61077&r2=61078&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/X86/break-anti-dependencies.ll (original)
+++ llvm/trunk/test/CodeGen/X86/break-anti-dependencies.ll Tue Dec 16 00:21:45 2008
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86-64 -disable-post-RA-scheduler=false > %t
+; RUN: llvm-as < %s | llc -march=x86-64 -disable-post-RA-scheduler=false -break-anti-dependencies=false > %t
 ; RUN:   grep {%xmm0} %t | count 14
 ; RUN:   not grep {%xmm1} %t
 ; RUN: llvm-as < %s | llc -march=x86-64 -disable-post-RA-scheduler=false -break-anti-dependencies > %t




From sabre at nondot.org  Tue Dec 16 01:10:10 2008
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 16 Dec 2008 07:10:10 -0000
Subject: [llvm-commits] [llvm] r61080 - in /llvm/trunk:
 lib/Analysis/MemoryDependenceAnalysis.cpp
 test/Transforms/GVN/2008-12-15-CacheVisited.ll
Message-ID: <200812160710.mBG7AAvk020195@zion.cs.uiuc.edu>

Author: lattner
Date: Tue Dec 16 01:10:09 2008
New Revision: 61080

URL: http://llvm.org/viewvc/llvm-project?rev=61080&view=rev
Log:
fix PR3217: fully cached queries need to be verified against the 
visited set before they are used.  If used, their blocks need to be
added to the visited set so that subsequent queries don't use conflicting
pointer values in the cache result blocks.

Added:
    llvm/trunk/test/Transforms/GVN/2008-12-15-CacheVisited.ll
Modified:
    llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp

Modified: llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp?rev=61080&r1=61079&r2=61080&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp (original)
+++ llvm/trunk/lib/Analysis/MemoryDependenceAnalysis.cpp Tue Dec 16 01:10:09 2008
@@ -601,10 +601,30 @@
   // If we have valid cached information for exactly the block we are
   // investigating, just return it with no recomputation.
   if (CacheInfo->first == BBSkipFirstBlockPair(StartBB, SkipFirstBlock)) {
+    // We have a fully cached result for this query then we can just return the
+    // cached results and populate the visited set.  However, we have to verify
+    // that we don't already have conflicting results for these blocks.  Check
+    // to ensure that if a block in the results set is in the visited set that
+    // it was for the same pointer query.
+    if (!Visited.empty()) {
+      for (NonLocalDepInfo::iterator I = Cache->begin(), E = Cache->end();
+           I != E; ++I) {
+        DenseMap<BasicBlock*, Value*>::iterator VI = Visited.find(I->first);
+        if (VI == Visited.end() || VI->second == Pointer) continue;
+        
+        // We have a pointer mismatch in a block.  Just return clobber, saying
+        // that something was clobbered in this result.  We could also do a
+        // non-fully cached query, but there is little point in doing this.
+        return true;
+      }
+    }
+    
     for (NonLocalDepInfo::iterator I = Cache->begin(), E = Cache->end();
-         I != E; ++I)
+         I != E; ++I) {
+      Visited.insert(std::make_pair(I->first, Pointer));
       if (!I->second.isNonLocal())
         Result.push_back(*I);
+    }
     ++NumCacheCompleteNonLocalPtr;
     return false;
   }

Added: llvm/trunk/test/Transforms/GVN/2008-12-15-CacheVisited.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GVN/2008-12-15-CacheVisited.ll?rev=61080&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/GVN/2008-12-15-CacheVisited.ll (added)
+++ llvm/trunk/test/Transforms/GVN/2008-12-15-CacheVisited.ll Tue Dec 16 01:10:09 2008
@@ -0,0 +1,28 @@
+; RUN: llvm-as < %s | opt -gvn | llvm-dis
+; Cached results must be added to and verified against the visited sets.
+; PR3217
+
+define fastcc void @gen_field_die(i32* %decl) nounwind {
+entry:
+	br i1 false, label %bb203, label %bb202
+
+bb202:		; preds = %entry
+	unreachable
+
+bb203:		; preds = %entry
+	%tmp = getelementptr i32* %decl, i32 1		; <i32*> [#uses=1]
+	%tmp1 = load i32* %tmp, align 4		; <i32> [#uses=0]
+	br i1 false, label %bb207, label %bb204
+
+bb204:		; preds = %bb203
+	%tmp2 = getelementptr i32* %decl, i32 1		; <i32*> [#uses=1]
+	br label %bb208
+
+bb207:		; preds = %bb203
+	br label %bb208
+
+bb208:		; preds = %bb207, %bb204
+	%iftmp.1374.0.in = phi i32* [ null, %bb207 ], [ %tmp2, %bb204 ]		; <i32*> [#uses=1]
+	%iftmp.1374.0 = load i32* %iftmp.1374.0.in		; <i32> [#uses=0]
+	unreachable
+}




From sabre at nondot.org  Tue Dec 16 01:34:31 2008
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 16 Dec 2008 07:34:31 -0000
Subject: [llvm-commits] [llvm] r61081 -
	/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
Message-ID: <200812160734.mBG7YVxr020938@zion.cs.uiuc.edu>

Author: lattner
Date: Tue Dec 16 01:34:30 2008
New Revision: 61081

URL: http://llvm.org/viewvc/llvm-project?rev=61081&view=rev
Log:
switch some std::set/std::map to SmallPtrSet/DenseMap.

Modified:
    llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp

Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=61081&r1=61080&r2=61081&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Tue Dec 16 01:34:30 2008
@@ -29,13 +29,12 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Support/MathExtras.h"
+#include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/StringExtras.h"
 #include <algorithm>
-#include <map>
-#include <set>
 using namespace llvm;
 
 STATISTIC(NumMarked    , "Number of globals marked constant");
@@ -155,7 +154,7 @@
 /// can't do anything with it.
 ///
 static bool AnalyzeGlobal(Value *V, GlobalStatus &GS,
-                          std::set<PHINode*> &PHIUsers) {
+                          SmallPtrSet<PHINode*, 16> &PHIUsers) {
   for (Value::use_iterator UI = V->use_begin(), E = V->use_end(); UI != E; ++UI)
     if (ConstantExpr *CE = dyn_cast<ConstantExpr>(*UI)) {
       GS.HasNonInstructionUser = true;
@@ -213,7 +212,7 @@
       } else if (PHINode *PN = dyn_cast<PHINode>(I)) {
         // PHI nodes we can check just like select or GEP instructions, but we
         // have to be careful about infinite recursion.
-        if (PHIUsers.insert(PN).second)  // Not already visited.
+        if (PHIUsers.insert(PN))  // Not already visited.
           if (AnalyzeGlobal(I, GS, PHIUsers)) return true;
         GS.HasPHIUser = true;
       } else if (isa<CmpInst>(I)) {
@@ -1515,7 +1514,7 @@
 /// it if possible.  If we make a change, return true.
 bool GlobalOpt::ProcessInternalGlobal(GlobalVariable *GV,
                                       Module::global_iterator &GVI) {
-  std::set<PHINode*> PHIUsers;
+  SmallPtrSet<PHINode*, 16> PHIUsers;
   GlobalStatus GS;
   GV->removeDeadConstantUsers();
 
@@ -1868,7 +1867,7 @@
 }
 
 
-static Constant *getVal(std::map<Value*, Constant*> &ComputedValues,
+static Constant *getVal(DenseMap<Value*, Constant*> &ComputedValues,
                         Value *V) {
   if (Constant *CV = dyn_cast<Constant>(V)) return CV;
   Constant *R = ComputedValues[V];
@@ -1984,10 +1983,10 @@
 /// P after the stores reflected by 'memory' have been performed.  If we can't
 /// decide, return null.
 static Constant *ComputeLoadResult(Constant *P,
-                                const std::map<Constant*, Constant*> &Memory) {
+                                const DenseMap<Constant*, Constant*> &Memory) {
   // If this memory location has been recently stored, use the stored value: it
   // is the most up-to-date.
-  std::map<Constant*, Constant*>::const_iterator I = Memory.find(P);
+  DenseMap<Constant*, Constant*>::const_iterator I = Memory.find(P);
   if (I != Memory.end()) return I->second;
  
   // Access it.
@@ -2015,7 +2014,7 @@
 static bool EvaluateFunction(Function *F, Constant *&RetVal,
                              const std::vector<Constant*> &ActualArgs,
                              std::vector<Function*> &CallStack,
-                             std::map<Constant*, Constant*> &MutatedMemory,
+                             DenseMap<Constant*, Constant*> &MutatedMemory,
                              std::vector<GlobalVariable*> &AllocaTmps) {
   // Check to see if this function is already executing (recursion).  If so,
   // bail out.  TODO: we might want to accept limited recursion.
@@ -2025,7 +2024,7 @@
   CallStack.push_back(F);
   
   /// Values - As we compute SSA register values, we store their contents here.
-  std::map<Value*, Constant*> Values;
+  DenseMap<Value*, Constant*> Values;
   
   // Initialize arguments to the incoming values specified.
   unsigned ArgNo = 0;
@@ -2036,7 +2035,7 @@
   /// ExecutedBlocks - We only handle non-looping, non-recursive code.  As such,
   /// we can only evaluate any one basic block at most once.  This set keeps
   /// track of what we have executed so we can detect recursive cases etc.
-  std::set<BasicBlock*> ExecutedBlocks;
+  SmallPtrSet<BasicBlock*, 32> ExecutedBlocks;
   
   // CurInst - The current instruction we're evaluating.
   BasicBlock::iterator CurInst = F->begin()->begin();
@@ -2153,7 +2152,7 @@
       // Okay, we succeeded in evaluating this control flow.  See if we have
       // executed the new block before.  If so, we have a looping function,
       // which we cannot evaluate in reasonable time.
-      if (!ExecutedBlocks.insert(NewBB).second)
+      if (!ExecutedBlocks.insert(NewBB))
         return false;  // looped!
       
       // Okay, we have never been in this block before.  Check to see if there
@@ -2186,7 +2185,7 @@
   /// MutatedMemory - For each store we execute, we update this map.  Loads
   /// check this to get the most up-to-date value.  If evaluation is successful,
   /// this state is committed to the process.
-  std::map<Constant*, Constant*> MutatedMemory;
+  DenseMap<Constant*, Constant*> MutatedMemory;
 
   /// AllocaTmps - To 'execute' an alloca, we create a temporary global variable
   /// to represent its body.  This vector is needed so we can delete the
@@ -2207,7 +2206,7 @@
     DOUT << "FULLY EVALUATED GLOBAL CTOR FUNCTION '"
          << F->getName() << "' to " << MutatedMemory.size()
          << " stores.\n";
-    for (std::map<Constant*, Constant*>::iterator I = MutatedMemory.begin(),
+    for (DenseMap<Constant*, Constant*>::iterator I = MutatedMemory.begin(),
          E = MutatedMemory.end(); I != E; ++I)
       CommitValueTo(I->second, I->first);
   }




From baldrick at free.fr  Tue Dec 16 02:01:49 2008
From: baldrick at free.fr (Duncan Sands)
Date: Tue, 16 Dec 2008 09:01:49 +0100
Subject: [llvm-commits] [llvm] r61019 - in /llvm/trunk:
	docs/AliasAnalysis.html docs/LangRef.html
	include/llvm/Attributes.h lib/AsmParser/LLLexer.cpp
	lib/AsmParser/llvmAsmParser.y lib/Bitcode/Reader/BitcodeReader.cpp
	lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Attributes.cpp
In-Reply-To: <49473BFF.5000406@mxc.ca>
References: <200812150134.mBF1YxKZ015699@zion.cs.uiuc.edu>
	<200812151157.35229.baldrick@free.fr> <49473BFF.5000406@mxc.ca>
Message-ID: <200812160901.50071.baldrick@free.fr>

Hi Nick,

> > I think you should mention that callee does not copy even one bit.  Because if
> > it is allowed to, it is easy to construct examples where the whole pointer value
> > escapes through multiple calls.
> 
> It's not allowed to. The pointer can be used, copied, etc., as much as 
> you want by the callee and its tree of callees, so long as not one bit 
> of the pointer is after the call has completed (so the copies made must 
> be destroyed before returning).

yes, that's what I meant.

> I'm not sure I want to go into such detail in the LangRef. I think that 
> if somebody really does write a function that leaks 1 bit of a pointer, 
> marks it nocapture, then calls it in a loop, reconstitutes a pointer and 
> makes a program that miscompiles, we can inform them that they have 
> misused nocapture.

:)

> It's esoteric enough that I think explaining it in the LangRef will lead 
> to more confusion, not more understanding. If you can come up with 
> wording that would clarify the intent I think that'd be great, but I 
> don't think it's needed.

I agree.

Ciao,

Duncan.


From nicholas at mxc.ca  Tue Dec 16 02:30:09 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Tue, 16 Dec 2008 08:30:09 -0000
Subject: [llvm-commits] [llvm] r61082 - in /llvm/trunk:
 lib/Analysis/ScalarEvolution.cpp
 test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll
 test/Analysis/ScalarEvolution/2008-12-11-SMaxOverflow.ll
 test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll
 test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll
Message-ID: <200812160830.mBG8U9W8022687@zion.cs.uiuc.edu>

Author: nicholas
Date: Tue Dec 16 02:30:01 2008
New Revision: 61082

URL: http://llvm.org/viewvc/llvm-project?rev=61082&view=rev
Log:
Generalize support for analyzing loops to include SLE/SGE loop exit conditions
and support for non-unit strides with signed exit conditions.

Added:
    llvm/trunk/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll
    llvm/trunk/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll
Modified:
    llvm/trunk/lib/Analysis/ScalarEvolution.cpp
    llvm/trunk/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll
    llvm/trunk/test/Analysis/ScalarEvolution/2008-12-11-SMaxOverflow.ll

Modified: llvm/trunk/lib/Analysis/ScalarEvolution.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ScalarEvolution.cpp?rev=61082&r1=61081&r2=61082&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/ScalarEvolution.cpp (original)
+++ llvm/trunk/lib/Analysis/ScalarEvolution.cpp Tue Dec 16 02:30:01 2008
@@ -2924,15 +2924,16 @@
   if (!R)
     return true;
 
-  if (isSigned)
-    return true;  // XXX: because we don't have an sdiv scev.
-
   // If negative, it wraps around every iteration, but we don't care about that.
   APInt S = SC->getValue()->getValue().abs();
 
-  APInt Dist = APInt::getMaxValue(R->getValue()->getBitWidth()) -
-               R->getValue()->getValue();
+  uint32_t Width = R->getValue()->getBitWidth();
+  APInt Dist = (isSigned ? APInt::getSignedMaxValue(Width)
+                         : APInt::getMaxValue(Width))
+               - R->getValue()->getValue();
 
+  // Because we're looking at distance, we perform an unsigned comparison,
+  // regardless of the sign of the computation.
   if (trueWhenEqual)
     return !S.ult(Dist);
   else
@@ -2961,24 +2962,15 @@
     // m.  So, we count the number of iterations in which {n,+,s} < m is true.
     // Note that we cannot simply return max(m-n,0)/s because it's not safe to
     // treat m-n as signed nor unsigned due to overflow possibility.
+    //
+    // Assuming that the loop will run at least once, we know that it will
+    // run (m-n)/s times.
 
     // First, we get the value of the LHS in the first iteration: n
     SCEVHandle Start = AddRec->getOperand(0);
 
     SCEVHandle One = SE.getIntegerSCEV(1, RHS->getType());
 
-    // Assuming that the loop will run at least once, we know that it will
-    // run (m-n)/s times.
-    SCEVHandle End = RHS;
-
-    if (!executesAtLeastOnce(L, isSigned, trueWhenEqual,
-                             SE.getMinusSCEV(Start, One), RHS)) {
-      // If not, we get the value of the LHS in the first iteration in which
-      // the above condition doesn't hold.  This equals to max(m,n).
-      End = isSigned ? SE.getSMaxExpr(RHS, Start)
-                     : SE.getUMaxExpr(RHS, Start);
-    }
-
     // If the expression is less-than-or-equal to, we need to extend the
     // loop by one iteration.
     //
@@ -2986,16 +2978,23 @@
     // might not divide cleanly. For example, if you have {2,+,5} u< 10 the
     // division would equal one, but the loop runs twice putting the
     // induction variable at 12.
-
+    SCEVHandle End = SE.getAddExpr(RHS, Stride);
     if (!trueWhenEqual)
-      // (Stride - 1) is correct only because we know it's unsigned.
-      // What we really want is to decrease the magnitude of Stride by one.
-      Start = SE.getMinusSCEV(Start, SE.getMinusSCEV(Stride, One));
-    else
-      Start = SE.getMinusSCEV(Start, Stride);
+      End = SE.getMinusSCEV(End, One);
+
+    if (!executesAtLeastOnce(L, isSigned, trueWhenEqual,
+                             SE.getMinusSCEV(Start, One), RHS)) {
+      // If not, we get the value of the LHS in the first iteration in which
+      // the above condition doesn't hold.  This equals to max(m,n).
+      End = isSigned ? SE.getSMaxExpr(End, Start)
+                     : SE.getUMaxExpr(End, Start);
+    }
 
     // Finally, we subtract these two values to get the number of times the
-    // backedge is executed: max(m,n)-n.
+    // backedge is executed: (max(m,n)-n)/s.
+    //
+    // Note that a trip count is always positive. Using SDiv here produces
+    // wrong answers when Start < End.
     return SE.getUDivExpr(SE.getMinusSCEV(End, Start), Stride);
   }
 

Modified: llvm/trunk/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll?rev=61082&r1=61081&r2=61082&view=diff

==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2008-12-08-FiniteSGE.ll Tue Dec 16 02:30:01 2008
@@ -1,5 +1,4 @@
 ; RUN: llvm-as < %s | opt -analyze -scalar-evolution | grep {255 iterations}
-; XFAIL: *
 
 define i32 @foo(i32 %x, i32 %y, i32* %lam, i32* %alp) nounwind {
 bb1.thread:

Modified: llvm/trunk/test/Analysis/ScalarEvolution/2008-12-11-SMaxOverflow.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2008-12-11-SMaxOverflow.ll?rev=61082&r1=61081&r2=61082&view=diff

==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2008-12-11-SMaxOverflow.ll (original)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2008-12-11-SMaxOverflow.ll Tue Dec 16 02:30:01 2008
@@ -1,5 +1,4 @@
 ; RUN: llvm-as < %s | opt -analyze -scalar-evolution | grep {0 smax}
-; XFAIL: *
 
 define i32 @f(i32 %c.idx.val) {
 

Added: llvm/trunk/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll?rev=61082&view=auto

==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll (added)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2008-12-14-StrideAndSigned.ll Tue Dec 16 02:30:01 2008
@@ -0,0 +1,21 @@
+; RUN: llvm-as < %s | opt -analyze -scalar-evolution |& \
+; RUN: grep {(((-1 \\* %i0) + (100005 smax %i0)) /u 5)}
+
+define i32 @foo0(i32 %i0) nounwind {
+entry:
+	br label %bb1
+
+bb:		; preds = %bb1
+	%0 = add i32 %j.0, 1		; <i32> [#uses=1]
+	%1 = add i32 %i.0, 5		; <i32> [#uses=1]
+	br label %bb1
+
+bb1:		; preds = %bb, %entry
+	%j.0 = phi i32 [ 0, %entry ], [ %0, %bb ]		; <i32> [#uses=2]
+	%i.0 = phi i32 [ %i0, %entry ], [ %1, %bb ]		; <i32> [#uses=2]
+	%2 = icmp sgt i32 %i.0, 100000		; <i1> [#uses=1]
+	br i1 %2, label %return, label %bb
+
+return:		; preds = %bb1
+	ret i32 %j.0
+}

Added: llvm/trunk/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll?rev=61082&view=auto

==============================================================================
--- llvm/trunk/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll (added)
+++ llvm/trunk/test/Analysis/ScalarEvolution/2008-12-15-DontUseSDiv.ll Tue Dec 16 02:30:01 2008
@@ -0,0 +1,20 @@
+; RUN: llvm-as < %s | opt -analyze -scalar-evolution |& grep {/u 5}
+
+define i8 @foo0(i8 %i0) nounwind {
+entry:
+	br label %bb1
+
+bb:		; preds = %bb1
+	%0 = add i8 %j.0, 1		; <i8> [#uses=1]
+	%1 = add i8 %i.0, 5		; <i8> [#uses=1]
+	br label %bb1
+
+bb1:		; preds = %bb, %entry
+	%j.0 = phi i8 [ 0, %entry ], [ %0, %bb ]		; <i8> [#uses=2]
+	%i.0 = phi i8 [ %i0, %entry ], [ %1, %bb ]		; <i8> [#uses=2]
+	%2 = icmp sgt i8 %i.0, 100		; <i1> [#uses=1]
+	br i1 %2, label %return, label %bb
+
+return:		; preds = %bb1
+	ret i8 %j.0
+}




From isanbard at gmail.com  Tue Dec 16 02:37:42 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Dec 2008 00:37:42 -0800
Subject: [llvm-commits] [llvm] r61030 - in /llvm/trunk:
	include/llvm/Attributes.h lib/AsmParser/llvmAsmParser.y
	lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Attributes.cpp
In-Reply-To: <200812150729.mBF7Ttg3027174@zion.cs.uiuc.edu>
References: <200812150729.mBF7Ttg3027174@zion.cs.uiuc.edu>
Message-ID: <C67C9844-2D24-478A-B7A7-FF9BE4D72C23@gmail.com>

Nick,

You patch r61019 is causing a bootstrap failure on PPC. Here's the  
minimal testcase and the error:

$ cat testcase.i
struct S {
   unsigned long long f1;
   unsigned long long f2;
};
static void func2(struct S);
void func1() {
   struct S a;
   func2(a);
}

$ Volumes/SandBox/NightlyTest/test/llvm-gcc.obj/./prev-gcc/xgcc -B/ 
Volumes/SandBox/NightlyTest/test/llvm\
-gcc.obj/./prev-gcc/ -B/Volumes/SandBox/NightlyTest/test/llvm- 
gcc.install/powerpc-apple-darwin9.5.0/bin\
/ -c testcase.i
bash-3.2$ bash-3.2$ Assertion failed: (isPowerOf2_32(i) && "Alignment  
must be a power of two."), functi\
on constructAlignmentFromInt, file /Volumes/SandBox/NightlyTest/test/ 
llvm.src/include/llvm/Attributes.h\
, line 81.
testcase.i: In function 'func1':
testcase.i:6: internal compiler error: Abort trap
Please submit a full bug report,
with preprocessed source if appropriate.
See <URL:http://developer.apple.com/bugreporter> for instructions.

Unfortunately, this occurs in the front-end, so I can't create a .bc  
file. Here is the backtrace:

(gdb) bt
#0  0x95bfd278 in abort ()
#1  0x95bec904 in __assert_rtn ()
#2  0x0093396c in llvm::Attribute::constructAlignmentFromInt ()
#3  0x00862a6c in DefaultABI<(anonymous  
namespace)::FunctionTypeConversion>::HandleArgument ()
#4  0x0084b4ec in TypeConverter::ConvertFunctionType ()
#5  0x007cf6fc in make_decl_llvm ()
#6  0x007e3790 in llvm_get_decl ()
#7  0x007e6fe0 in TreeToLLVM::EmitLV_DECL ()
#8  0x00816dcc in TreeToLLVM::EmitLV ()
#9  0x0081e7fc in TreeToLLVM::EmitADDR_EXPR ()
#10 0x00802734 in TreeToLLVM::Emit ()
#11 0x00801988 in TreeToLLVM::EmitCALL_EXPR ()
#12 0x00802750 in TreeToLLVM::Emit ()
#13 0x0081f558 in TreeToLLVM::EmitFunction ()
#14 0x007d22a4 in llvm_emit_code_for_current_function ()
#15 0x0018c3a8 in tree_rest_of_compilation ()
#16 0x0002d9bc in c_expand_body ()
#17 0x008df4dc in cgraph_expand_function ()
#18 0x008dba94 in cgraph_assemble_pending_functions ()
#19 0x008dc01c in cgraph_finalize_function ()
#20 0x0002d854 in finish_function ()
#21 0x000d88a0 in c_parser_declaration_or_fndef ()
#22 0x000d7afc in c_parser_external_declaration ()
#23 0x000d7968 in c_parser_translation_unit ()
#24 0x000eb214 in c_parse_file ()
#25 0x000c35dc in c_common_parse_file ()
#26 0x0070688c in compile_file ()
#27 0x007095e0 in do_compile ()
#28 0x00709680 in toplev_main ()
#29 0x0010b308 in main ()

Could you back-out your changes and investigate?

-bw

On Dec 14, 2008, at 11:29 PM, Nick Lewycky wrote:

> Author: nicholas
> Date: Mon Dec 15 01:29:55 2008
> New Revision: 61030
>
> URL: http://llvm.org/viewvc/llvm-project?rev=61030&view=rev
> Log:
> It turns out that "align 1" and unaligned are different. Add a bias  
> to the
> alignment attribute such that 0 means unaligned.
>
> This will probably require a rebuild of llvm-gcc because of the  
> change to
> Attributes.h. If you see many test failures on "make check", please  
> rebuild
> your llvm-gcc.
>
> Modified:
>    llvm/trunk/include/llvm/Attributes.h
>    llvm/trunk/lib/AsmParser/llvmAsmParser.y
>    llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
>    llvm/trunk/lib/VMCore/Attributes.cpp
>
> Modified: llvm/trunk/include/llvm/Attributes.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=61030&r1=61029&r2=61030&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/Attributes.h (original)
> +++ llvm/trunk/include/llvm/Attributes.h Mon Dec 15 01:29:55 2008
> @@ -51,7 +51,8 @@
> const Attributes StackProtect    = 1<<14; ///< Stack protection.
> const Attributes StackProtectReq = 1<<15; ///< Stack protection  
> required.
> const Attributes Alignment = 31<<16; ///< Alignment of parameter (5  
> bits)
> -                                     // stored as log2 of alignment.
> +                                     // stored as log2 of alignment  
> with +1 bias
> +                                     // 0 means unaligned different  
> from align 1
> const Attributes NoCapture = 1<<21; ///< Function creates no aliases  
> of pointer
>
> /// @brief Attributes that only apply to function parameters.
> @@ -79,7 +80,8 @@
> /// form used internally in Attributes.
> inline Attributes constructAlignmentFromInt(unsigned i) {
>   assert(isPowerOf2_32(i) && "Alignment must be a power of two.");
> -  return Log2_32(i) << 16;
> +  assert(i <= 0x40000000 && "Alignment too large.");
> +  return (Log2_32(i)+1) << 16;
> }
>
> /// The set of Attributes set in Attributes is converted to a
> @@ -178,7 +180,7 @@
>   /// getParamAlignment - Return the alignment for the specified  
> function
>   /// parameter.
>   unsigned getParamAlignment(unsigned Idx) const {
> -    return (getAttributes(Idx) & Attribute::Alignment) >> 16;
> +    return 1ull << (((getAttributes(Idx) & Attribute::Alignment) >>  
> 16) - 1);
>   }
>
>   /// hasAttrSomewhere - Return true if the specified attribute is  
> set for at
>
> Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=61030&r1=61029&r2=61030&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
> +++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Mon Dec 15 01:29:55 2008
> @@ -1332,6 +1332,8 @@
>   $$ = $2;
>   if ($$ != 0 && !isPowerOf2_32($$))
>     GEN_ERROR("Alignment must be a power of two");
> +  if ($$ > 0x40000000)
> +    GEN_ERROR("Alignment too large");
>   CHECK_FOR_ERROR
> };
> OptCAlign : /*empty*/            { $$ = 0; } |
> @@ -1339,6 +1341,8 @@
>   $$ = $3;
>   if ($$ != 0 && !isPowerOf2_32($$))
>     GEN_ERROR("Alignment must be a power of two");
> +  if ($$ > 0x40000000)
> +    GEN_ERROR("Alignment too large");
>   CHECK_FOR_ERROR
> };
>
> @@ -1368,6 +1372,8 @@
>   | ALIGN EUINT64VAL {
>     if ($2 != 0 && !isPowerOf2_32($2))
>       GEN_ERROR("Alignment must be a power of two");
> +    if ($2 > 0x40000000)
> +      GEN_ERROR("Alignment too large");
>     CurGV->setAlignment($2);
>     CHECK_FOR_ERROR
>   };
>
> Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=61030&r1=61029&r2=61030&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
> +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Mon Dec 15  
> 01:29:55 2008
> @@ -128,7 +128,8 @@
>       // 5-bit log2 encoded value. Shift the bits above the  
> alignment up by
>       // 11 bits.
>       uint64_t FauxAttr = PAWI.Attrs & 0xffff;
> -      FauxAttr |= (1ull<<16)<<((PAWI.Attrs & Attribute::Alignment)  
> >> 16);
> +      if (PAWI.Attrs & Attribute::Alignment)
> +        FauxAttr |= (1ull<<16)<<(((PAWI.Attrs &  
> Attribute::Alignment)-1) >> 16);
>       FauxAttr |= (PAWI.Attrs & (0x3FFull << 21)) << 11;
>
>       Record.push_back(FauxAttr);
>
> Modified: llvm/trunk/lib/VMCore/Attributes.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?rev=61030&r1=61029&r2=61030&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/VMCore/Attributes.cpp (original)
> +++ llvm/trunk/lib/VMCore/Attributes.cpp Mon Dec 15 01:29:55 2008
> @@ -61,7 +61,7 @@
>     Result += "sspreq ";
>   if (Attrs & Attribute::Alignment) {
>     Result += "align ";
> -    Result += utostr(1ull << ((Attrs & Attribute::Alignment)>>16));
> +    Result += utostr(1ull << (((Attrs & Attribute::Alignment)>>16)  
> - 1));
>     Result += " ";
>   }
>   // Trim the trailing space.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From nicholas at mxc.ca  Tue Dec 16 02:57:38 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Tue, 16 Dec 2008 00:57:38 -0800
Subject: [llvm-commits] [llvm] r61030 - in
 /llvm/trunk:	include/llvm/Attributes.h
 lib/AsmParser/llvmAsmParser.y	lib/Bitcode/Writer/BitcodeWriter.cpp
 lib/VMCore/Attributes.cpp
In-Reply-To: <C67C9844-2D24-478A-B7A7-FF9BE4D72C23@gmail.com>
References: <200812150729.mBF7Ttg3027174@zion.cs.uiuc.edu>
	<C67C9844-2D24-478A-B7A7-FF9BE4D72C23@gmail.com>
Message-ID: <49476D82.8070609@mxc.ca>

Bill Wendling wrote:
> Nick,
> 
> You patch r61019 is causing a bootstrap failure on PPC. Here's the  
> minimal testcase and the error:
> 
> $ cat testcase.i
> struct S {
>    unsigned long long f1;
>    unsigned long long f2;
> };
> static void func2(struct S);
> void func1() {
>    struct S a;
>    func2(a);
> }
> 
> $ Volumes/SandBox/NightlyTest/test/llvm-gcc.obj/./prev-gcc/xgcc -B/ 
> Volumes/SandBox/NightlyTest/test/llvm\
> -gcc.obj/./prev-gcc/ -B/Volumes/SandBox/NightlyTest/test/llvm- 
> gcc.install/powerpc-apple-darwin9.5.0/bin\
> / -c testcase.i
> bash-3.2$ bash-3.2$ Assertion failed: (isPowerOf2_32(i) && "Alignment  
> must be a power of two."), functi\
> on constructAlignmentFromInt, file /Volumes/SandBox/NightlyTest/test/ 
> llvm.src/include/llvm/Attributes.h\
> , line 81.
> testcase.i: In function 'func1':
> testcase.i:6: internal compiler error: Abort trap
> Please submit a full bug report,
> with preprocessed source if appropriate.
> See <URL:http://developer.apple.com/bugreporter> for instructions.
> 
> Unfortunately, this occurs in the front-end, so I can't create a .bc  
> file. Here is the backtrace:
> 
> (gdb) bt
> #0  0x95bfd278 in abort ()
> #1  0x95bec904 in __assert_rtn ()
> #2  0x0093396c in llvm::Attribute::constructAlignmentFromInt ()
> #3  0x00862a6c in DefaultABI<(anonymous  
> namespace)::FunctionTypeConversion>::HandleArgument ()
> #4  0x0084b4ec in TypeConverter::ConvertFunctionType ()
> #5  0x007cf6fc in make_decl_llvm ()
> #6  0x007e3790 in llvm_get_decl ()
> #7  0x007e6fe0 in TreeToLLVM::EmitLV_DECL ()
> #8  0x00816dcc in TreeToLLVM::EmitLV ()
> #9  0x0081e7fc in TreeToLLVM::EmitADDR_EXPR ()
> #10 0x00802734 in TreeToLLVM::Emit ()
> #11 0x00801988 in TreeToLLVM::EmitCALL_EXPR ()
> #12 0x00802750 in TreeToLLVM::Emit ()
> #13 0x0081f558 in TreeToLLVM::EmitFunction ()
> #14 0x007d22a4 in llvm_emit_code_for_current_function ()
> #15 0x0018c3a8 in tree_rest_of_compilation ()
> #16 0x0002d9bc in c_expand_body ()
> #17 0x008df4dc in cgraph_expand_function ()
> #18 0x008dba94 in cgraph_assemble_pending_functions ()
> #19 0x008dc01c in cgraph_finalize_function ()
> #20 0x0002d854 in finish_function ()
> #21 0x000d88a0 in c_parser_declaration_or_fndef ()
> #22 0x000d7afc in c_parser_external_declaration ()
> #23 0x000d7968 in c_parser_translation_unit ()
> #24 0x000eb214 in c_parse_file ()
> #25 0x000c35dc in c_common_parse_file ()
> #26 0x0070688c in compile_file ()
> #27 0x007095e0 in do_compile ()
> #28 0x00709680 in toplev_main ()
> #29 0x0010b308 in main ()
> 
> Could you back-out your changes and investigate?

I'll do that if we can't resolve this quickly, but it's complicated by 
the fact that other patches have already gone in which depend on this 
one. I think it's just r61019 r61030 r61040 so far.

The crash you pasted should only happen if there's a mismatch between 
LLVM and llvm-gcc versions. To be exact, it looks like llvm-gcc was 
picking up the newer Attribute.h from LLVM, while still linking against 
an older version of the LLVM libraries (perhaps installed in the system?).

Could you please check to make sure that's not the case? If you're sure, 
I'll be happy to go ahead and back this change out (or you can do it if 
you like), but I want to be sure firts.

Nick

> -bw
> 
> On Dec 14, 2008, at 11:29 PM, Nick Lewycky wrote:
> 
>> Author: nicholas
>> Date: Mon Dec 15 01:29:55 2008
>> New Revision: 61030
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=61030&view=rev
>> Log:
>> It turns out that "align 1" and unaligned are different. Add a bias  
>> to the
>> alignment attribute such that 0 means unaligned.
>>
>> This will probably require a rebuild of llvm-gcc because of the  
>> change to
>> Attributes.h. If you see many test failures on "make check", please  
>> rebuild
>> your llvm-gcc.
>>
>> Modified:
>>    llvm/trunk/include/llvm/Attributes.h
>>    llvm/trunk/lib/AsmParser/llvmAsmParser.y
>>    llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
>>    llvm/trunk/lib/VMCore/Attributes.cpp
>>
>> Modified: llvm/trunk/include/llvm/Attributes.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=61030&r1=61029&r2=61030&view=diff
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> ======================================================================
>> --- llvm/trunk/include/llvm/Attributes.h (original)
>> +++ llvm/trunk/include/llvm/Attributes.h Mon Dec 15 01:29:55 2008
>> @@ -51,7 +51,8 @@
>> const Attributes StackProtect    = 1<<14; ///< Stack protection.
>> const Attributes StackProtectReq = 1<<15; ///< Stack protection  
>> required.
>> const Attributes Alignment = 31<<16; ///< Alignment of parameter (5  
>> bits)
>> -                                     // stored as log2 of alignment.
>> +                                     // stored as log2 of alignment  
>> with +1 bias
>> +                                     // 0 means unaligned different  
>> from align 1
>> const Attributes NoCapture = 1<<21; ///< Function creates no aliases  
>> of pointer
>>
>> /// @brief Attributes that only apply to function parameters.
>> @@ -79,7 +80,8 @@
>> /// form used internally in Attributes.
>> inline Attributes constructAlignmentFromInt(unsigned i) {
>>   assert(isPowerOf2_32(i) && "Alignment must be a power of two.");
>> -  return Log2_32(i) << 16;
>> +  assert(i <= 0x40000000 && "Alignment too large.");
>> +  return (Log2_32(i)+1) << 16;
>> }
>>
>> /// The set of Attributes set in Attributes is converted to a
>> @@ -178,7 +180,7 @@
>>   /// getParamAlignment - Return the alignment for the specified  
>> function
>>   /// parameter.
>>   unsigned getParamAlignment(unsigned Idx) const {
>> -    return (getAttributes(Idx) & Attribute::Alignment) >> 16;
>> +    return 1ull << (((getAttributes(Idx) & Attribute::Alignment) >>  
>> 16) - 1);
>>   }
>>
>>   /// hasAttrSomewhere - Return true if the specified attribute is  
>> set for at
>>
>> Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=61030&r1=61029&r2=61030&view=diff
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> ======================================================================
>> --- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
>> +++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Mon Dec 15 01:29:55 2008
>> @@ -1332,6 +1332,8 @@
>>   $$ = $2;
>>   if ($$ != 0 && !isPowerOf2_32($$))
>>     GEN_ERROR("Alignment must be a power of two");
>> +  if ($$ > 0x40000000)
>> +    GEN_ERROR("Alignment too large");
>>   CHECK_FOR_ERROR
>> };
>> OptCAlign : /*empty*/            { $$ = 0; } |
>> @@ -1339,6 +1341,8 @@
>>   $$ = $3;
>>   if ($$ != 0 && !isPowerOf2_32($$))
>>     GEN_ERROR("Alignment must be a power of two");
>> +  if ($$ > 0x40000000)
>> +    GEN_ERROR("Alignment too large");
>>   CHECK_FOR_ERROR
>> };
>>
>> @@ -1368,6 +1372,8 @@
>>   | ALIGN EUINT64VAL {
>>     if ($2 != 0 && !isPowerOf2_32($2))
>>       GEN_ERROR("Alignment must be a power of two");
>> +    if ($2 > 0x40000000)
>> +      GEN_ERROR("Alignment too large");
>>     CurGV->setAlignment($2);
>>     CHECK_FOR_ERROR
>>   };
>>
>> Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=61030&r1=61029&r2=61030&view=diff
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> ======================================================================
>> --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
>> +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Mon Dec 15  
>> 01:29:55 2008
>> @@ -128,7 +128,8 @@
>>       // 5-bit log2 encoded value. Shift the bits above the  
>> alignment up by
>>       // 11 bits.
>>       uint64_t FauxAttr = PAWI.Attrs & 0xffff;
>> -      FauxAttr |= (1ull<<16)<<((PAWI.Attrs & Attribute::Alignment)  
>>>> 16);
>> +      if (PAWI.Attrs & Attribute::Alignment)
>> +        FauxAttr |= (1ull<<16)<<(((PAWI.Attrs &  
>> Attribute::Alignment)-1) >> 16);
>>       FauxAttr |= (PAWI.Attrs & (0x3FFull << 21)) << 11;
>>
>>       Record.push_back(FauxAttr);
>>
>> Modified: llvm/trunk/lib/VMCore/Attributes.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?rev=61030&r1=61029&r2=61030&view=diff
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> ======================================================================
>> --- llvm/trunk/lib/VMCore/Attributes.cpp (original)
>> +++ llvm/trunk/lib/VMCore/Attributes.cpp Mon Dec 15 01:29:55 2008
>> @@ -61,7 +61,7 @@
>>     Result += "sspreq ";
>>   if (Attrs & Attribute::Alignment) {
>>     Result += "align ";
>> -    Result += utostr(1ull << ((Attrs & Attribute::Alignment)>>16));
>> +    Result += utostr(1ull << (((Attrs & Attribute::Alignment)>>16)  
>> - 1));
>>     Result += " ";
>>   }
>>   // Trim the trailing space.
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> 



From edwintorok at gmail.com  Tue Dec 16 03:06:03 2008
From: edwintorok at gmail.com (Torok Edwin)
Date: Tue, 16 Dec 2008 09:06:03 -0000
Subject: [llvm-commits] [llvm] r61083 -
	/llvm/trunk/lib/Analysis/DebugInfo.cpp
Message-ID: <200812160906.mBG964cL030991@zion.cs.uiuc.edu>

Author: edwin
Date: Tue Dec 16 03:06:01 2008
New Revision: 61083

URL: http://llvm.org/viewvc/llvm-project?rev=61083&view=rev
Log:
use different name for parameter to make it clear that we set DIDescriptor::GV

Modified:
    llvm/trunk/lib/Analysis/DebugInfo.cpp

Modified: llvm/trunk/lib/Analysis/DebugInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DebugInfo.cpp?rev=61083&r1=61082&r2=61083&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/DebugInfo.cpp (original)
+++ llvm/trunk/lib/Analysis/DebugInfo.cpp Tue Dec 16 03:06:01 2008
@@ -101,8 +101,8 @@
 DIBlock::DIBlock(GlobalVariable *GV)
   : DIDescriptor(GV, dwarf::DW_TAG_lexical_block) {}
 // needed by DIVariable::getType()
-DIType::DIType(GlobalVariable *GV) : DIDescriptor(GV) {
-  if (!GV) return;
+DIType::DIType(GlobalVariable *gv) : DIDescriptor(gv) {
+  if (!gv) return;
   unsigned tag = getTag();
   if (tag != dwarf::DW_TAG_base_type && !DIDerivedType::isDerivedType(tag) &&
       !DICompositeType::isCompositeType(tag))




From edwintorok at gmail.com  Tue Dec 16 03:07:36 2008
From: edwintorok at gmail.com (Torok Edwin)
Date: Tue, 16 Dec 2008 09:07:36 -0000
Subject: [llvm-commits] [llvm] r61084 - in /llvm/trunk:
 include/llvm/Analysis/DebugInfo.h lib/Analysis/DebugInfo.cpp
Message-ID: <200812160907.mBG97bKm031340@zion.cs.uiuc.edu>

Author: edwin
Date: Tue Dec 16 03:07:36 2008
New Revision: 61084

URL: http://llvm.org/viewvc/llvm-project?rev=61084&view=rev
Log:
Add utility functions to search for DbgStopPointInst corresponding to an
instruction or BasicBlock, and to search for DbgDeclareInst corresponding to a
variable.

Modified:
    llvm/trunk/include/llvm/Analysis/DebugInfo.h
    llvm/trunk/lib/Analysis/DebugInfo.cpp

Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DebugInfo.h?rev=61084&r1=61083&r2=61084&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Analysis/DebugInfo.h (original)
+++ llvm/trunk/include/llvm/Analysis/DebugInfo.h Tue Dec 16 03:07:36 2008
@@ -26,6 +26,9 @@
   class Module;
   class Type;
   class Value;
+  class DbgStopPointInst;
+  class DbgDeclareInst;
+  class Instruction;
   
   class DIDescriptor {
   public:
@@ -388,7 +391,17 @@
     Constant *getCastToEmpty(DIDescriptor D);
   };
   
-  
+  /// Finds the stoppoint coressponding to this instruction, that is the
+  /// stoppoint that dominates this instruction 
+  const DbgStopPointInst *findStopPoint(const Instruction *Inst);
+
+  /// Finds the stoppoint corresponding to first real (non-debug intrinsic) 
+  /// instruction in this Basic Block, and returns the stoppoint for it.
+  const DbgStopPointInst *findBBStopPoint(const BasicBlock *BB);
+
+  /// Finds the dbg.declare intrinsic corresponding to this value if any.
+  /// It looks through pointer casts too.
+  const DbgDeclareInst *findDbgDeclare(const Value *V, bool stripCasts = true);
 } // end namespace llvm
 
 #endif

Modified: llvm/trunk/lib/Analysis/DebugInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DebugInfo.cpp?rev=61084&r1=61083&r2=61084&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/DebugInfo.cpp (original)
+++ llvm/trunk/lib/Analysis/DebugInfo.cpp Tue Dec 16 03:07:36 2008
@@ -16,6 +16,7 @@
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/Intrinsics.h"
+#include "llvm/IntrinsicInst.h"
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"
 #include "llvm/Analysis/ValueTracking.h"
@@ -669,3 +670,75 @@
   Value *Args[] = { Storage, getCastToEmpty(D) };
   CallInst::Create(DeclareFn, Args, Args+2, "", BB);
 }
+
+namespace llvm {
+  /// Finds the stoppoint coressponding to this instruction, that is the
+  /// stoppoint that dominates this instruction 
+  const DbgStopPointInst *findStopPoint(const Instruction *Inst)
+  {
+    if (const DbgStopPointInst *DSI = dyn_cast<DbgStopPointInst>(Inst))
+      return DSI;
+
+    const BasicBlock *BB = Inst->getParent();
+    BasicBlock::const_iterator I = Inst, B;
+    do {
+      B = BB->begin();
+      // A BB consisting only of a terminator can't have a stoppoint.
+      if (I != B) {
+        do {
+          --I;
+          if (const DbgStopPointInst *DSI = dyn_cast<DbgStopPointInst>(I))
+            return DSI;
+        } while (I != B);
+      }
+      // This BB didn't have a stoppoint: if there is only one
+      // predecessor, look for a stoppoint there.
+      // We could use getIDom(), but that would require dominator info.
+      BB = I->getParent()->getUniquePredecessor();
+      if (BB)
+        I = BB->getTerminator();
+    } while (BB != 0);
+    return 0;
+  }
+
+  /// Finds the stoppoint corresponding to first real (non-debug intrinsic) 
+  /// instruction in this Basic Block, and returns the stoppoint for it.
+  const DbgStopPointInst *findBBStopPoint(const BasicBlock *BB)
+  {
+    for(BasicBlock::const_iterator I = BB->begin(), E = BB->end(); I != E; ++I) {
+      if (const DbgStopPointInst *DSI = dyn_cast<DbgStopPointInst>(I))
+        return DSI;
+    }
+    // Fallback to looking for stoppoint of unique predecessor.
+    // Useful if this BB contains no stoppoints, but unique predecessor does.
+    BB = BB->getUniquePredecessor();
+    if (BB)
+      return findStopPoint(BB->getTerminator());
+    return 0;
+  }
+
+  /// Finds the dbg.declare intrinsic corresponding to this value if any.
+  /// It looks through pointer casts too.
+  const DbgDeclareInst *findDbgDeclare(const Value *V, bool stripCasts)
+  {
+    if (stripCasts) {
+      V = V->stripPointerCasts();
+      // Look for the bitcast.
+      for (Value::use_const_iterator I = V->use_begin(), E =V->use_end();
+            I != E; ++I) {
+        if (isa<BitCastInst>(I))
+          return findDbgDeclare(*I, false);
+      }
+      return 0;
+    }
+
+    // Find dbg.declare among uses of the instruction.
+    for (Value::use_const_iterator I = V->use_begin(), E =V->use_end();
+          I != E; ++I) {
+      if (const DbgDeclareInst *DDI = dyn_cast<DbgDeclareInst>(I))
+        return DDI;
+    }
+    return 0;
+  }
+}
+




From edwintorok at gmail.com  Tue Dec 16 03:09:19 2008
From: edwintorok at gmail.com (Torok Edwin)
Date: Tue, 16 Dec 2008 09:09:19 -0000
Subject: [llvm-commits] [llvm] r61085 - in /llvm/trunk:
 include/llvm/Analysis/Passes.h include/llvm/LinkAllPasses.h
 lib/Analysis/DbgInfoPrinter.cpp
Message-ID: <200812160909.mBG99Jds032341@zion.cs.uiuc.edu>

Author: edwin
Date: Tue Dec 16 03:09:19 2008
New Revision: 61085

URL: http://llvm.org/viewvc/llvm-project?rev=61085&view=rev
Log:
Add -print-dbginfo pass that prints LLVM IR with comments inserted to show
which source/line a certain BB/instruction comes from, original variable names,
and original (unmangled) C++ name of functions.

Added:
    llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp
Modified:
    llvm/trunk/include/llvm/Analysis/Passes.h
    llvm/trunk/include/llvm/LinkAllPasses.h

Modified: llvm/trunk/include/llvm/Analysis/Passes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/Passes.h?rev=61085&r1=61084&r2=61085&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Analysis/Passes.h (original)
+++ llvm/trunk/include/llvm/Analysis/Passes.h Tue Dec 16 03:09:19 2008
@@ -114,6 +114,9 @@
   // Minor pass prototypes, allowing us to expose them through bugpoint and
   // analyze.
   FunctionPass *createInstCountPass();
+
+  // print debug info intrinsics in human readable form
+  FunctionPass *createDbgInfoPrinterPass();
 }
 
 #endif

Modified: llvm/trunk/include/llvm/LinkAllPasses.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/LinkAllPasses.h?rev=61085&r1=61084&r2=61085&view=diff

==============================================================================
--- llvm/trunk/include/llvm/LinkAllPasses.h (original)
+++ llvm/trunk/include/llvm/LinkAllPasses.h Tue Dec 16 03:09:19 2008
@@ -126,6 +126,7 @@
       (void) llvm::createMergeFunctionsPass();
       (void) llvm::createPrintModulePass(0);
       (void) llvm::createPrintFunctionPass("", 0);
+      (void) llvm::createDbgInfoPrinterPass();
 
       (void)new llvm::IntervalPartition();
       (void)new llvm::FindUsedTypes();

Added: llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp?rev=61085&view=auto

==============================================================================
--- llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp (added)
+++ llvm/trunk/lib/Analysis/DbgInfoPrinter.cpp Tue Dec 16 03:09:19 2008
@@ -0,0 +1,145 @@
+//===- DbgInfoPrinter.cpp - Print debug info in a human readable form -----==//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file implements a pass that prints instructions, and associated debug
+// info:
+//   - source/line/col information
+//   - original variable name
+//   - original type name
+//
+//===----------------------------------------------------------------------===//
+#include "llvm/Pass.h"
+#include "llvm/Function.h"
+#include "llvm/Module.h"
+#include "llvm/Value.h"
+#include "llvm/IntrinsicInst.h"
+#include "llvm/Analysis/DebugInfo.h"
+#include "llvm/Analysis/Passes.h"
+#include "llvm/Analysis/ValueTracking.h"
+#include "llvm/Support/CFG.h"
+#include "llvm/Support/Compiler.h"
+#include "llvm/Support/CommandLine.h"
+#include "llvm/Support/raw_ostream.h"
+using namespace llvm;
+
+static cl::opt<bool>
+PrintDirectory("print-fullpath", cl::desc("Print fullpath when printing debug info"), cl::Hidden);
+
+namespace {
+	struct VISIBILITY_HIDDEN PrintDbgInfo : public FunctionPass {
+    private:
+      raw_ostream &Out;
+      void printStopPoint(const DbgStopPointInst *DSI);
+      void printFuncStart(const DbgFuncStartInst *FS);
+      void printVariableDeclaration(const Value *V);
+		public:
+			static char ID; // Pass identification
+			PrintDbgInfo() : FunctionPass(&ID), Out(outs()) {}
+
+			virtual bool runOnFunction(Function &F);
+			virtual void getAnalysisUsage(AnalysisUsage &AU) const {
+				AU.setPreservesAll();
+			}
+
+	};
+	char PrintDbgInfo::ID = 0;
+	static RegisterPass<PrintDbgInfo> X("print-dbginfo",
+      "Print debug info in human readable form");
+}
+
+FunctionPass *llvm::createDbgInfoPrinterPass() { return new PrintDbgInfo(); }
+
+void PrintDbgInfo::printVariableDeclaration(const Value *V)
+{
+  if(const DbgDeclareInst* DDI = findDbgDeclare(V)) {
+    DIVariable Var(cast<GlobalVariable>(DDI->getVariable()));
+    Out << "; variable " << Var.getName()
+      << " of type " << Var.getType().getName()
+      << " at line " << Var.getLineNumber() << "\n";
+  }
+}
+
+void PrintDbgInfo::printStopPoint(const DbgStopPointInst *DSI)
+{
+  if (PrintDirectory) {
+    std::string dir;
+		GetConstantStringInfo(DSI->getDirectory(), dir);
+    Out << dir << "/";
+  }
+  std::string file;
+  GetConstantStringInfo(DSI->getFileName(), file);
+  Out << file << ":" << DSI->getLine();
+  if (unsigned Col = DSI->getColumn()) {
+    Out << ":" << Col;
+  }
+}
+
+void PrintDbgInfo::printFuncStart(const DbgFuncStartInst *FS)
+{
+  DISubprogram Subprogram(cast<GlobalVariable>(FS->getSubprogram()));
+  Out << ";fully qualified function name: " << Subprogram.getDisplayName()
+    << " return type: " << Subprogram.getType().getName()
+    << " at line " << Subprogram.getLineNumber()
+    << "\n\n";
+}
+
+bool PrintDbgInfo::runOnFunction(Function &F)
+{
+  if (F.isDeclaration())
+    return false;
+  Out << "function " << F.getName() << "\n\n";
+  for (Function::iterator I = F.begin(), E = F.end(); I != E; ++I) {
+    BasicBlock *BB = I;
+    if (I != F.begin() && (pred_begin(BB) == pred_end(BB)))
+      // Skip dead blocks.
+      continue;
+    const DbgStopPointInst *DSI = findBBStopPoint(BB);
+    Out << BB->getName();
+    Out << ":";
+    if (DSI) {
+      Out << "; (";
+      printStopPoint(DSI);
+      Out << ")";
+    }
+    Out << "\n";
+    // A dbgstoppoint's information is valid until we encounter a new one.
+    const DbgStopPointInst *LastDSP = DSI;
+    bool printed = DSI != 0;
+    for (BasicBlock::const_iterator i = BB->begin(), e = BB->end(); i != e; ++i) {
+      if (isa<DbgInfoIntrinsic>(i)) {
+        if ((DSI = dyn_cast<DbgStopPointInst>(i))) {
+
+          if (DSI->getContext() == LastDSP->getContext() &&
+              DSI->getLineValue() == LastDSP->getLineValue() &&
+              DSI->getColumnValue() == LastDSP->getColumnValue()) {
+            // Don't print same location twice.
+            continue;
+          }
+          LastDSP = cast<DbgStopPointInst>(i);
+          // Don't print consecutive stoppoints, use a flag
+          // to know which one we printed.
+          printed = false;
+
+        } else if (const DbgFuncStartInst *FS = dyn_cast<DbgFuncStartInst>(i)) {
+          printFuncStart(FS);
+        }
+      } else {
+        if (!printed && LastDSP) {
+          Out << "; ";
+          printStopPoint(LastDSP);
+          Out << "\n";
+          printed = true;
+        }
+        Out << *i;
+        printVariableDeclaration(i);
+      }
+    }
+  }
+  return false;
+}




From monping at apple.com  Tue Dec 16 03:35:15 2008
From: monping at apple.com (Mon Ping Wang)
Date: Tue, 16 Dec 2008 01:35:15 -0800
Subject: [llvm-commits] Patch: updated widen in LegalizeType
In-Reply-To: <200812150028.55469.baldrick@free.fr>
References: <6400B666-5A24-42E8-8C6C-2F70F94E3020@apple.com>
	<200812150028.55469.baldrick@free.fr>
Message-ID: <DAF215C6-C1E5-4675-861B-B81C7E81E8AD@apple.com>

Hi Duncan,

On Dec 15, 2008, at 12:28 AM, Duncan Sands wrote:

> Hi Mon Ping,
>
>> +          return VT == VT.getPow2VectorType() ? Expand : Promote;
>
> this seems like an expensive way of testing whether the the number
> of elements is a power of two.
>

You are right.  I replaced it with a simple test for checking for  
power of 2 instead of finding the value of 2.


>> +        // vector length is a power of 2 - split to half the size
> vector -> Vector
> Missing full stop at end of line.
>
Fixed.

>> +      v2i8           =  14,   //  2 x i8
>> +      v4i8           =  15,   //  4 x i8
>> +      v2i16          =  16,   //  2 x i16
>> +      v8i8           =  17,   //  8 x i8
>> +      v4i16          =  18,   //  4 x i16
>> +      v2i32          =  19,   //  2 x i32
>> +      v1i64          =  20,   //  1 x i64
>> +      v16i8          =  21,   // 16 x i8
>> +      v8i16          =  22,   //  8 x i16
>> +      v3i32          =  23,   //  3 x i32
>> +      v4i32          =  24,   //  4 x i32
>> +      v2i64          =  25,   //  2 x i64
>
> What's the logic behind this order?  How about dropping
> v3i32 and v3f32 from the list of simple value types?
>

The logic in the order is based on increasing vector size and within  
vectors of the same size, we list them in increase vector element  
size.  The vectors v3i32 and v3f32 were original there and I left them  
as I assume they were a useful type (graphics like v3f32 but I'm not  
sure if there is a machine that can process that vector size).

>> +  case WidenVector:
>> +    if (OutVT.bitsEq(TLI.getTypeToTransformTo(InVT)))
>
> This should be NInVT rather than TLI.getTypeToTransformTo(InVT).
>
>> +      // The input widens to the same size.  Convert to the widen  
>> value.
>
> widen value -> widened value
>

Fixed.

>> +    case ISD::SCALAR_TO_VECTOR: Res = ExpandIntOp_SCALAR_TO_VECTOR 
>> (N);
>
> Duplicate from your other patch.

>> +SDValue DAGTypeLegalizer::ExpandIntOp_SCALAR_TO_VECTOR(SDNode *N) {
>
> Duplicate from your other patch.
>

Yes, I moved it to a separate patch recently as I wanted the widening  
patch to deal only with widening.

>> +  unsigned Opcode = N->getOpcode();
>> +  unsigned InVTNumElts = InVT.getVectorNumElements();
>> +  if (InVTNumElts == WidenNumElts)
>> +    return DAG.getNode(Opcode, WidenVT, InOp);
>
> Don't you get here only if the test
>  if (getTypeAction(InVT) == WidenVector) {
> passed a few lines earlier?  If so, this early exit
> would be better inside that previous logic.
>

Yes, this can only occur if we widened the input.  I  moved it inside.

>> +  if (TLI.isTypeLegal(InWidenVT)) {
>> +    // Because the result and the input are different vector  
>> types, widening
>> +    // the result could create a legal type but widening the input  
>> might make
>> +    // it an illegal type that might lead to repeatedly splitting  
>> the input
>> +    // and then widening it. To avoid this, we widen the input  
>> only if
>> +    // it results in a legal type.
>
> I don't see why this is a problem for this code, which is legalizing  
> the
> result.  Isn't it really a problem for WidenVecOp_Convert or  
> SplitVecOp_Convert?
> They can refuse to turn a legal result type into an illegal one,  
> instead falling
> back to some evil BUILD_VECTOR.
>

Because widening and splitting are opposite operations, we can run  
into problems when creating new nodes.  Consider the  the case when we  
widen a conversion from v2f64 to v2i32. The widen type is v4i32 so we  
widen the operation and widen the input to v4f64 by using  
concat_vectors.  We place this new node into the worklist and return  
to check if the nodes are legal.  We first encounter the  
concat_vectors with an illegal type v4f64 so we split it down to  
v2f64.  This will require updating the result of the conversion node  
to v2i32 again and we add the nodes to the work list and do it all  
over again.  This is only a problem for operations with different  
input and output types.

The code in WidenVecRes_Convert that does concatenation is useful if  
an architecture has multiple legal vector with different size (e.g.,  
if v4i32 and v4f64 are legal).  There is some more work here that  
should be done to improve performance.

>> +    if (InVTNumElts % WidenNumElts == 0) {
>
> How can this happen?

Assuming v16i8 is a legal type and we are doing a conversion from v6i8  
to v6i16.  The v6i16 will be widen to v8i16 and legal type for v6i8 is  
v16i8 so we would widen to that.

>> +  unsigned MinElts = std::min(InVTNumElts, WidenNumElts);
>
> How can this ever be different to InVTNumElts?
>

See above.


>> +  case PromoteInteger:
>> +    InOp = GetPromotedInteger(InOp);
>> +    InVT = InOp.getValueType();
>> +    if (WidenVT.bitsEq(InVT))
>> +      // The InOp promotes to the same size.  Convert the promoted  
>> value.
>> +      return DAG.getNode(ISD::BIT_CONVERT, WidenVT, InOp);
>
> I don't think it's wise to modify InOp and InVT like this when
> you are not sure to return.  It at least needs a comment in the
> break case.  For that matter, it is missing a break (harmless
> here, but better style to put one).
>

The missing break is a bug.  If the input is promoted but doesn't  
match the required size, we would need to properly widen the promoted  
input to do the conversion.  I'll add a test for this case.

>> +  case WidenVector:
>> +    InOp = GetWidenedVector(InOp);
>> +    InVT = InOp.getValueType();
>> +    if (WidenVT.bitsEq(InVT))
>> +      // The input widens to the same size. Convert to the widen  
>> value.
>> +      return DAG.getNode(ISD::BIT_CONVERT, WidenVT, InOp);
>> +  }
>
> Likewise, including like of an explicit break;.
>

Done.

>> +  if (WidenSize % InSize == 0) {
>> +    MVT NewInVT;
>> +    unsigned NewNumElts = WidenSize / InSize;
>> +    if (InVT.isVector()) {
>> +      MVT InEltVT = InVT.getVectorElementType();
>> +      NewInVT= MVT::getVectorVT(InEltVT, InEltVT.getSizeInBits() /  
>> WidenSize);
>
> Shouldn't this be WidenSize / InEltVT.getSizeInBits()?  Can you  
> exercise
> this code path with a testcase?  Isn't NewNumElts wrong in this case?
>

You are correct and for X86, it is hard to create a test case for this  
because when we widen two different vector types, we will typically  
widen them to the same size and never hit this case.  I'll try to see  
if I'm converting an integer to a vector and see if I can hit this case.

>> +    } else
>> +      NewInVT = MVT::getVectorVT(InVT, NewNumElts);
>
> Missing braces { } around this line.
>
> How about a comment here about the invariants that should hold for
> NewInVT etc.

I'll add that.

>
>
>> +    if (TLI.isTypeLegal(NewInVT)) {
>> +      // Because the result and the input are different vector  
>> types, widening
>> +      // the result could create a legal type but widening the  
>> input might make
>> +      // it an illegal type that might lead to repeatedly  
>> splitting the input
>> +      // and then widening it. To avoid this, we widen the input  
>> only if
>> +      // it results in a legal type.
>
> Same comment as above: looks like this belongs in the bitconvert  
> operand
> legalization logic.
>
>> +  // This should occur very rarely. Lower the bit-convert to a  
>> store/load
>> +  // from the stack, then widen the load.
>> +  SDValue Op = CreateStackStoreLoad(InOp, N->getValueType(0));
>> +  return WidenVecRes_LOAD(cast<LoadSDNode>(Op.getNode()));
>
> Sorry, but this will now cause a failure if you run llc with
> enable-legalize-types-checking (I tightened up a bunch of
> invariants).  For that matter, please add widening support
> to DAGTypeLegalizer::PerformExpensiveChecks.
>

I'll change this and I'll add widening support to PerformExpensive  
checks.


>> +  unsigned WidenNumElts = WidenVT.getVectorNumElements();
>> +
>> +  SmallVector<SDValue, 16> NewOps(N->op_begin(), N->op_end());
>
> How about reserving space for WidenNumElts?

Done.

>
>
>> +SDValue DAGTypeLegalizer::WidenVecRes_CONCAT_VECTORS(SDNode *N) {
>
> I was too tired to review this.
>
>> +SDValue DAGTypeLegalizer::WidenVecRes_CONVERT_RNDSAT(SDNode *N) {
>
> I don't plan to review this.
>
>> +SDValue DAGTypeLegalizer::WidenVecRes_EXTRACT_SUBVECTOR(SDNode *N) {
>
> I was too tired to review this.
>
>> +SDValue DAGTypeLegalizer::WidenVecRes_INSERT_VECTOR_ELT(SDNode *N) {
>> +  MVT WidenVT = TLI.getTypeToTransformTo(N->getValueType(0));
>> +  SDValue InOp = GetWidenedVector(N->getOperand(0));
>> +  assert(InOp.getValueType() == WidenVT);
>
> Please don't use getTypeToTransformTo, and just get WidenVT as
> InOp.getValueType() instead.
>

Done.

>> +SDValue DAGTypeLegalizer::WidenVecRes_LOAD(SDNode *N) {
>
> I was too tired to review this.
>
>> +    MVT CondEltVT = CondVT.getVectorElementType();
>> +    MVT CondWidenVT =  MVT::getVectorVT(CondEltVT, WidenNumElts);
>> +    if (getTypeAction(CondVT) == WidenVector)
>> +      Cond1 = GetWidenedVector(Cond1);
>> +    if (Cond1.getValueType() != CondWidenVT)
>> +       Cond1 = WidenToType(Cond1, CondWidenVT);
>
> This second "if" can just be "else".  How about introducing
> a utility function which gets a value of the widened type
> using either GetWidenedVector or WidenToType?
>
>> +  assert(CondVT.isVector() && "can not widen non vector type");
>
> non vector -> non-vector
>
>> +  assert(CondVT == Cond2.getValueType() && "mismatch lhs/rhs");
>
> mismatch -> mismatched
>
>> +  assert(Cond1.getValueType() == WidenCondVT &&
>> +         Cond2.getValueType() == WidenCondVT && "condition not  
>> widen");
>
> Why should the conditions widen?  In fact, why should the conditions
> be vectors at all?  And if they are, is it valid to just extend them
> with undefined values (via widening)?  For example, if the CC was Eq,
> then after widening originally equal vectors may no longer be equal.
>
>> +  assert(InOp1.getValueType() == WidenVT && InOp2.getValueType() ==
>> WidenVT && +         "operands not widen");
>
> Seems like a pointless assertion.  The fact that the types of these
> match the result type should be checked in SelectionDAG.cpp.
>

It looks like I misunderstood SELECT_CC.  I thought that the true and  
false values can be vectors if the comparions values are vectors but  
looking at what split does, they are not.  The getNode doesn't check  
if the true and false values are not vectors.   None of my test cases  
hits this instruction.

>> +  // Readjust mask based on new input vector length.
>
> Readjust -> Adjust
>

Done.

>> +SDValue DAGTypeLegalizer::WidenVecRes_VSETCC(SDNode *N) {
> ...
>> +  assert(InVT.isVector() && "can not widen non vector type");
>
> How can there be a non-vector type here?
>
It has to be a vector so the assert is unnecessary.

>> +  InOp1 = GetWidenedVector(InOp1);
>
> Why should the operands widen?  The result has a different
> vector type, and it is the result that you know widens.
>

For VSETCC, the input vectors must match the same length as the  
output.  VSETCC is used for vectors and the most common definition for  
vectors is that the input vectors and the result vectors have the same  
size for the element and the number of elements so they will widen to  
the same amount usually (this has been so far true for the code we  
generate).

>> +  // If the result is N, the sub-method updated N in place.
>> +  if (Res.getNode() == N) {
>> +    // Mark N as new and remark N and its operands.  This allows  
>> us to
>> correctly +    // revisit N if it needs another step of promotion and
>> allows us to visit +    // any new operands to N.
>> +    ReanalyzeNode(N);
>> +    return true;
>> +  }
>
> I changed the way this stuff works.  Please copy the new logic from
> one of the similar places.
>

Done when I updated to TOT.

>> +SDValue DAGTypeLegalizer::WidenVecOp_Convert(SDNode *N) {
> ...
>> +  SDValue InOp = N->getOperand(0);
>
> If you use the widened vector instead, you avoid the need for the
> legalizer to later widen the EXTRACT_VECTOR_ELT nodes you create.
>
>> +SDValue DAGTypeLegalizer::WidenVecOp_CONCAT_VECTORS(SDNode *N) {
> ...
>> +    SDValue InOp = N->getOperand(i);
>
> Likewise it would be more efficient to use the already widened
> vectors here.
>

Done.


>> +SDValue DAGTypeLegalizer::WidenVecOp_STORE(SDNode *N) {
>
> I was too tired to review this.  However it looks like you have
> introduced truncating vector stores (and presumably extending vector
> loads).  If so, you should extensively document this.
>
I'll do so.

>
>> +// Vector Widening Utilities
>
> I was too tired to review these.  However at first glance they seem
> rather messy, with millions of parameters etc.
>

This currently uses a recursive algorithm that passes the store  
information across to chop it off.  I'm planning to replace with an  
iterative one during the break so these should go away at some point.

>> +/// Given a vector input, widens (narrows) it to a vector of  
>> WidenVT.  The
>
> what does (narrows) mean?  Should it be: widens or narrows?  If so,  
> please
> change the name to something like TakeWidthFromType.  Also, isn't it  
> likely
> that a need to narrow represents a bug?
>

The only case we would narrow if an input is widened to a vector type  
with more elements than the result because they are different types.   
I'll change the name.

>>         SplitVectorResult(N, i);
>>         Changed = true;
>>         goto NodeDone;
>> +      case WidenVector:
>> +        WidenVectorResult(N, i);
>> +        goto NodeDone;
>
> You forgot to set Changed to true.
>
>> +      case WidenVector:
>> +        NeedsRevisit = WidenVectorOperand(N, i);
>> +        break;
>
> Likewise.
>

Fixed.

>>   bool IgnoreNodeResults(SDNode *N) const {
>> -    return N->getOpcode() == ISD::TargetConstant;
>> +    return N->getOpcode() == ISD::TargetConstant ||
>> +           IgnoredNodesResultsSet.count(N);
>
> This is a temporary measure until PR2957 is fixed.  Please add a
> comment stating this.  Even better, how about fixing PR2957 :)
>

PR2957 is starting to annoy me.  I had to weaken the check  
inSelectionDAGLegalize::HandleOp that checks for legal types because  
build_vector masks can be illegal.  I'll try to look into this during  
the break.


>> +  /// WidenVectors - For vector nodes that need to be widened,  
>> this map
>> +  /// which widen value to use.
>
> -> For vector nodes that need to be widened, indicates the widened  
> value to use.
>
>> +  SDValue ExpandIntOp_SCALAR_TO_VECTOR(SDNode *N);
>
> Duplicate from your other patch.
>
>> +    assert(WidenedOp.getNode() && "Operand wasn't Widened?");
>
> wasn't Widened -> wasn't widened
>
> Finally, I think you should apply your patch (with cleanups): while  
> there
> are further improvements that can be made, at this point I think it  
> is best
> to get it into the tree.  Don't forget to add testcases.  Can you  
> get complete
> coverage?
>

I tried covered a lot of cases and try to avoid the overlap from the  
test cases that we had for vectors but obviously, I didn't hit every  
code path.  I did run our tests with vectors over it.

Thanks you very much for the time and effort for the review.
-- Mon Ping



From edwintorok at gmail.com  Tue Dec 16 04:10:45 2008
From: edwintorok at gmail.com (Torok Edwin)
Date: Tue, 16 Dec 2008 10:10:45 -0000
Subject: [llvm-commits] [llvm] r61086 -
	/llvm/trunk/test/DebugInfo/printdbginfo.ll
Message-ID: <200812161010.mBGAAktp003687@zion.cs.uiuc.edu>

Author: edwin
Date: Tue Dec 16 04:10:23 2008
New Revision: 61086

URL: http://llvm.org/viewvc/llvm-project?rev=61086&view=rev
Log:
add testcase for -print-dbginfo

Added:
    llvm/trunk/test/DebugInfo/printdbginfo.ll

Added: llvm/trunk/test/DebugInfo/printdbginfo.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/printdbginfo.ll?rev=61086&view=auto

==============================================================================
--- llvm/trunk/test/DebugInfo/printdbginfo.ll (added)
+++ llvm/trunk/test/DebugInfo/printdbginfo.ll Tue Dec 16 04:10:23 2008
@@ -0,0 +1,136 @@
+; RUN: llvm-as < %s | opt -print-dbginfo -disable-output > %t1
+; RUN: %prcontext {function name: Bar::bar return type: int at line 12} 1 < %t1 | grep {(tst.cpp:14)}
+; RUN: %prcontext {%%tmp1} 1 < %t1 | grep -E {variable tmp.+at line 23}
+; RUN: %prcontext {; tst.cpp:24} 2 < %t1 | grep {%%6}
+	%llvm.dbg.anchor.type = type { i32, i32 }
+	%llvm.dbg.basictype.type = type { i32, { }*, i8*, { }*, i32, i64, i64, i64, i32, i32 }
+	%llvm.dbg.compile_unit.type = type { i32, { }*, i32, i8*, i8*, i8* }
+	%llvm.dbg.compositetype.type = type { i32, { }*, i8*, { }*, i32, i64, i64, i64, i32, { }*, { }* }
+	%llvm.dbg.derivedtype.type = type { i32, { }*, i8*, { }*, i32, i64, i64, i64, i32, { }* }
+	%llvm.dbg.subprogram.type = type { i32, { }*, { }*, i8*, i8*, i8*, { }*, i32, { }*, i1, i1 }
+	%llvm.dbg.variable.type = type { i32, { }*, i8*, { }*, i32, { }* }
+	%struct.Bar = type { %struct.Foo, i32 }
+	%struct.Foo = type { i32 }
+ at llvm.dbg.subprogram = internal constant %llvm.dbg.subprogram.type { i32 393262, { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.subprograms to { }*), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([4 x i8]* @.str3, i32 0, i32 0), i8* getelementptr ([9 x i8]* @.str4, i32 0, i32 0), i8* getelementptr ([14 x i8]* @.str5, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 12, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), i1 false, i1 true }, section "llvm.metadata"		; <%llvm.dbg.subprogram.type*> [#uses=1]
+ at llvm.dbg.subprograms = linkonce constant %llvm.dbg.anchor.type { i32 393216, i32 46 }, section "llvm.metadata"		; <%llvm.dbg.anchor.type*> [#uses=1]
+ at llvm.dbg.compile_unit = internal constant %llvm.dbg.compile_unit.type { i32 393233, { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.compile_units to { }*), i32 4, i8* getelementptr ([8 x i8]* @.str, i32 0, i32 0), i8* getelementptr ([13 x i8]* @.str1, i32 0, i32 0), i8* getelementptr ([52 x i8]* @.str2, i32 0, i32 0) }, section "llvm.metadata"		; <%llvm.dbg.compile_unit.type*> [#uses=1]
+ at llvm.dbg.compile_units = linkonce constant %llvm.dbg.anchor.type { i32 393216, i32 17 }, section "llvm.metadata"		; <%llvm.dbg.anchor.type*> [#uses=1]
+ at .str = internal constant [8 x i8] c"tst.cpp\00", section "llvm.metadata"		; <[8 x i8]*> [#uses=1]
+ at .str1 = internal constant [13 x i8] c"/home/edwin/\00", section "llvm.metadata"		; <[13 x i8]*> [#uses=1]
+ at .str2 = internal constant [52 x i8] c"4.2.1 (Based on Apple Inc. build 5623) (LLVM build)\00", section "llvm.metadata"		; <[52 x i8]*> [#uses=1]
+ at .str3 = internal constant [4 x i8] c"bar\00", section "llvm.metadata"		; <[4 x i8]*> [#uses=1]
+ at .str4 = internal constant [9 x i8] c"Bar::bar\00", section "llvm.metadata"		; <[9 x i8]*> [#uses=1]
+ at .str5 = internal constant [14 x i8] c"_ZN3Bar3barEv\00", section "llvm.metadata"		; <[14 x i8]*> [#uses=1]
+ at llvm.dbg.basictype = internal constant %llvm.dbg.basictype.type { i32 393252, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([4 x i8]* @.str6, i32 0, i32 0), { }* null, i32 0, i64 32, i64 32, i64 0, i32 0, i32 5 }, section "llvm.metadata"		; <%llvm.dbg.basictype.type*> [#uses=1]
+ at .str6 = internal constant [4 x i8] c"int\00", section "llvm.metadata"		; <[4 x i8]*> [#uses=1]
+ at llvm.dbg.variable = internal constant %llvm.dbg.variable.type { i32 393473, { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram to { }*), i8* getelementptr ([5 x i8]* @.str7, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 12, { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype to { }*) }, section "llvm.metadata"		; <%llvm.dbg.variable.type*> [#uses=0]
+ at .str7 = internal constant [5 x i8] c"this\00", section "llvm.metadata"		; <[5 x i8]*> [#uses=1]
+ at llvm.dbg.derivedtype = internal constant %llvm.dbg.derivedtype.type { i32 393231, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* null, { }* null, i32 0, i64 64, i64 64, i64 0, i32 0, { }* bitcast (%llvm.dbg.compositetype.type* @llvm.dbg.compositetype to { }*) }, section "llvm.metadata"		; <%llvm.dbg.derivedtype.type*> [#uses=1]
+ at llvm.dbg.compositetype = internal constant %llvm.dbg.compositetype.type { i32 393235, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([4 x i8]* @.str8, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 5, i64 64, i64 32, i64 0, i32 0, { }* null, { }* bitcast ([5 x { }*]* @llvm.dbg.array36 to { }*) }, section "llvm.metadata"		; <%llvm.dbg.compositetype.type*> [#uses=1]
+ at .str8 = internal constant [4 x i8] c"Bar\00", section "llvm.metadata"		; <[4 x i8]*> [#uses=1]
+ at llvm.dbg.derivedtype9 = internal constant %llvm.dbg.derivedtype.type { i32 393244, { }* null, i8* null, { }* null, i32 0, i64 0, i64 0, i64 0, i32 0, { }* bitcast (%llvm.dbg.compositetype.type* @llvm.dbg.compositetype10 to { }*) }, section "llvm.metadata"		; <%llvm.dbg.derivedtype.type*> [#uses=1]
+ at llvm.dbg.compositetype10 = internal constant %llvm.dbg.compositetype.type { i32 393235, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([4 x i8]* @.str11, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 1, i64 32, i64 32, i64 0, i32 0, { }* null, { }* bitcast ([3 x { }*]* @llvm.dbg.array22 to { }*) }, section "llvm.metadata"		; <%llvm.dbg.compositetype.type*> [#uses=1]
+ at .str11 = internal constant [4 x i8] c"Foo\00", section "llvm.metadata"		; <[4 x i8]*> [#uses=1]
+ at llvm.dbg.derivedtype12 = internal constant %llvm.dbg.derivedtype.type { i32 393229, { }* null, i8* getelementptr ([7 x i8]* @.str13, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 2, i64 32, i64 32, i64 0, i32 0, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*) }, section "llvm.metadata"		; <%llvm.dbg.derivedtype.type*> [#uses=1]
+ at .str13 = internal constant [7 x i8] c"FooVar\00", section "llvm.metadata"		; <[7 x i8]*> [#uses=1]
+ at llvm.dbg.subprogram14 = internal constant %llvm.dbg.subprogram.type { i32 393262, { }* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([4 x i8]* @.str11, i32 0, i32 0), i8* getelementptr ([9 x i8]* @.str15, i32 0, i32 0), i8* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 12, { }* bitcast (%llvm.dbg.compositetype.type* @llvm.dbg.compositetype16 to { }*), i1 false, i1 false }, section "llvm.metadata"		; <%llvm.dbg.subprogram.type*> [#uses=1]
+ at .str15 = internal constant [9 x i8] c"Foo::Foo\00", section "llvm.metadata"		; <[9 x i8]*> [#uses=1]
+ at llvm.dbg.compositetype16 = internal constant %llvm.dbg.compositetype.type { i32 393237, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* null, { }* null, i32 0, i64 8, i64 8, i64 0, i32 0, { }* null, { }* bitcast ([3 x { }*]* @llvm.dbg.array to { }*) }, section "llvm.metadata"		; <%llvm.dbg.compositetype.type*> [#uses=1]
+ at llvm.dbg.derivedtype17 = internal constant %llvm.dbg.derivedtype.type { i32 393231, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* null, { }* null, i32 0, i64 64, i64 64, i64 0, i32 0, { }* bitcast (%llvm.dbg.compositetype.type* @llvm.dbg.compositetype10 to { }*) }, section "llvm.metadata"		; <%llvm.dbg.derivedtype.type*> [#uses=1]
+ at llvm.dbg.derivedtype18 = internal constant %llvm.dbg.derivedtype.type { i32 393232, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* null, { }* null, i32 0, i64 64, i64 64, i64 0, i32 0, { }* bitcast (%llvm.dbg.compositetype.type* @llvm.dbg.compositetype10 to { }*) }, section "llvm.metadata"		; <%llvm.dbg.derivedtype.type*> [#uses=1]
+ at llvm.dbg.array = internal constant [3 x { }*] [ { }* null, { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype17 to { }*), { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype18 to { }*) ], section "llvm.metadata"		; <[3 x { }*]*> [#uses=1]
+ at llvm.dbg.subprogram19 = internal constant %llvm.dbg.subprogram.type { i32 393262, { }* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([4 x i8]* @.str11, i32 0, i32 0), i8* getelementptr ([9 x i8]* @.str15, i32 0, i32 0), i8* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 12, { }* bitcast (%llvm.dbg.compositetype.type* @llvm.dbg.compositetype20 to { }*), i1 false, i1 false }, section "llvm.metadata"		; <%llvm.dbg.subprogram.type*> [#uses=1]
+ at llvm.dbg.compositetype20 = internal constant %llvm.dbg.compositetype.type { i32 393237, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* null, { }* null, i32 0, i64 8, i64 8, i64 0, i32 0, { }* null, { }* bitcast ([2 x { }*]* @llvm.dbg.array21 to { }*) }, section "llvm.metadata"		; <%llvm.dbg.compositetype.type*> [#uses=1]
+ at llvm.dbg.array21 = internal constant [2 x { }*] [ { }* null, { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype17 to { }*) ], section "llvm.metadata"		; <[2 x { }*]*> [#uses=1]
+ at llvm.dbg.array22 = internal constant [3 x { }*] [ { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype12 to { }*), { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram14 to { }*), { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram19 to { }*) ], section "llvm.metadata"		; <[3 x { }*]*> [#uses=1]
+ at llvm.dbg.derivedtype23 = internal constant %llvm.dbg.derivedtype.type { i32 393229, { }* null, i8* getelementptr ([7 x i8]* @.str24, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 6, i64 32, i64 32, i64 32, i32 1, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*) }, section "llvm.metadata"		; <%llvm.dbg.derivedtype.type*> [#uses=1]
+ at .str24 = internal constant [7 x i8] c"BarVar\00", section "llvm.metadata"		; <[7 x i8]*> [#uses=1]
+ at llvm.dbg.subprogram25 = internal constant %llvm.dbg.subprogram.type { i32 393262, { }* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([4 x i8]* @.str8, i32 0, i32 0), i8* getelementptr ([9 x i8]* @.str26, i32 0, i32 0), i8* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 12, { }* bitcast (%llvm.dbg.compositetype.type* @llvm.dbg.compositetype27 to { }*), i1 false, i1 false }, section "llvm.metadata"		; <%llvm.dbg.subprogram.type*> [#uses=1]
+ at .str26 = internal constant [9 x i8] c"Bar::Bar\00", section "llvm.metadata"		; <[9 x i8]*> [#uses=1]
+ at llvm.dbg.compositetype27 = internal constant %llvm.dbg.compositetype.type { i32 393237, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* null, { }* null, i32 0, i64 8, i64 8, i64 0, i32 0, { }* null, { }* bitcast ([3 x { }*]* @llvm.dbg.array29 to { }*) }, section "llvm.metadata"		; <%llvm.dbg.compositetype.type*> [#uses=1]
+ at llvm.dbg.derivedtype28 = internal constant %llvm.dbg.derivedtype.type { i32 393232, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* null, { }* null, i32 0, i64 64, i64 64, i64 0, i32 0, { }* bitcast (%llvm.dbg.compositetype.type* @llvm.dbg.compositetype to { }*) }, section "llvm.metadata"		; <%llvm.dbg.derivedtype.type*> [#uses=1]
+ at llvm.dbg.array29 = internal constant [3 x { }*] [ { }* null, { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype to { }*), { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype28 to { }*) ], section "llvm.metadata"		; <[3 x { }*]*> [#uses=1]
+ at llvm.dbg.subprogram30 = internal constant %llvm.dbg.subprogram.type { i32 393262, { }* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([4 x i8]* @.str8, i32 0, i32 0), i8* getelementptr ([9 x i8]* @.str26, i32 0, i32 0), i8* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 12, { }* bitcast (%llvm.dbg.compositetype.type* @llvm.dbg.compositetype31 to { }*), i1 false, i1 false }, section "llvm.metadata"		; <%llvm.dbg.subprogram.type*> [#uses=1]
+ at llvm.dbg.compositetype31 = internal constant %llvm.dbg.compositetype.type { i32 393237, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* null, { }* null, i32 0, i64 8, i64 8, i64 0, i32 0, { }* null, { }* bitcast ([2 x { }*]* @llvm.dbg.array32 to { }*) }, section "llvm.metadata"		; <%llvm.dbg.compositetype.type*> [#uses=1]
+ at llvm.dbg.array32 = internal constant [2 x { }*] [ { }* null, { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype to { }*) ], section "llvm.metadata"		; <[2 x { }*]*> [#uses=1]
+ at llvm.dbg.subprogram33 = internal constant %llvm.dbg.subprogram.type { i32 393262, { }* null, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([4 x i8]* @.str3, i32 0, i32 0), i8* getelementptr ([9 x i8]* @.str4, i32 0, i32 0), i8* getelementptr ([14 x i8]* @.str5, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 12, { }* bitcast (%llvm.dbg.compositetype.type* @llvm.dbg.compositetype34 to { }*), i1 false, i1 false }, section "llvm.metadata"		; <%llvm.dbg.subprogram.type*> [#uses=1]
+ at llvm.dbg.compositetype34 = internal constant %llvm.dbg.compositetype.type { i32 393237, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* null, { }* null, i32 0, i64 8, i64 8, i64 0, i32 0, { }* null, { }* bitcast ([2 x { }*]* @llvm.dbg.array35 to { }*) }, section "llvm.metadata"		; <%llvm.dbg.compositetype.type*> [#uses=1]
+ at llvm.dbg.array35 = internal constant [2 x { }*] [ { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*), { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype to { }*) ], section "llvm.metadata"		; <[2 x { }*]*> [#uses=1]
+ at llvm.dbg.array36 = internal constant [5 x { }*] [ { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype9 to { }*), { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype23 to { }*), { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram25 to { }*), { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram30 to { }*), { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram33 to { }*) ], section "llvm.metadata"		; <[5 x { }*]*> [#uses=1]
+ at llvm.dbg.variable37 = internal constant %llvm.dbg.variable.type { i32 393472, { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram to { }*), i8* getelementptr ([4 x i8]* @.str38, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 15, { }* bitcast (%llvm.dbg.basictype.type* @llvm.dbg.basictype to { }*) }, section "llvm.metadata"		; <%llvm.dbg.variable.type*> [#uses=0]
+ at .str38 = internal constant [4 x i8] c"tmp\00", section "llvm.metadata"		; <[4 x i8]*> [#uses=1]
+ at llvm.dbg.subprogram39 = internal constant %llvm.dbg.subprogram.type { i32 393262, { }* bitcast (%llvm.dbg.anchor.type* @llvm.dbg.subprograms to { }*), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i8* getelementptr ([7 x i8]* @.str40, i32 0, i32 0), i8* getelementptr ([7 x i8]* @.str40, i32 0, i32 0), i8* getelementptr ([11 x i8]* @.str41, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 21, { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype to { }*), i1 false, i1 true }, section "llvm.metadata"		; <%llvm.dbg.subprogram.type*> [#uses=1]
+ at .str40 = internal constant [7 x i8] c"foobar\00", section "llvm.metadata"		; <[7 x i8]*> [#uses=1]
+ at .str41 = internal constant [11 x i8] c"_Z6foobarv\00", section "llvm.metadata"		; <[11 x i8]*> [#uses=1]
+ at llvm.dbg.variable42 = internal constant %llvm.dbg.variable.type { i32 393472, { }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram39 to { }*), i8* getelementptr ([4 x i8]* @.str38, i32 0, i32 0), { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*), i32 23, { }* bitcast (%llvm.dbg.derivedtype.type* @llvm.dbg.derivedtype to { }*) }, section "llvm.metadata"		; <%llvm.dbg.variable.type*> [#uses=0]
+
+define i32 @_ZN3Bar3barEv(%struct.Bar* %this1) nounwind {
+entry:
+	tail call void @llvm.dbg.func.start({ }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram to { }*))
+	tail call void @llvm.dbg.stoppoint(i32 14, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*))
+	%0 = getelementptr %struct.Bar* %this1, i64 0, i32 0, i32 0		; <i32*> [#uses=1]
+	%1 = load i32* %0, align 4		; <i32> [#uses=1]
+	%2 = icmp sgt i32 %1, 0		; <i1> [#uses=1]
+	br i1 %2, label %bb, label %bb3
+
+bb:		; preds = %entry
+	%3 = getelementptr %struct.Bar* %this1, i64 0, i32 1		; <i32*> [#uses=1]
+	%4 = load i32* %3, align 4		; <i32> [#uses=1]
+	%5 = shl i32 %4, 1		; <i32> [#uses=1]
+	tail call void @llvm.dbg.stoppoint(i32 16, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*))
+	br label %bb4
+
+bb3:		; preds = %entry
+	tail call void @llvm.dbg.stoppoint(i32 18, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*))
+	br label %bb4
+
+bb4:		; preds = %bb3, %bb
+	%.0 = phi i32 [ 0, %bb3 ], [ %5, %bb ]		; <i32> [#uses=1]
+	tail call void @llvm.dbg.stoppoint(i32 18, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*))
+	tail call void @llvm.dbg.region.end({ }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram to { }*))
+	ret i32 %.0
+}
+
+declare void @llvm.dbg.func.start({ }*) nounwind
+
+declare void @llvm.dbg.declare({ }*, { }*) nounwind
+
+declare void @llvm.dbg.stoppoint(i32, i32, { }*) nounwind
+
+declare void @llvm.dbg.region.end({ }*) nounwind
+
+define %struct.Bar* @_Z6foobarv() {
+entry:
+	%retval = alloca %struct.Bar*		; <%struct.Bar**> [#uses=2]
+	%tmp = alloca %struct.Bar*		; <%struct.Bar**> [#uses=3]
+	%0 = alloca %struct.Bar*		; <%struct.Bar**> [#uses=2]
+	%1 = alloca %struct.Bar*		; <%struct.Bar**> [#uses=3]
+	%"alloca point" = bitcast i32 0 to i32		; <i32> [#uses=0]
+	call void @llvm.dbg.func.start({ }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram39 to { }*))
+	%tmp1 = bitcast %struct.Bar** %tmp to { }*		; <{ }*> [#uses=1]
+	call void @llvm.dbg.declare({ }* %tmp1, { }* bitcast (%llvm.dbg.variable.type* @llvm.dbg.variable42 to { }*))
+	call void @llvm.dbg.stoppoint(i32 23, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*))
+	%2 = call i8* @_Znwm(i64 8)		; <i8*> [#uses=1]
+	%3 = bitcast i8* %2 to %struct.Bar*		; <%struct.Bar*> [#uses=1]
+	store %struct.Bar* %3, %struct.Bar** %1, align 8
+	%4 = load %struct.Bar** %1, align 8		; <%struct.Bar*> [#uses=1]
+	call void @_ZN3BarC1Ev(%struct.Bar* %4) nounwind
+	%5 = load %struct.Bar** %1, align 8		; <%struct.Bar*> [#uses=1]
+	store %struct.Bar* %5, %struct.Bar** %tmp, align 8
+	call void @llvm.dbg.stoppoint(i32 24, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*))
+	%6 = load %struct.Bar** %tmp, align 8		; <%struct.Bar*> [#uses=1]
+	store %struct.Bar* %6, %struct.Bar** %0, align 8
+	%7 = load %struct.Bar** %0, align 8		; <%struct.Bar*> [#uses=1]
+	store %struct.Bar* %7, %struct.Bar** %retval, align 8
+	br label %return
+
+return:		; preds = %entry
+	%retval2 = load %struct.Bar** %retval		; <%struct.Bar*> [#uses=1]
+	call void @llvm.dbg.stoppoint(i32 24, i32 0, { }* bitcast (%llvm.dbg.compile_unit.type* @llvm.dbg.compile_unit to { }*))
+	call void @llvm.dbg.region.end({ }* bitcast (%llvm.dbg.subprogram.type* @llvm.dbg.subprogram39 to { }*))
+	ret %struct.Bar* %retval2
+}
+
+declare i8* @_Znwm(i64)
+
+declare void @_ZN3BarC1Ev(%struct.Bar*) nounwind




From edwintorok at gmail.com  Tue Dec 16 04:12:32 2008
From: edwintorok at gmail.com (=?ISO-8859-1?Q?T=F6r=F6k_Edwin?=)
Date: Tue, 16 Dec 2008 12:12:32 +0200
Subject: [llvm-commits] [PATCH] Debug info utilities and printer pass
In-Reply-To: <A697F3F7-CBA6-4879-9173-4C8C920616A1@apple.com>
References: <4940122B.5040005@gmail.com>	<F7DB7C4E-B5B7-4F5F-A428-9D941E59FE82@apple.com>	<E94E8A20-2FE8-494B-8D3B-05B22CD867CC@apple.com>	<4940FF97.30204@gmail.com>	<9A898E37-139F-4E76-BEA0-76161870E4FD@apple.com>	<4946AE82.5040606@gmail.com>
	<A697F3F7-CBA6-4879-9173-4C8C920616A1@apple.com>
Message-ID: <49477F10.3090503@gmail.com>

On 2008-12-16 00:09, Evan Cheng wrote:
> So you are setting DIDescriptor::GV to null? If so, please don't use  
> the same name for the parameter. It's confusing.
>   

I changed the parameter to gv.

> I think it's better to write something like
> bool printed = DSI != 0;
>   

Ok, changed.

>> Thanks for the comments, do you see any other major problems, or can I
>> commit these patches?
>>     
>
> Yes, please. Thanks.

Thanks, I also committed a testcase:
http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20081215/071220.html

If you see any problems with the testcase please tell me.

Best regards,
--Edwin


From monping at apple.com  Tue Dec 16 04:14:47 2008
From: monping at apple.com (Mon Ping Wang)
Date: Tue, 16 Dec 2008 02:14:47 -0800
Subject: [llvm-commits] Patch: updated widen in LegalizeType
In-Reply-To: <DAF215C6-C1E5-4675-861B-B81C7E81E8AD@apple.com>
References: <6400B666-5A24-42E8-8C6C-2F70F94E3020@apple.com>
	<200812150028.55469.baldrick@free.fr>
	<DAF215C6-C1E5-4675-861B-B81C7E81E8AD@apple.com>
Message-ID: <5360DA63-5057-442D-8796-B6BBEF793A66@apple.com>


I flipped conditional and true/false values in the statement below.    
What I meant to say is that operand 0 and 1, lhs and rhs that are used  
in the comparison are not vectors but the result based on operand 2  
and 3 can be.

   -- Mon Ping

What I meant o say is the I thought the condition (operand 0 and 1)  
could be vectors.

On Dec 16, 2008, at 1:35 AM, Mon Ping Wang wrote:

> It looks like I misunderstood SELECT_CC.  I thought that the true and
> false values can be vectors if the comparions values are vectors but
> looking at what split does, they are not.  The getNode doesn't check
> if the true and false values are not vectors.   None of my test cases
> hits this instruction.



From ofv at wanadoo.es  Tue Dec 16 06:25:14 2008
From: ofv at wanadoo.es (Oscar Fuentes)
Date: Tue, 16 Dec 2008 12:25:14 -0000
Subject: [llvm-commits] [llvm] r61087 -
	/llvm/trunk/lib/Analysis/CMakeLists.txt
Message-ID: <200812161225.mBGCPFE6007857@zion.cs.uiuc.edu>

Author: ofv
Date: Tue Dec 16 06:25:04 2008
New Revision: 61087

URL: http://llvm.org/viewvc/llvm-project?rev=61087&view=rev
Log:
CMake: Added DbgInfoPrinter.cpp to lib/Analysis/CMakeFiles.txt.

Modified:
    llvm/trunk/lib/Analysis/CMakeLists.txt

Modified: llvm/trunk/lib/Analysis/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/CMakeLists.txt?rev=61087&r1=61086&r2=61087&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/CMakeLists.txt (original)
+++ llvm/trunk/lib/Analysis/CMakeLists.txt Tue Dec 16 06:25:04 2008
@@ -8,6 +8,7 @@
   BasicAliasAnalysis.cpp
   CFGPrinter.cpp
   ConstantFolding.cpp
+  DbgInfoPrinter.cpp
   DebugInfo.cpp
   EscapeAnalysis.cpp
   InstCount.cpp




From baldrick at free.fr  Tue Dec 16 07:27:34 2008
From: baldrick at free.fr (Duncan Sands)
Date: Tue, 16 Dec 2008 14:27:34 +0100
Subject: [llvm-commits] [llvm] r61084 - in /llvm/trunk:
	include/llvm/Analysis/DebugInfo.h lib/Analysis/DebugInfo.cpp
In-Reply-To: <200812160907.mBG97bKm031340@zion.cs.uiuc.edu>
References: <200812160907.mBG97bKm031340@zion.cs.uiuc.edu>
Message-ID: <200812161427.34530.baldrick@free.fr>


Hi Edwin,

> +  /// Finds the stoppoint coressponding to this instruction, that is the
coressponding -> corresponding

(One more "r", one less "s").

Same occurs again later.

Ciao,

Duncan.


From bob.wilson at apple.com  Tue Dec 16 11:52:51 2008
From: bob.wilson at apple.com (Bob Wilson)
Date: Tue, 16 Dec 2008 09:52:51 -0800
Subject: [llvm-commits] Patch: fix some llvm-gcc typos and long lines
Message-ID: <DE854FCD-DF25-4BB9-ADD0-52C9F516F4CC@apple.com>

Here is a patch to fix some comment typos and lines longer than 80  
columns.  I suppose these are obvious changes, but I'm new to LLVM so  
I thought I should ask for a review before committing this.  Is this OK?

Index: gcc/llvm-convert.cpp
===================================================================
--- gcc/llvm-convert.cpp	(revision 61089)
+++ gcc/llvm-convert.cpp	(working copy)
@@ -4411,8 +4411,8 @@
    return false;
  }

-/// TargetBuiltinCache - A cache of builtin intrisics indexed by the  
GCC builtin
-/// number.
+/// TargetBuiltinCache - A cache of builtin intrinsics indexed by the  
GCC
+/// builtin number.
  static std::vector<Constant*> TargetBuiltinCache;

  void clearTargetBuiltinCache() {
@@ -4509,7 +4509,8 @@
          Intrinsic::getDeclaration(TheModule, IntrinsicID);
      }

-    Result = EmitCallOf(TargetBuiltinCache[FnCode], exp, DestLoc,  
AttrListPtr());
+    Result = EmitCallOf(TargetBuiltinCache[FnCode], exp, DestLoc,
+                        AttrListPtr());
      return true;
    }

Index: gcc/cppdefault.c
===================================================================
--- gcc/cppdefault.c	(revision 61089)
+++ gcc/cppdefault.c	(working copy)
@@ -44,8 +44,8 @@
  #endif

  /* APPLE LOCAL begin SDK 3886137.  */
-/* Allow -isysroot to override ALL  include patchs. This is done by
-   setting add_sysroot for all default inclue paths.  */
+/* Allow -isysroot to override ALL include paths. This is done by
+   setting add_sysroot for all default include paths.  */
  /* LLVM LOCAL begin - fix sysroot on non-Darwin systems */
  #ifdef CONFIG_DARWIN_H
  #define ADD_SYSROOT 1



From dalej at apple.com  Tue Dec 16 11:57:45 2008
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 16 Dec 2008 09:57:45 -0800
Subject: [llvm-commits] Patch: fix some llvm-gcc typos and long lines
In-Reply-To: <DE854FCD-DF25-4BB9-ADD0-52C9F516F4CC@apple.com>
References: <DE854FCD-DF25-4BB9-ADD0-52C9F516F4CC@apple.com>
Message-ID: <CEC3197E-9E7D-4E31-A899-FCDFA582DE0A@apple.com>


On Dec 16, 2008, at 9:52 AMPST, Bob Wilson wrote:

> Here is a patch to fix some comment typos and lines longer than 80
> columns.  I suppose these are obvious changes, but I'm new to LLVM so
> I thought I should ask for a review before committing this.  Is this  
> OK?

Sure.

> Index: gcc/llvm-convert.cpp
> ===================================================================
> --- gcc/llvm-convert.cpp	(revision 61089)
> +++ gcc/llvm-convert.cpp	(working copy)
> @@ -4411,8 +4411,8 @@
>    return false;
>  }
>
> -/// TargetBuiltinCache - A cache of builtin intrisics indexed by the
> GCC builtin
> -/// number.
> +/// TargetBuiltinCache - A cache of builtin intrinsics indexed by the
> GCC
> +/// builtin number.
>  static std::vector<Constant*> TargetBuiltinCache;
>
>  void clearTargetBuiltinCache() {
> @@ -4509,7 +4509,8 @@
>          Intrinsic::getDeclaration(TheModule, IntrinsicID);
>      }
>
> -    Result = EmitCallOf(TargetBuiltinCache[FnCode], exp, DestLoc,
> AttrListPtr());
> +    Result = EmitCallOf(TargetBuiltinCache[FnCode], exp, DestLoc,
> +                        AttrListPtr());
>      return true;
>    }
>
> Index: gcc/cppdefault.c
> ===================================================================
> --- gcc/cppdefault.c	(revision 61089)
> +++ gcc/cppdefault.c	(working copy)
> @@ -44,8 +44,8 @@
>  #endif
>
>  /* APPLE LOCAL begin SDK 3886137.  */
> -/* Allow -isysroot to override ALL  include patchs. This is done by
> -   setting add_sysroot for all default inclue paths.  */
> +/* Allow -isysroot to override ALL include paths. This is done by
> +   setting add_sysroot for all default include paths.  */
>  /* LLVM LOCAL begin - fix sysroot on non-Darwin systems */
>  #ifdef CONFIG_DARWIN_H
>  #define ADD_SYSROOT 1
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From bob.wilson at apple.com  Tue Dec 16 12:03:37 2008
From: bob.wilson at apple.com (Bob Wilson)
Date: Tue, 16 Dec 2008 18:03:37 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61091 - in /llvm-gcc-4.2/trunk/gcc:
 cppdefault.c llvm-convert.cpp
Message-ID: <200812161803.mBGI3cph019613@zion.cs.uiuc.edu>

Author: bwilson
Date: Tue Dec 16 12:03:36 2008
New Revision: 61091

URL: http://llvm.org/viewvc/llvm-project?rev=61091&view=rev
Log:
Fix some comment typos and wrap long lines.

Modified:
    llvm-gcc-4.2/trunk/gcc/cppdefault.c
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/cppdefault.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cppdefault.c?rev=61091&r1=61090&r2=61091&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cppdefault.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cppdefault.c Tue Dec 16 12:03:36 2008
@@ -44,8 +44,8 @@
 #endif
 
 /* APPLE LOCAL begin SDK 3886137.  */
-/* Allow -isysroot to override ALL  include patchs. This is done by
-   setting add_sysroot for all default inclue paths.  */
+/* Allow -isysroot to override ALL include paths. This is done by
+   setting add_sysroot for all default include paths.  */
 /* LLVM LOCAL begin - fix sysroot on non-Darwin systems */
 #ifdef CONFIG_DARWIN_H
 #define ADD_SYSROOT 1

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=61091&r1=61090&r2=61091&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Tue Dec 16 12:03:36 2008
@@ -4411,8 +4411,8 @@
   return false;
 }
 
-/// TargetBuiltinCache - A cache of builtin intrisics indexed by the GCC builtin
-/// number.
+/// TargetBuiltinCache - A cache of builtin intrinsics indexed by the GCC
+/// builtin number.
 static std::vector<Constant*> TargetBuiltinCache;
 
 void clearTargetBuiltinCache() {
@@ -4509,7 +4509,8 @@
         Intrinsic::getDeclaration(TheModule, IntrinsicID);
     }
 
-    Result = EmitCallOf(TargetBuiltinCache[FnCode], exp, DestLoc, AttrListPtr());
+    Result = EmitCallOf(TargetBuiltinCache[FnCode], exp, DestLoc,
+                        AttrListPtr());
     return true;
   }
   




From evan.cheng at apple.com  Tue Dec 16 12:21:41 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 16 Dec 2008 18:21:41 -0000
Subject: [llvm-commits] [llvm] r61092 - in /llvm/trunk:
 lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
 test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll
Message-ID: <200812161821.mBGILgSG020190@zion.cs.uiuc.edu>

Author: evancheng
Date: Tue Dec 16 12:21:39 2008
New Revision: 61092

URL: http://llvm.org/viewvc/llvm-project?rev=61092&view=rev
Log:
We have decided not to support inline asm where an output operand with a matching input operand with incompatible type (i.e. either one is a floating point and the other is an integer or the sizes of the types differ). SelectionDAGBuild will catch these and exit with an error.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
    llvm/trunk/test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=61092&r1=61091&r2=61092&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Tue Dec 16 12:21:39 2008
@@ -5048,20 +5048,21 @@
     SDISelAsmOperandInfo &OpInfo = ConstraintOperands[i];
     
     // If this is an output operand with a matching input operand, look up the
-    // matching input.  It might have a different type (e.g. the output might be
-    // i32 and the input i64) and we need to pick the larger width to ensure we
-    // reserve the right number of registers.  
+    // matching input. If their types mismatch, e.g. one is an integer, the
+    // other is floating point, or their sizes are different, flag it as an
+    // error.
     if (OpInfo.hasMatchingInput()) {
       SDISelAsmOperandInfo &Input = ConstraintOperands[OpInfo.MatchingInput];
       if (OpInfo.ConstraintVT != Input.ConstraintVT) {
-        assert(OpInfo.ConstraintVT.isInteger() &&
-               Input.ConstraintVT.isInteger() &&
-               "Asm constraints must be the same or different sized integers");
-        if (OpInfo.ConstraintVT.getSizeInBits() < 
-            Input.ConstraintVT.getSizeInBits())
-          OpInfo.ConstraintVT = Input.ConstraintVT;
-        else
-          Input.ConstraintVT = OpInfo.ConstraintVT;
+        if ((OpInfo.ConstraintVT.isInteger() !=
+             Input.ConstraintVT.isInteger()) ||
+            (OpInfo.ConstraintVT.getSizeInBits() !=
+             Input.ConstraintVT.getSizeInBits())) {
+          cerr << "Unsupported asm: input constraint with a matching output "
+               << "constraint of incompatible type!\n";
+          exit(1);
+        }
+        Input.ConstraintVT = OpInfo.ConstraintVT;
       }
     }
     

Modified: llvm/trunk/test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll?rev=61092&r1=61091&r2=61092&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll Tue Dec 16 12:21:39 2008
@@ -1,4 +1,5 @@
 ; RUN: llvm-as < %s | llc
+; XFAIL: *
 ; PR2356
 target datalayout = "E-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f128:64:128"
 target triple = "powerpc-apple-darwin9"




From gohman at apple.com  Tue Dec 16 12:25:37 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 18:25:37 -0000
Subject: [llvm-commits] [llvm] r61093 -
	/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp
Message-ID: <200812161825.mBGIPbJs020324@zion.cs.uiuc.edu>

Author: djg
Date: Tue Dec 16 12:25:36 2008
New Revision: 61093

URL: http://llvm.org/viewvc/llvm-project?rev=61093&view=rev
Log:
Preserve SourceValue information when lowering produces multiple loads from
different offsets within the same stack slot.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp?rev=61093&r1=61092&r2=61093&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp Tue Dec 16 12:25:36 2008
@@ -19,6 +19,7 @@
 
 #include "LegalizeTypes.h"
 #include "llvm/Target/TargetData.h"
+#include "llvm/CodeGen/PseudoSourceValue.h"
 using namespace llvm;
 
 //===----------------------------------------------------------------------===//
@@ -83,12 +84,14 @@
   unsigned Alignment =
     TLI.getTargetData()->getPrefTypeAlignment(NOutVT.getTypeForMVT());
   SDValue StackPtr = DAG.CreateStackTemporary(InVT, Alignment);
+  int SPFI = cast<FrameIndexSDNode>(StackPtr.getNode())->getIndex();
+  const Value *SV = PseudoSourceValue::getFixedStack(SPFI);
 
   // Emit a store to the stack slot.
-  SDValue Store = DAG.getStore(DAG.getEntryNode(), InOp, StackPtr, NULL, 0);
+  SDValue Store = DAG.getStore(DAG.getEntryNode(), InOp, StackPtr, SV, 0);
 
   // Load the first half from the stack slot.
-  Lo = DAG.getLoad(NOutVT, Store, StackPtr, NULL, 0);
+  Lo = DAG.getLoad(NOutVT, Store, StackPtr, SV, 0);
 
   // Increment the pointer to the other half.
   unsigned IncrementSize = NOutVT.getSizeInBits() / 8;
@@ -96,7 +99,7 @@
                          DAG.getIntPtrConstant(IncrementSize));
 
   // Load the second half from the stack slot.
-  Hi = DAG.getLoad(NOutVT, Store, StackPtr, NULL, 0, false,
+  Hi = DAG.getLoad(NOutVT, Store, StackPtr, SV, IncrementSize, false,
                    MinAlign(Alignment, IncrementSize));
 
   // Handle endianness of the load.




From isanbard at gmail.com  Tue Dec 16 12:53:19 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Dec 2008 10:53:19 -0800
Subject: [llvm-commits] [llvm] r61030 - in /llvm/trunk:
	include/llvm/Attributes.h lib/AsmParser/llvmAsmParser.y
	lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Attributes.cpp
In-Reply-To: <49476D82.8070609@mxc.ca>
References: <200812150729.mBF7Ttg3027174@zion.cs.uiuc.edu>
	<C67C9844-2D24-478A-B7A7-FF9BE4D72C23@gmail.com>
	<49476D82.8070609@mxc.ca>
Message-ID: <16e5fdf90812161053n251e89c6vf245ad3b3777ff5b@mail.gmail.com>

On Tue, Dec 16, 2008 at 12:57 AM, Nick Lewycky <nicholas at mxc.ca> wrote:
> Bill Wendling wrote:
>> Nick,
>>
>> You patch r61019 is causing a bootstrap failure on PPC. Here's the
>> minimal testcase and the error:
>>
>> $ cat testcase.i
>> struct S {
>>    unsigned long long f1;
>>    unsigned long long f2;
>> };
>> static void func2(struct S);
>> void func1() {
>>    struct S a;
>>    func2(a);
>> }
>>
>> $ Volumes/SandBox/NightlyTest/test/llvm-gcc.obj/./prev-gcc/xgcc -B/
>> Volumes/SandBox/NightlyTest/test/llvm\
>> -gcc.obj/./prev-gcc/ -B/Volumes/SandBox/NightlyTest/test/llvm-
>> gcc.install/powerpc-apple-darwin9.5.0/bin\
>> / -c testcase.i
>> bash-3.2$ bash-3.2$ Assertion failed: (isPowerOf2_32(i) && "Alignment
>> must be a power of two."), functi\
>> on constructAlignmentFromInt, file /Volumes/SandBox/NightlyTest/test/
>> llvm.src/include/llvm/Attributes.h\
>> , line 81.
>> testcase.i: In function 'func1':
>> testcase.i:6: internal compiler error: Abort trap
>> Please submit a full bug report,
>> with preprocessed source if appropriate.
>> See <URL:http://developer.apple.com/bugreporter> for instructions.
>>
>> Unfortunately, this occurs in the front-end, so I can't create a .bc
>> file. Here is the backtrace:
>>
>> (gdb) bt
>> #0  0x95bfd278 in abort ()
>> #1  0x95bec904 in __assert_rtn ()
>> #2  0x0093396c in llvm::Attribute::constructAlignmentFromInt ()
>> #3  0x00862a6c in DefaultABI<(anonymous
>> namespace)::FunctionTypeConversion>::HandleArgument ()
>> #4  0x0084b4ec in TypeConverter::ConvertFunctionType ()
>> #5  0x007cf6fc in make_decl_llvm ()
>> #6  0x007e3790 in llvm_get_decl ()
>> #7  0x007e6fe0 in TreeToLLVM::EmitLV_DECL ()
>> #8  0x00816dcc in TreeToLLVM::EmitLV ()
>> #9  0x0081e7fc in TreeToLLVM::EmitADDR_EXPR ()
>> #10 0x00802734 in TreeToLLVM::Emit ()
>> #11 0x00801988 in TreeToLLVM::EmitCALL_EXPR ()
>> #12 0x00802750 in TreeToLLVM::Emit ()
>> #13 0x0081f558 in TreeToLLVM::EmitFunction ()
>> #14 0x007d22a4 in llvm_emit_code_for_current_function ()
>> #15 0x0018c3a8 in tree_rest_of_compilation ()
>> #16 0x0002d9bc in c_expand_body ()
>> #17 0x008df4dc in cgraph_expand_function ()
>> #18 0x008dba94 in cgraph_assemble_pending_functions ()
>> #19 0x008dc01c in cgraph_finalize_function ()
>> #20 0x0002d854 in finish_function ()
>> #21 0x000d88a0 in c_parser_declaration_or_fndef ()
>> #22 0x000d7afc in c_parser_external_declaration ()
>> #23 0x000d7968 in c_parser_translation_unit ()
>> #24 0x000eb214 in c_parse_file ()
>> #25 0x000c35dc in c_common_parse_file ()
>> #26 0x0070688c in compile_file ()
>> #27 0x007095e0 in do_compile ()
>> #28 0x00709680 in toplev_main ()
>> #29 0x0010b308 in main ()
>>
>> Could you back-out your changes and investigate?
>
> I'll do that if we can't resolve this quickly, but it's complicated by
> the fact that other patches have already gone in which depend on this
> one. I think it's just r61019 r61030 r61040 so far.
>
> The crash you pasted should only happen if there's a mismatch between
> LLVM and llvm-gcc versions. To be exact, it looks like llvm-gcc was
> picking up the newer Attribute.h from LLVM, while still linking against
> an older version of the LLVM libraries (perhaps installed in the system?).
>
> Could you please check to make sure that's not the case? If you're sure,
> I'll be happy to go ahead and back this change out (or you can do it if
> you like), but I want to be sure firts.
>
Hi Nick,

It failed again last night, which was r61086. It was using the correct
header files.

-bw


From isanbard at gmail.com  Tue Dec 16 13:04:48 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Dec 2008 11:04:48 -0800
Subject: [llvm-commits] [llvm] r61030 - in /llvm/trunk:
	include/llvm/Attributes.h lib/AsmParser/llvmAsmParser.y
	lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Attributes.cpp
In-Reply-To: <16e5fdf90812161053n251e89c6vf245ad3b3777ff5b@mail.gmail.com>
References: <200812150729.mBF7Ttg3027174@zion.cs.uiuc.edu>
	<C67C9844-2D24-478A-B7A7-FF9BE4D72C23@gmail.com>
	<49476D82.8070609@mxc.ca>
	<16e5fdf90812161053n251e89c6vf245ad3b3777ff5b@mail.gmail.com>
Message-ID: <16e5fdf90812161104t73211b1atd91205b0b784144d@mail.gmail.com>

On Tue, Dec 16, 2008 at 10:53 AM, Bill Wendling <isanbard at gmail.com> wrote:
> On Tue, Dec 16, 2008 at 12:57 AM, Nick Lewycky <nicholas at mxc.ca> wrote:
>> Bill Wendling wrote:
>>> Nick,
>>>
>>> You patch r61019 is causing a bootstrap failure on PPC. Here's the
>>> minimal testcase and the error:
>>>
>>> $ cat testcase.i
>>> struct S {
>>>    unsigned long long f1;
>>>    unsigned long long f2;
>>> };
>>> static void func2(struct S);
>>> void func1() {
>>>    struct S a;
>>>    func2(a);
>>> }
>>>
>>> $ Volumes/SandBox/NightlyTest/test/llvm-gcc.obj/./prev-gcc/xgcc -B/
>>> Volumes/SandBox/NightlyTest/test/llvm\
>>> -gcc.obj/./prev-gcc/ -B/Volumes/SandBox/NightlyTest/test/llvm-
>>> gcc.install/powerpc-apple-darwin9.5.0/bin\
>>> / -c testcase.i
>>> bash-3.2$ bash-3.2$ Assertion failed: (isPowerOf2_32(i) && "Alignment
>>> must be a power of two."), functi\
>>> on constructAlignmentFromInt, file /Volumes/SandBox/NightlyTest/test/
>>> llvm.src/include/llvm/Attributes.h\
>>> , line 81.
>>> testcase.i: In function 'func1':
>>> testcase.i:6: internal compiler error: Abort trap
>>> Please submit a full bug report,
>>> with preprocessed source if appropriate.
>>> See <URL:http://developer.apple.com/bugreporter> for instructions.
>>>
>>> Unfortunately, this occurs in the front-end, so I can't create a .bc
>>> file. Here is the backtrace:
>>>
>>> (gdb) bt
>>> #0  0x95bfd278 in abort ()
>>> #1  0x95bec904 in __assert_rtn ()
>>> #2  0x0093396c in llvm::Attribute::constructAlignmentFromInt ()
>>> #3  0x00862a6c in DefaultABI<(anonymous
>>> namespace)::FunctionTypeConversion>::HandleArgument ()
>>> #4  0x0084b4ec in TypeConverter::ConvertFunctionType ()
>>> #5  0x007cf6fc in make_decl_llvm ()
>>> #6  0x007e3790 in llvm_get_decl ()
>>> #7  0x007e6fe0 in TreeToLLVM::EmitLV_DECL ()
>>> #8  0x00816dcc in TreeToLLVM::EmitLV ()
>>> #9  0x0081e7fc in TreeToLLVM::EmitADDR_EXPR ()
>>> #10 0x00802734 in TreeToLLVM::Emit ()
>>> #11 0x00801988 in TreeToLLVM::EmitCALL_EXPR ()
>>> #12 0x00802750 in TreeToLLVM::Emit ()
>>> #13 0x0081f558 in TreeToLLVM::EmitFunction ()
>>> #14 0x007d22a4 in llvm_emit_code_for_current_function ()
>>> #15 0x0018c3a8 in tree_rest_of_compilation ()
>>> #16 0x0002d9bc in c_expand_body ()
>>> #17 0x008df4dc in cgraph_expand_function ()
>>> #18 0x008dba94 in cgraph_assemble_pending_functions ()
>>> #19 0x008dc01c in cgraph_finalize_function ()
>>> #20 0x0002d854 in finish_function ()
>>> #21 0x000d88a0 in c_parser_declaration_or_fndef ()
>>> #22 0x000d7afc in c_parser_external_declaration ()
>>> #23 0x000d7968 in c_parser_translation_unit ()
>>> #24 0x000eb214 in c_parse_file ()
>>> #25 0x000c35dc in c_common_parse_file ()
>>> #26 0x0070688c in compile_file ()
>>> #27 0x007095e0 in do_compile ()
>>> #28 0x00709680 in toplev_main ()
>>> #29 0x0010b308 in main ()
>>>
>>> Could you back-out your changes and investigate?
>>
>> I'll do that if we can't resolve this quickly, but it's complicated by
>> the fact that other patches have already gone in which depend on this
>> one. I think it's just r61019 r61030 r61040 so far.
>>
>> The crash you pasted should only happen if there's a mismatch between
>> LLVM and llvm-gcc versions. To be exact, it looks like llvm-gcc was
>> picking up the newer Attribute.h from LLVM, while still linking against
>> an older version of the LLVM libraries (perhaps installed in the system?).
>>
>> Could you please check to make sure that's not the case? If you're sure,
>> I'll be happy to go ahead and back this change out (or you can do it if
>> you like), but I want to be sure firts.
>>
> Hi Nick,
>
> It failed again last night, which was r61086. It was using the correct
> header files.
>
Now it's failing on X86 in release mode. I'm going to go ahead and
revert those patches.

-bw


From isanbard at gmail.com  Tue Dec 16 13:06:53 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Dec 2008 19:06:53 -0000
Subject: [llvm-commits] [llvm] r61094 - in /llvm/trunk:
 docs/AliasAnalysis.html docs/LangRef.html include/llvm/Attributes.h
 lib/Analysis/BasicAliasAnalysis.cpp lib/AsmParser/LLLexer.cpp
 lib/AsmParser/llvmAsmParser.y lib/Bitcode/Reader/BitcodeReader.cpp
 lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Attributes.cpp
 test/Analysis/BasicAA/nocapture.ll
Message-ID: <200812161906.mBGJ6uTg021611@zion.cs.uiuc.edu>

Author: void
Date: Tue Dec 16 13:06:48 2008
New Revision: 61094

URL: http://llvm.org/viewvc/llvm-project?rev=61094&view=rev
Log:
Temporarily revert r61019, r61030, and r61040. These were breaking LLVM Release
builds.

Modified:
    llvm/trunk/docs/AliasAnalysis.html
    llvm/trunk/docs/LangRef.html
    llvm/trunk/include/llvm/Attributes.h
    llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
    llvm/trunk/lib/AsmParser/LLLexer.cpp
    llvm/trunk/lib/AsmParser/llvmAsmParser.y
    llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
    llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
    llvm/trunk/lib/VMCore/Attributes.cpp
    llvm/trunk/test/Analysis/BasicAA/nocapture.ll

Modified: llvm/trunk/docs/AliasAnalysis.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/AliasAnalysis.html?rev=61094&r1=61093&r2=61094&view=diff

==============================================================================
--- llvm/trunk/docs/AliasAnalysis.html (original)
+++ llvm/trunk/docs/AliasAnalysis.html Tue Dec 16 13:06:48 2008
@@ -192,11 +192,11 @@
 
 <div class="doc_text">
 <p>The NoAlias response is used when the two pointers refer to distinct objects,
-regardless of whether the pointers compare equal.  For example, freed pointers
-don't alias any pointers that were allocated afterwards.  As a degenerate case,
-pointers returned by malloc(0) have no bytes for an object, and are considered
-NoAlias even when malloc returns the same pointer.  The same rule applies to
-NULL pointers.</p>
+even regardless of whether the pointers compare equal.  For example, freed
+pointers don't alias any pointers that were allocated afterwards.  As a
+degenerate case, pointers returned by malloc(0) have no bytes for an object,
+and are considered NoAlias even when malloc returns the same pointer.  The same
+rule applies to NULL pointers.</p>
 
 <p>The MayAlias response is used whenever the two pointers might refer to the
 same object.  If the two memory objects overlap, but do not start at the same

Modified: llvm/trunk/docs/LangRef.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=61094&r1=61093&r2=61094&view=diff

==============================================================================
--- llvm/trunk/docs/LangRef.html (original)
+++ llvm/trunk/docs/LangRef.html Tue Dec 16 13:06:48 2008
@@ -894,15 +894,9 @@
     parameter.  The caller is responsible for ensuring that this is the
     case. On a function return value, <tt>noalias</tt> additionally indicates
     that the pointer does not alias any other pointers visible to the
-    caller. For further details, please see the discussion of the NoAlias
-    response in
-    <a href="http://llvm.org/docs/AliasAnalysis.html#MustMayNo">alias
-    analysis</a>.</dd>
-
-    <dt><tt>nocapture</tt></dt>
-    <dd>This indicates that the callee does not make any copies of the pointer
-    that outlive the callee itself. This is not a valid attribute for return
-    values.</dd>
+    caller. Note that this applies only to pointers that can be used to actually
+    load/store a value: NULL, unique pointers from malloc(0), and freed pointers
+    are considered to not alias anything.</dd>
 
     <dt><tt>nest</tt></dt>
     <dd>This indicates that the pointer parameter can be excised using the

Modified: llvm/trunk/include/llvm/Attributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=61094&r1=61093&r2=61094&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Attributes.h (original)
+++ llvm/trunk/include/llvm/Attributes.h Tue Dec 16 13:06:48 2008
@@ -15,7 +15,6 @@
 #ifndef LLVM_ATTRIBUTES_H
 #define LLVM_ATTRIBUTES_H
 
-#include "llvm/Support/MathExtras.h"
 #include <cassert>
 #include <string>
 
@@ -24,7 +23,7 @@
 
 /// Attributes - A bitset of attributes.
 typedef unsigned Attributes;
-
+  
 namespace Attribute {
 
 /// Function parameters and results can have attributes to indicate how they 
@@ -45,18 +44,16 @@
 const Attributes Nest      = 1<<8;  ///< Nested function static chain
 const Attributes ReadNone  = 1<<9;  ///< Function does not access memory
 const Attributes ReadOnly  = 1<<10; ///< Function only reads from memory
-const Attributes NoInline        = 1<<11; ///< inline=never 
-const Attributes AlwaysInline    = 1<<12; ///< inline=always
-const Attributes OptimizeForSize = 1<<13; ///< opt_size
-const Attributes StackProtect    = 1<<14; ///< Stack protection.
-const Attributes StackProtectReq = 1<<15; ///< Stack protection required.
-const Attributes Alignment = 31<<16; ///< Alignment of parameter (5 bits)
-                                     // stored as log2 of alignment with +1 bias
-                                     // 0 means unaligned different from align 1
-const Attributes NoCapture = 1<<21; ///< Function creates no aliases of pointer
-
+const Attributes NoInline        = 1<<11; // inline=never 
+const Attributes AlwaysInline    = 1<<12; // inline=always
+const Attributes OptimizeForSize = 1<<13; // opt_size
+const Attributes StackProtect    = 1<<14; // Stack protection.
+const Attributes StackProtectReq = 1<<15; // Stack protection required.
+const Attributes Alignment = 0xffff<<16; ///< Alignment of parameter (16 bits)
+                                    // 0 = unknown, else in clear (not log)
+                                    
 /// @brief Attributes that only apply to function parameters.
-const Attributes ParameterOnly = ByVal | Nest | StructRet | NoCapture;
+const Attributes ParameterOnly = ByVal | Nest | StructRet;
 
 /// @brief Attributes that only apply to function.
 const Attributes FunctionOnly = NoReturn | NoUnwind | ReadNone | ReadOnly | 
@@ -67,7 +64,7 @@
 
 /// @brief Attributes that are mutually incompatible.
 const Attributes MutuallyIncompatible[4] = {
-  ByVal | InReg | Nest | StructRet,
+  ByVal | InReg | Nest  | StructRet,
   ZExt  | SExt,
   ReadNone | ReadOnly,
   NoInline | AlwaysInline
@@ -79,9 +76,7 @@
 /// This turns an int alignment (a power of 2, normally) into the
 /// form used internally in Attributes.
 inline Attributes constructAlignmentFromInt(unsigned i) {
-  assert(isPowerOf2_32(i) && "Alignment must be a power of two.");
-  assert(i <= 0x40000000 && "Alignment too large.");
-  return (Log2_32(i)+1) << 16;
+  return (i << 16);
 }
 
 /// The set of Attributes set in Attributes is converted to a
@@ -180,7 +175,7 @@
   /// getParamAlignment - Return the alignment for the specified function
   /// parameter.
   unsigned getParamAlignment(unsigned Idx) const {
-    return 1ull << (((getAttributes(Idx) & Attribute::Alignment) >> 16) - 1);
+    return (getAttributes(Idx) & Attribute::Alignment) >> 16;
   }
   
   /// hasAttrSomewhere - Return true if the specified attribute is set for at

Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=61094&r1=61093&r2=61094&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original)
+++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Tue Dec 16 13:06:48 2008
@@ -63,23 +63,12 @@
       // callees could modify it.
       break; // next use
     case Instruction::Call:
-      // If the argument to the call has the nocapture attribute, then the call
-      // may store or load to the pointer, but it cannot escape.
-      if (cast<CallInst>(I)->paramHasAttr(UI.getOperandNo(), 
-                                          Attribute::NoCapture))
-        continue;
-
-      // FIXME: MemIntrinsics should have their operands marked nocapture!
-      if (isa<MemIntrinsic>(I))
-        continue;  // next use
-      return true;
-    case Instruction::Invoke:
-      // If the argument to the call has the nocapture attribute, then the call
-      // may store or load to the pointer, but it cannot escape.
-      if (cast<InvokeInst>(I)->paramHasAttr(UI.getOperandNo()-2,
-                                            Attribute::NoCapture))
-        continue;
-      return true;
+      // If the call is to a few known safe intrinsics, we know that it does
+      // not escape.
+      // TODO: Eventually just check the 'nocapture' attribute.
+      if (!isa<MemIntrinsic>(I))
+        return true;
+      break;  // next use
     default:
       return true;
     }

Modified: llvm/trunk/lib/AsmParser/LLLexer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLLexer.cpp?rev=61094&r1=61093&r2=61094&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/LLLexer.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLLexer.cpp Tue Dec 16 13:06:48 2008
@@ -491,7 +491,6 @@
   KEYWORD("nounwind", NOUNWIND);
   KEYWORD("noreturn", NORETURN);
   KEYWORD("noalias", NOALIAS);
-  KEYWORD("nocapture", NOCAPTURE);
   KEYWORD("byval", BYVAL);
   KEYWORD("nest", NEST);
   KEYWORD("readnone", READNONE);

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=61094&r1=61093&r2=61094&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Dec 16 13:06:48 2008
@@ -1136,8 +1136,8 @@
 %token <OtherOpVal> EXTRACTVALUE INSERTVALUE
 
 // Function Attributes
-%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS NOCAPTURE BYVAL
-%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ NEST
+%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST
+%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ
 
 // Visibility Styles
 %token DEFAULT HIDDEN PROTECTED
@@ -1265,16 +1265,15 @@
                   CHECK_FOR_ERROR
                  };
 
-Attribute     : ZEROEXT   { $$ = Attribute::ZExt;      }
-              | ZEXT      { $$ = Attribute::ZExt;      }
-              | SIGNEXT   { $$ = Attribute::SExt;      }
-              | SEXT      { $$ = Attribute::SExt;      }
-              | INREG     { $$ = Attribute::InReg;     }
-              | SRET      { $$ = Attribute::StructRet; }
-              | NOALIAS   { $$ = Attribute::NoAlias;   }
-              | NOCAPTURE { $$ = Attribute::NoCapture; }
-              | BYVAL     { $$ = Attribute::ByVal;     }
-              | NEST      { $$ = Attribute::Nest;      }
+Attribute     : ZEROEXT { $$ = Attribute::ZExt;      }
+              | ZEXT    { $$ = Attribute::ZExt;      }
+              | SIGNEXT { $$ = Attribute::SExt;      }
+              | SEXT    { $$ = Attribute::SExt;      }
+              | INREG   { $$ = Attribute::InReg;     }
+              | SRET    { $$ = Attribute::StructRet; }
+              | NOALIAS { $$ = Attribute::NoAlias;   }
+              | BYVAL   { $$ = Attribute::ByVal;     }
+              | NEST    { $$ = Attribute::Nest;      }
               | ALIGN EUINT64VAL { $$ =
                           Attribute::constructAlignmentFromInt($2);    }
               ;
@@ -1332,8 +1331,6 @@
   $$ = $2;
   if ($$ != 0 && !isPowerOf2_32($$))
     GEN_ERROR("Alignment must be a power of two");
-  if ($$ > 0x40000000)
-    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 };
 OptCAlign : /*empty*/            { $$ = 0; } |
@@ -1341,8 +1338,6 @@
   $$ = $3;
   if ($$ != 0 && !isPowerOf2_32($$))
     GEN_ERROR("Alignment must be a power of two");
-  if ($$ > 0x40000000)
-    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 };
 
@@ -1372,8 +1367,6 @@
   | ALIGN EUINT64VAL {
     if ($2 != 0 && !isPowerOf2_32($2))
       GEN_ERROR("Alignment must be a power of two");
-    if ($2 > 0x40000000)
-      GEN_ERROR("Alignment too large");
     CurGV->setAlignment($2);
     CHECK_FOR_ERROR
   };

Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=61094&r1=61093&r2=61094&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Tue Dec 16 13:06:48 2008
@@ -362,20 +362,6 @@
       Attributes RetAttribute = Attribute::None;
       Attributes FnAttribute = Attribute::None;
       for (unsigned i = 0, e = Record.size(); i != e; i += 2) {
-        // FIXME: remove in LLVM 3.0
-        // The alignment is stored as a 16-bit raw value from bits 31--16.
-        // We shift the bits above 31 down by 11 bits.
-
-        unsigned Alignment = (Record[i+1] & (0xffffull << 16)) >> 16;
-        if (Alignment && !isPowerOf2_32(Alignment))
-          return Error("Alignment is not a power of two.");
-
-        Attributes ReconstitutedAttr = Record[i+1] & 0xffff;
-        if (Alignment)
-          ReconstitutedAttr |= Attribute::constructAlignmentFromInt(Alignment);
-        ReconstitutedAttr |= (Record[i+1] & (0xffffull << 32)) >> 11;
-        Record[i+1] = ReconstitutedAttr;
-
         if (Record[i] == 0)
           RetAttribute = Record[i+1];
         else if (Record[i] == ~0U)

Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=61094&r1=61093&r2=61094&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
+++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Tue Dec 16 13:06:48 2008
@@ -122,17 +122,7 @@
     for (unsigned i = 0, e = A.getNumSlots(); i != e; ++i) {
       const AttributeWithIndex &PAWI = A.getSlot(i);
       Record.push_back(PAWI.Index);
-
-      // FIXME: remove in LLVM 3.0
-      // Store the alignment in the bitcode as a 16-bit raw value instead of a
-      // 5-bit log2 encoded value. Shift the bits above the alignment up by
-      // 11 bits.
-      uint64_t FauxAttr = PAWI.Attrs & 0xffff;
-      if (PAWI.Attrs & Attribute::Alignment)
-        FauxAttr |= (1ull<<16)<<(((PAWI.Attrs & Attribute::Alignment)-1) >> 16);
-      FauxAttr |= (PAWI.Attrs & (0x3FFull << 21)) << 11;
-
-      Record.push_back(FauxAttr);
+      Record.push_back(PAWI.Attrs);
     }
     
     Stream.EmitRecord(bitc::PARAMATTR_CODE_ENTRY, Record);

Modified: llvm/trunk/lib/VMCore/Attributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?rev=61094&r1=61093&r2=61094&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Attributes.cpp (original)
+++ llvm/trunk/lib/VMCore/Attributes.cpp Tue Dec 16 13:06:48 2008
@@ -37,8 +37,6 @@
     Result += "inreg ";
   if (Attrs & Attribute::NoAlias)
     Result += "noalias ";
-  if (Attrs & Attribute::NoCapture)
-    Result += "nocapture ";
   if (Attrs & Attribute::StructRet)
     Result += "sret ";  
   if (Attrs & Attribute::ByVal)
@@ -61,11 +59,10 @@
     Result += "sspreq ";
   if (Attrs & Attribute::Alignment) {
     Result += "align ";
-    Result += utostr(1ull << (((Attrs & Attribute::Alignment)>>16) - 1));
+    Result += utostr((Attrs & Attribute::Alignment) >> 16);
     Result += " ";
   }
   // Trim the trailing space.
-  assert(!Result.empty() && "Unknown attribute!");
   Result.erase(Result.end()-1);
   return Result;
 }
@@ -79,7 +76,7 @@
   
   if (!isa<PointerType>(Ty))
     // Attributes that only apply to pointers.
-    Incompatible |= ByVal | Nest | NoAlias | StructRet | NoCapture;
+    Incompatible |= ByVal | Nest | NoAlias | StructRet;
   
   return Incompatible;
 }

Modified: llvm/trunk/test/Analysis/BasicAA/nocapture.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/BasicAA/nocapture.ll?rev=61094&r1=61093&r2=61094&view=diff

==============================================================================
--- llvm/trunk/test/Analysis/BasicAA/nocapture.ll (original)
+++ llvm/trunk/test/Analysis/BasicAA/nocapture.ll Tue Dec 16 13:06:48 2008
@@ -1,13 +0,0 @@
-; RUN: llvm-as < %s | opt -basicaa -gvn -instcombine | llvm-dis | grep {ret i32 0}
-
-declare i32* @test(i32* nocapture)
-
-define i32 @test2() {
-	%P = alloca i32
-	%Q = call i32* @test(i32* %P)
-	%a = load i32* %P
-	store i32 4, i32* %Q   ;; cannot clobber P since it is nocapture.
-	%b = load i32* %P
-	%c = sub i32 %a, %b
-	ret i32 %c
-}




From isanbard at gmail.com  Tue Dec 16 13:07:18 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Tue, 16 Dec 2008 19:07:18 -0000
Subject: [llvm-commits] [llvm] r61095 -
	/llvm/trunk/test/Analysis/BasicAA/nocapture.ll
Message-ID: <200812161907.mBGJ7Ina021633@zion.cs.uiuc.edu>

Author: void
Date: Tue Dec 16 13:07:17 2008
New Revision: 61095

URL: http://llvm.org/viewvc/llvm-project?rev=61095&view=rev
Log:
Remove empty test.

Removed:
    llvm/trunk/test/Analysis/BasicAA/nocapture.ll

Removed: llvm/trunk/test/Analysis/BasicAA/nocapture.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/BasicAA/nocapture.ll?rev=61094&view=auto

==============================================================================
    (empty)




From gohman at apple.com  Tue Dec 16 13:27:53 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 19:27:53 -0000
Subject: [llvm-commits] [llvm] r61096 -
	/llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp
Message-ID: <200812161927.mBGJRrX7022263@zion.cs.uiuc.edu>

Author: djg
Date: Tue Dec 16 13:27:52 2008
New Revision: 61096

URL: http://llvm.org/viewvc/llvm-project?rev=61096&view=rev
Log:
Eliminate the loop that walks the critical path. Instead, just track the
position in the critical path during the main instruction walk.  This
eliminates the need for the CritialAntiDep DenseMap.

Modified:
    llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp

Modified: llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp?rev=61096&r1=61095&r2=61096&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp (original)
+++ llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp Tue Dec 16 13:27:52 2008
@@ -42,8 +42,8 @@
 
 static cl::opt<bool>
 EnableAntiDepBreaking("break-anti-dependencies",
-                      cl::desc("Break scheduling anti-dependencies"),
-                      cl::init(true));
+                      cl::desc("Break post-RA scheduling anti-dependencies"),
+                      cl::init(true), cl::Hidden);
 
 namespace {
   class VISIBILITY_HIDDEN PostRAScheduler : public MachineFunctionPass {
@@ -198,50 +198,14 @@
   DOUT << "Critical path has total latency "
        << (Max ? Max->getDepth() + Max->Latency : 0) << "\n";
 
-  // Walk the critical path from the bottom up. Collect all anti-dependence
-  // edges on the critical path. Skip anti-dependencies between SUnits that
-  // are connected with other edges, since such units won't be able to be
-  // scheduled past each other anyway.
-  //
-  // The heuristic is that edges on the critical path are more important to
-  // break than other edges. And since there are a limited number of
-  // registers, we don't want to waste them breaking edges that aren't
-  // important.
-  // 
-  // TODO: Instructions with multiple defs could have multiple
-  // anti-dependencies. The current code here only knows how to break one
-  // edge per instruction. Note that we'd have to be able to break all of
-  // the anti-dependencies in an instruction in order to be effective.
-  BitVector AllocatableSet = TRI->getAllocatableSet(*MF);
-  DenseMap<MachineInstr *, unsigned> CriticalAntiDeps;
-  SUnit *SU = Max;
-  for (SDep *Edge = CriticalPathStep(SU); Edge;
-       Edge = CriticalPathStep(SU = Edge->getSUnit())) {
-    SUnit *NextSU = Edge->getSUnit();
-    // Only consider anti-dependence edges.
-    if (Edge->getKind() != SDep::Anti)
-      continue;
-    unsigned AntiDepReg = Edge->getReg();
-    assert(AntiDepReg != 0 && "Anti-dependence on reg0?");
-    // Don't break anti-dependencies on non-allocatable registers.
-    if (!AllocatableSet.test(AntiDepReg))
-      continue;
-    // If the SUnit has other dependencies on the SUnit that it
-    // anti-depends on, don't bother breaking the anti-dependency.
-    // Also, if there are dependencies on other SUnits with the
-    // same register as the anti-dependency, don't attempt to
-    // break it.
-    for (SUnit::pred_iterator P = SU->Preds.begin(), PE = SU->Preds.end();
-         P != PE; ++P)
-      if (P->getSUnit() == NextSU ?
-            (P->getKind() != SDep::Anti || P->getReg() != AntiDepReg) :
-            (P->getKind() == SDep::Data && P->getReg() == AntiDepReg)) {
-        AntiDepReg = 0;
-        break;
-      }
-    if (AntiDepReg != 0)
-      CriticalAntiDeps[SU->getInstr()] = AntiDepReg;
-  }
+  // We'll be ignoring anti-dependencies on non-allocatable registers, because
+  // they may not be safe to break.
+  const BitVector AllocatableSet = TRI->getAllocatableSet(*MF);
+
+  // Track progress along the critical path through the SUnit graph as we walk
+  // the instructions.
+  SUnit *CriticalPathSU = Max;
+  MachineInstr *CriticalPathMI = CriticalPathSU->getInstr();
 
   // For live regs that are only used in one register class in a live range,
   // the register class. If the register is not live, the corresponding value
@@ -257,13 +221,13 @@
   // the register is not live.
   unsigned KillIndices[TargetRegisterInfo::FirstVirtualRegister];
   std::fill(KillIndices, array_endof(KillIndices), -1);
-  // The index of the most recent def (proceding bottom up), or -1 if
+  // The index of the most recent complete def (proceding bottom up), or -1 if
   // the register is live.
   unsigned DefIndices[TargetRegisterInfo::FirstVirtualRegister];
   std::fill(DefIndices, array_endof(DefIndices), BB->size());
 
   // Determine the live-out physregs for this block.
-  if (!BB->empty() && BB->back().getDesc().isReturn())
+  if (BB->back().getDesc().isReturn())
     // In a return block, examine the function live-out regs.
     for (MachineRegisterInfo::liveout_iterator I = MRI.liveout_begin(),
          E = MRI.liveout_end(); I != E; ++I) {
@@ -305,7 +269,7 @@
   // TODO: If the callee saves and restores these, then we can potentially
   // use them between the save and the restore. To do that, we could scan
   // the exit blocks to see which of these registers are defined.
-  // Alternatively, calle-saved registers that aren't saved and restored
+  // Alternatively, callee-saved registers that aren't saved and restored
   // could be marked live-in in every block.
   for (const unsigned *I = TRI->getCalleeSavedRegs(); *I; ++I) {
     unsigned Reg = *I;
@@ -380,11 +344,56 @@
     if (MI->getOpcode() == TargetInstrInfo::IMPLICIT_DEF)
       continue;
 
-    // Check if this instruction has an anti-dependence that we're
-    // interested in.
-    DenseMap<MachineInstr *, unsigned>::iterator C = CriticalAntiDeps.find(MI);
-    unsigned AntiDepReg = C != CriticalAntiDeps.end() ?
-      C->second : 0;
+    // Check if this instruction has a dependence on the critical path that
+    // is an anti-dependence that we may be able to break. If it is, set
+    // AntiDepReg to the non-zero register associated with the anti-dependence.
+    //
+    // We limit our attention to the critical path as a heuristic to avoid
+    // breaking anti-dependence edges that aren't going to significantly
+    // impact the overall schedule. There are a limited number of registers
+    // and we want to save them for the important edges.
+    // 
+    // TODO: Instructions with multiple defs could have multiple
+    // anti-dependencies. The current code here only knows how to break one
+    // edge per instruction. Note that we'd have to be able to break all of
+    // the anti-dependencies in an instruction in order to be effective.
+    unsigned AntiDepReg = 0;
+    if (MI == CriticalPathMI) {
+      if (SDep *Edge = CriticalPathStep(CriticalPathSU)) {
+        SUnit *NextSU = Edge->getSUnit();
+
+        // Only consider anti-dependence edges.
+        if (Edge->getKind() == SDep::Anti) {
+          AntiDepReg = Edge->getReg();
+          assert(AntiDepReg != 0 && "Anti-dependence on reg0?");
+          // Don't break anti-dependencies on non-allocatable registers.
+          if (AllocatableSet.test(AntiDepReg)) {
+            // If the SUnit has other dependencies on the SUnit that it
+            // anti-depends on, don't bother breaking the anti-dependency
+            // since those edges would prevent such units from being
+            // scheduled past each other regardless.
+            //
+            // Also, if there are dependencies on other SUnits with the
+            // same register as the anti-dependency, don't attempt to
+            // break it.
+            for (SUnit::pred_iterator P = CriticalPathSU->Preds.begin(),
+                 PE = CriticalPathSU->Preds.end(); P != PE; ++P)
+              if (P->getSUnit() == NextSU ?
+                    (P->getKind() != SDep::Anti || P->getReg() != AntiDepReg) :
+                    (P->getKind() == SDep::Data && P->getReg() == AntiDepReg)) {
+                AntiDepReg = 0;
+                break;
+              }
+          }
+        }
+        CriticalPathSU = NextSU;
+        CriticalPathMI = CriticalPathSU->getInstr();
+      } else {
+        // We've reached the end of the critical path.
+        CriticalPathSU = 0;
+        CriticalPathMI = 0;
+      }
+    }
 
     // Scan the register operands for this instruction and update
     // Classes and RegRefs.
@@ -514,6 +523,7 @@
         Classes[SubregReg] = 0;
         RegRefs.erase(SubregReg);
       }
+      // Conservatively mark super-registers as unusable.
       for (const unsigned *Super = TRI->getSuperRegisters(Reg);
            *Super; ++Super) {
         unsigned SuperReg = *Super;




From eli.friedman at gmail.com  Tue Dec 16 14:54:33 2008
From: eli.friedman at gmail.com (Eli Friedman)
Date: Tue, 16 Dec 2008 20:54:33 -0000
Subject: [llvm-commits] [llvm] r61100 - in /llvm/trunk:
 lib/Transforms/Utils/SimplifyCFG.cpp
 test/Transforms/SimplifyCFG/2008-12-16-DCECond.ll
Message-ID: <200812162054.mBGKsXdP025021@zion.cs.uiuc.edu>

Author: efriedma
Date: Tue Dec 16 14:54:32 2008
New Revision: 61100

URL: http://llvm.org/viewvc/llvm-project?rev=61100&view=rev
Log:
Add a helper to remove a branch and DCE the condition, and use it 
consistently for deleting branches.  In addition to being slightly 
more readable, this makes SimplifyCFG a bit better 
about cleaning up after itself when it makes conditions unused.


Added:
    llvm/trunk/test/Transforms/SimplifyCFG/2008-12-16-DCECond.ll
Modified:
    llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp

Modified: llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp?rev=61100&r1=61099&r2=61100&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/SimplifyCFG.cpp Tue Dec 16 14:54:32 2008
@@ -386,6 +386,7 @@
         // We can hoist loads that are non-volatile and obviously cannot trap.
         if (cast<LoadInst>(I)->isVolatile())
           return false;
+        // FIXME: A computation of a constant can trap!
         if (!isa<AllocaInst>(I->getOperand(0)) &&
             !isa<Constant>(I->getOperand(0)))
           return false;
@@ -494,6 +495,19 @@
   return false;
 }
 
+static void EraseTerminatorInstAndDCECond(TerminatorInst *TI) {
+  Instruction* Cond = 0;
+  if (SwitchInst *SI = dyn_cast<SwitchInst>(TI)) {
+    Cond = dyn_cast<Instruction>(SI->getCondition());
+  } else if (BranchInst *BI = dyn_cast<BranchInst>(TI)) {
+    if (BI->isConditional())
+      Cond = dyn_cast<Instruction>(BI->getCondition());
+  }
+
+  TI->eraseFromParent();
+  if (Cond) RecursivelyDeleteTriviallyDeadInstructions(Cond);
+}
+
 /// isValueEqualityComparison - Return true if the specified terminator checks
 /// to see if a value is equal to constant integer value.
 static Value *isValueEqualityComparison(TerminatorInst *TI) {
@@ -617,11 +631,10 @@
     // PredCases.  If there are any cases in ThisCases that are in PredCases, we
     // can simplify TI.
     if (ValuesOverlap(PredCases, ThisCases)) {
-      if (BranchInst *BTI = dyn_cast<BranchInst>(TI)) {
+      if (isa<BranchInst>(TI)) {
         // Okay, one of the successors of this condbr is dead.  Convert it to a
         // uncond br.
         assert(ThisCases.size() == 1 && "Branch can only have one case!");
-        Value *Cond = BTI->getCondition();
         // Insert the new branch.
         Instruction *NI = BranchInst::Create(ThisDef, TI);
 
@@ -631,10 +644,7 @@
         DOUT << "Threading pred instr: " << *Pred->getTerminator()
              << "Through successor TI: " << *TI << "Leaving: " << *NI << "\n";
 
-        TI->eraseFromParent();   // Nuke the old one.
-        // If condition is now dead, nuke it.
-        if (Instruction *CondI = dyn_cast<Instruction>(Cond))
-          RecursivelyDeleteTriviallyDeadInstructions(CondI);
+        EraseTerminatorInstAndDCECond(TI);
         return true;
 
       } else {
@@ -697,12 +707,8 @@
 
     DOUT << "Threading pred instr: " << *Pred->getTerminator()
          << "Through successor TI: " << *TI << "Leaving: " << *NI << "\n";
-    Instruction *Cond = 0;
-    if (BranchInst *BI = dyn_cast<BranchInst>(TI))
-      Cond = dyn_cast<Instruction>(BI->getCondition());
-    TI->eraseFromParent();   // Nuke the old one.
 
-    if (Cond) RecursivelyDeleteTriviallyDeadInstructions(Cond);
+    EraseTerminatorInstAndDCECond(TI);
     return true;
   }
   return false;
@@ -811,14 +817,7 @@
       for (unsigned i = 0, e = PredCases.size(); i != e; ++i)
         NewSI->addCase(PredCases[i].first, PredCases[i].second);
 
-      Instruction *DeadCond = 0;
-      if (BranchInst *BI = dyn_cast<BranchInst>(PTI))
-        // If PTI is a branch, remember the condition.
-        DeadCond = dyn_cast<Instruction>(BI->getCondition());
-      Pred->getInstList().erase(PTI);
-
-      // If the condition is dead now, remove the instruction tree.
-      if (DeadCond) RecursivelyDeleteTriviallyDeadInstructions(DeadCond);
+      EraseTerminatorInstAndDCECond(PTI);
 
       // Okay, last check.  If BB is still a successor of PSI, then we must
       // have an infinite loop case.  If so, add an infinitely looping block
@@ -921,7 +920,7 @@
   for (succ_iterator SI = succ_begin(BB1), E = succ_end(BB1); SI != E; ++SI)
     AddPredecessorToBlock(*SI, BIParent, BB1);
 
-  BI->eraseFromParent();
+  EraseTerminatorInstAndDCECond(BI);
   return true;
 }
 
@@ -1331,7 +1330,7 @@
     TrueSucc->removePredecessor(BI->getParent());
     FalseSucc->removePredecessor(BI->getParent());
     ReturnInst::Create(0, BI);
-    BI->eraseFromParent();
+    EraseTerminatorInstAndDCECond(BI);
     return true;
   }
     
@@ -1386,10 +1385,8 @@
        << "\n  " << *BI << "NewRet = " << *RI
        << "TRUEBLOCK: " << *TrueSucc << "FALSEBLOCK: "<< *FalseSucc;
       
-  BI->eraseFromParent();
-  
-  if (Instruction *BrCondI = dyn_cast<Instruction>(BrCond))
-    RecursivelyDeleteTriviallyDeadInstructions(BrCondI);
+  EraseTerminatorInstAndDCECond(BI);
+
   return true;
 }
 
@@ -1910,10 +1907,10 @@
           } else {
             if (BI->getSuccessor(0) == BB) {
               BranchInst::Create(BI->getSuccessor(1), BI);
-              BI->eraseFromParent();
+              EraseTerminatorInstAndDCECond(BI);
             } else if (BI->getSuccessor(1) == BB) {
               BranchInst::Create(BI->getSuccessor(0), BI);
-              BI->eraseFromParent();
+              EraseTerminatorInstAndDCECond(BI);
               Changed = true;
             }
           }
@@ -2086,11 +2083,7 @@
           }
 
           // Erase the old branch instruction.
-          (*PI)->getInstList().erase(BI);
-
-          // Erase the potentially condition tree that was used to computed the
-          // branch condition.
-          RecursivelyDeleteTriviallyDeadInstructions(Cond);
+          EraseTerminatorInstAndDCECond(BI);
           return true;
         }
       }

Added: llvm/trunk/test/Transforms/SimplifyCFG/2008-12-16-DCECond.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyCFG/2008-12-16-DCECond.ll?rev=61100&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/SimplifyCFG/2008-12-16-DCECond.ll (added)
+++ llvm/trunk/test/Transforms/SimplifyCFG/2008-12-16-DCECond.ll Tue Dec 16 14:54:32 2008
@@ -0,0 +1,46 @@
+; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep icmp
+; ModuleID = '/tmp/x.bc'
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+target triple = "i686-pc-linux-gnu"
+
+define i32 @x(i32 %x) {
+entry:
+	%cmp = icmp eq i32 %x, 8		; <i1> [#uses=1]
+	br i1 %cmp, label %ifthen, label %ifend
+
+ifthen:		; preds = %entry
+	%call = call i32 (...)* @foo()		; <i32> [#uses=0]
+	br label %ifend
+
+ifend:		; preds = %ifthen, %entry
+	%cmp2 = icmp ne i32 %x, 8		; <i1> [#uses=1]
+	br i1 %cmp2, label %ifthen3, label %ifend5
+
+ifthen3:		; preds = %ifend
+	%call4 = call i32 (...)* @foo()		; <i32> [#uses=0]
+	br label %ifend5
+
+ifend5:		; preds = %ifthen3, %ifend
+	%cmp7 = icmp eq i32 %x, 9		; <i1> [#uses=1]
+	br i1 %cmp7, label %ifthen8, label %ifend10
+
+ifthen8:		; preds = %ifend5
+	%call9 = call i32 (...)* @bar()		; <i32> [#uses=0]
+	br label %ifend10
+
+ifend10:		; preds = %ifthen8, %ifend5
+	%cmp12 = icmp ne i32 %x, 9		; <i1> [#uses=1]
+	br i1 %cmp12, label %ifthen13, label %ifend15
+
+ifthen13:		; preds = %ifend10
+	%call14 = call i32 (...)* @bar()		; <i32> [#uses=0]
+	br label %ifend15
+
+ifend15:		; preds = %ifthen13, %ifend10
+	ret i32 0
+}
+
+declare i32 @foo(...)
+
+declare i32 @bar(...)
+




From sabre at nondot.org  Tue Dec 16 15:04:52 2008
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 16 Dec 2008 21:04:52 -0000
Subject: [llvm-commits] [llvm] r61101 - in /llvm/trunk:
 lib/Transforms/IPO/GlobalOpt.cpp
 test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll
 test/Transforms/GlobalOpt/heap-sra-2.ll
Message-ID: <200812162104.mBGL4stS025445@zion.cs.uiuc.edu>

Author: lattner
Date: Tue Dec 16 15:04:51 2008
New Revision: 61101

URL: http://llvm.org/viewvc/llvm-project?rev=61101&view=rev
Log:
fix a crash found by inspection.


Added:
    llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll
Modified:
    llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
    llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll

Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=61101&r1=61100&r2=61101&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Tue Dec 16 15:04:51 2008
@@ -1055,7 +1055,7 @@
             // Otherwise, we don't know what it is.
             return false;
           }
-          return true;
+          continue;
         }
         
         // Otherwise we don't know what this is, not ok.

Added: llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll?rev=61101&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll (added)
+++ llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash.ll Tue Dec 16 15:04:51 2008
@@ -0,0 +1,27 @@
+; RUN: llvm-as < %s | opt -globalopt | llvm-dis
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+target triple = "i386-apple-darwin7"
+	%struct.foo = type { i32, i32 }
+ at X = internal global %struct.foo* null		; <%struct.foo**> [#uses=2]
+
+define void @bar(i32 %Size) nounwind noinline {
+entry:
+	%tmp = malloc [1000000 x %struct.foo]		; <[1000000 x %struct.foo]*> [#uses=1]
+	%.sub = getelementptr [1000000 x %struct.foo]* %tmp, i32 0, i32 0		; <%struct.foo*> [#uses=1]
+	store %struct.foo* %.sub, %struct.foo** @X, align 4
+	ret void
+}
+
+define i32 @baz() nounwind readonly noinline {
+bb1.thread:
+	%tmpLD1 = load %struct.foo** @X, align 4		; <%struct.foo*> [#uses=3]
+	store %struct.foo* %tmpLD1, %struct.foo** null
+	br label %bb1
+
+bb1:		; preds = %bb1, %bb1.thread
+	%tmp = phi %struct.foo* [ %tmpLD1, %bb1.thread ], [ %tmpLD1, %bb1 ]		; <%struct.foo*> [#uses=0]
+	br i1 false, label %bb2, label %bb1
+
+bb2:		; preds = %bb1
+	ret i32 0
+}

Modified: llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll?rev=61101&r1=61100&r2=61101&view=diff

==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll (original)
+++ llvm/trunk/test/Transforms/GlobalOpt/heap-sra-2.ll Tue Dec 16 15:04:51 2008
@@ -6,7 +6,7 @@
 	%struct.foo = type { i32, i32 }
 @X = internal global %struct.foo* null		; <%struct.foo**> [#uses=2]
 
-define internal fastcc void @bar(i32 %Size) nounwind noinline {
+define void @bar(i32 %Size) nounwind noinline {
 entry:
 	%0 = malloc [1000000 x %struct.foo]
         ;%.sub = bitcast [1000000 x %struct.foo]* %0 to %struct.foo*
@@ -15,7 +15,7 @@
 	ret void
 }
 
-define internal fastcc i32 @baz() nounwind readonly noinline {
+define i32 @baz() nounwind readonly noinline {
 bb1.thread:
 	%0 = load %struct.foo** @X, align 4		; <%struct.foo*> [#uses=1]
 	br label %bb1
@@ -34,9 +34,3 @@
 	ret i32 %3
 }
 
-define i32 @main(i32 %argc, i8** %argv) nounwind {
-entry:
-	tail call fastcc void @bar(i32 %argc) nounwind noinline
-	%0 = tail call fastcc i32 @baz() nounwind		; <i32> [#uses=1]
-	ret i32 %0
-}




From gohman at apple.com  Tue Dec 16 15:22:54 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 13:22:54 -0800
Subject: [llvm-commits] [llvm] r61092 - in /llvm/trunk:
 lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
 test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll
In-Reply-To: <200812161821.mBGILgSG020190@zion.cs.uiuc.edu>
References: <200812161821.mBGILgSG020190@zion.cs.uiuc.edu>
Message-ID: <1229462574.3034.9.camel@dgohman1>

Hi Evan,

I'm seeing this error trigger when building libgomp on x86_64-linux-gnu.
I've attached a reduced LLVM IR testcase.

Here is the relevant C code, from libgomp/config/linux/x86/futex.h:

static inline void
futex_wake (int *addr, int count)
{
  long res;

  __asm volatile ("syscall"
                  : "=a" (res)
                  : "0"(SYS_futex), "D" (addr), "S"(FUTEX_WAKE),
"d"(count)
                  : "r11", "rcx", "memory");
}

SYS_futex here is a constant. Would it be possible to support this
specific case?

Dan

On Tue, 2008-12-16 at 18:21 +0000, Evan Cheng wrote:
> Author: evancheng
> Date: Tue Dec 16 12:21:39 2008
> New Revision: 61092
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=61092&view=rev
> Log:
> We have decided not to support inline asm where an output operand with a matching input operand with incompatible type (i.e. either one is a floating point and the other is an integer or the sizes of the types differ). SelectionDAGBuild will catch these and exit with an error.
> 
> Modified:
>     llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
>     llvm/trunk/test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll
> 
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=61092&r1=61091&r2=61092&view=diff
> 
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Tue Dec 16 12:21:39 2008
> @@ -5048,20 +5048,21 @@
>      SDISelAsmOperandInfo &OpInfo = ConstraintOperands[i];
>      
>      // If this is an output operand with a matching input operand, look up the
> -    // matching input.  It might have a different type (e.g. the output might be
> -    // i32 and the input i64) and we need to pick the larger width to ensure we
> -    // reserve the right number of registers.  
> +    // matching input. If their types mismatch, e.g. one is an integer, the
> +    // other is floating point, or their sizes are different, flag it as an
> +    // error.
>      if (OpInfo.hasMatchingInput()) {
>        SDISelAsmOperandInfo &Input = ConstraintOperands[OpInfo.MatchingInput];
>        if (OpInfo.ConstraintVT != Input.ConstraintVT) {
> -        assert(OpInfo.ConstraintVT.isInteger() &&
> -               Input.ConstraintVT.isInteger() &&
> -               "Asm constraints must be the same or different sized integers");
> -        if (OpInfo.ConstraintVT.getSizeInBits() < 
> -            Input.ConstraintVT.getSizeInBits())
> -          OpInfo.ConstraintVT = Input.ConstraintVT;
> -        else
> -          Input.ConstraintVT = OpInfo.ConstraintVT;
> +        if ((OpInfo.ConstraintVT.isInteger() !=
> +             Input.ConstraintVT.isInteger()) ||
> +            (OpInfo.ConstraintVT.getSizeInBits() !=
> +             Input.ConstraintVT.getSizeInBits())) {
> +          cerr << "Unsupported asm: input constraint with a matching output "
> +               << "constraint of incompatible type!\n";
> +          exit(1);
> +        }
> +        Input.ConstraintVT = OpInfo.ConstraintVT;
>        }
>      }
>      
> 
> Modified: llvm/trunk/test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll?rev=61092&r1=61091&r2=61092&view=diff
> 
> ==============================================================================
> --- llvm/trunk/test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll (original)
> +++ llvm/trunk/test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll Tue Dec 16 12:21:39 2008
> @@ -1,4 +1,5 @@
>  ; RUN: llvm-as < %s | llc
> +; XFAIL: *
>  ; PR2356
>  target datalayout = "E-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f128:64:128"
>  target triple = "powerpc-apple-darwin9"
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
-------------- next part --------------
A non-text attachment was scrubbed...
Name: omp_unset_nest_lock.ll
Type: text/x-matlab
Size: 936 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081216/30647db6/attachment.bin 

From sabre at nondot.org  Tue Dec 16 15:24:51 2008
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 16 Dec 2008 21:24:51 -0000
Subject: [llvm-commits] [llvm] r61102 - in /llvm/trunk:
 lib/Transforms/IPO/GlobalOpt.cpp
 test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash-2.ll
Message-ID: <200812162124.mBGLOqod026237@zion.cs.uiuc.edu>

Author: lattner
Date: Tue Dec 16 15:24:51 2008
New Revision: 61102

URL: http://llvm.org/viewvc/llvm-project?rev=61102&view=rev
Log:
Fix another crash found by inspection.  If we have a PHI node merging
the load multiple times, make sure the check the uses of the PHI to 
ensure they are transformable.

Added:
    llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash-2.ll
Modified:
    llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp

Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=61102&r1=61101&r2=61102&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Tue Dec 16 15:24:51 2008
@@ -1012,56 +1012,77 @@
   }
 }
 
-/// GlobalLoadUsesSimpleEnoughForHeapSRA - If all users of values loaded from
-/// GV are simple enough to perform HeapSRA, return true.
-static bool GlobalLoadUsesSimpleEnoughForHeapSRA(GlobalVariable *GV,
-                                                 MallocInst *MI) {
-  for (Value::use_iterator UI = GV->use_begin(), E = GV->use_end(); UI != E; 
-       ++UI)
-    if (LoadInst *LI = dyn_cast<LoadInst>(*UI)) {
-      // We permit two users of the load: setcc comparing against the null
-      // pointer, and a getelementptr of a specific form.
-      for (Value::use_iterator UI = LI->use_begin(), E = LI->use_end();
-           UI != E; ++UI) {
-        // Comparison against null is ok.
-        if (ICmpInst *ICI = dyn_cast<ICmpInst>(*UI)) {
-          if (!isa<ConstantPointerNull>(ICI->getOperand(1)))
-            return false;
-          continue;
-        }
-        
-        // getelementptr is also ok, but only a simple form.
-        if (GetElementPtrInst *GEPI = dyn_cast<GetElementPtrInst>(*UI)) {
-          // Must index into the array and into the struct.
-          if (GEPI->getNumOperands() < 3)
-            return false;
-          
-          // Otherwise the GEP is ok.
-          continue;
-        }
+/// LoadUsesSimpleEnoughForHeapSRA - Verify that all uses of V (a load, or a phi
+/// of a load) are simple enough to perform heap SRA on.  This permits GEP's
+/// that index through the array and struct field, icmps of null, and PHIs.
+static bool LoadUsesSimpleEnoughForHeapSRA(Value *V, MallocInst *MI,
+                             SmallPtrSet<PHINode*, 32> &AnalyzedLoadUsingPHIs) {
+  // We permit two users of the load: setcc comparing against the null
+  // pointer, and a getelementptr of a specific form.
+  for (Value::use_iterator UI = V->use_begin(), E = V->use_end(); UI != E;++UI){
+    Instruction *User = cast<Instruction>(*UI);
+    
+    // Comparison against null is ok.
+    if (ICmpInst *ICI = dyn_cast<ICmpInst>(User)) {
+      if (!isa<ConstantPointerNull>(ICI->getOperand(1)))
+        return false;
+      continue;
+    }
+    
+    // getelementptr is also ok, but only a simple form.
+    if (GetElementPtrInst *GEPI = dyn_cast<GetElementPtrInst>(User)) {
+      // Must index into the array and into the struct.
+      if (GEPI->getNumOperands() < 3)
+        return false;
+      
+      // Otherwise the GEP is ok.
+      continue;
+    }
+    
+    if (PHINode *PN = dyn_cast<PHINode>(User)) {
+      // If we have already recursively analyzed this PHI, then it is safe.
+      if (AnalyzedLoadUsingPHIs.insert(PN))
+        continue;
+      
+      // We have a phi of a load from the global.  We can only handle this
+      // if the other PHI'd values are actually the same.  In this case,
+      // the rewriter will just drop the phi entirely.
+      for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) {
+        Value *IV = PN->getIncomingValue(i);
+        if (IV == V) continue;  // Trivial the same.
         
-        if (PHINode *PN = dyn_cast<PHINode>(*UI)) {
-          // We have a phi of a load from the global.  We can only handle this
-          // if the other PHI'd values are actually the same.  In this case,
-          // the rewriter will just drop the phi entirely.
-          for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) {
-            Value *IV = PN->getIncomingValue(i);
-            if (IV == LI) continue;  // Trivial the same.
-            
-            // If the phi'd value is from the malloc that initializes the value,
-            // we can xform it.
-            if (IV == MI) continue;
-            
-            // Otherwise, we don't know what it is.
-            return false;
-          }
-          continue;
-        }
+        // If the phi'd value is from the malloc that initializes the value,
+        // we can xform it.
+        if (IV == MI) continue;
         
-        // Otherwise we don't know what this is, not ok.
+        // Otherwise, we don't know what it is.
         return false;
       }
+      
+      if (!LoadUsesSimpleEnoughForHeapSRA(PN, MI, AnalyzedLoadUsingPHIs))
+        return false;
+      
+      continue;
     }
+    
+    // Otherwise we don't know what this is, not ok.
+    return false;
+  }
+  
+  return true;
+}
+
+
+/// AllGlobalLoadUsesSimpleEnoughForHeapSRA - If all users of values loaded from
+/// GV are simple enough to perform HeapSRA, return true.
+static bool AllGlobalLoadUsesSimpleEnoughForHeapSRA(GlobalVariable *GV,
+                                                    MallocInst *MI) {
+  SmallPtrSet<PHINode*, 32> AnalyzedLoadUsingPHIs;
+  for (Value::use_iterator UI = GV->use_begin(), E = GV->use_end(); UI != E; 
+       ++UI)
+    if (LoadInst *LI = dyn_cast<LoadInst>(*UI))
+      if (!LoadUsesSimpleEnoughForHeapSRA(LI, MI, AnalyzedLoadUsingPHIs))
+        return false;
   return true;
 }
 
@@ -1166,7 +1187,7 @@
 /// RewriteUsesOfLoadForHeapSRoA - We are performing Heap SRoA on a global.  Ptr
 /// is a value loaded from the global.  Eliminate all uses of Ptr, making them
 /// use FieldGlobals instead.  All uses of loaded values satisfy
-/// GlobalLoadUsesSimpleEnoughForHeapSRA.
+/// AllGlobalLoadUsesSimpleEnoughForHeapSRA.
 static void RewriteUsesOfLoadForHeapSRoA(LoadInst *Load, 
                              const std::vector<GlobalVariable*> &FieldGlobals) {
   std::vector<Value *> InsertedLoadsForPtr;
@@ -1367,7 +1388,7 @@
     // This the structure has an unreasonable number of fields, leave it
     // alone.
     if (AllocSTy->getNumElements() <= 16 && AllocSTy->getNumElements() != 0 &&
-        GlobalLoadUsesSimpleEnoughForHeapSRA(GV, MI)) {
+        AllGlobalLoadUsesSimpleEnoughForHeapSRA(GV, MI)) {
       
       // If this is a fixed size array, transform the Malloc to be an alloc of
       // structs.  malloc [100 x struct],1 -> malloc struct, 100

Added: llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash-2.ll?rev=61102&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash-2.ll (added)
+++ llvm/trunk/test/Transforms/GlobalOpt/2008-12-16-HeapSRACrash-2.ll Tue Dec 16 15:24:51 2008
@@ -0,0 +1,24 @@
+; RUN: llvm-as < %s | opt -globalopt | llvm-dis
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+target triple = "i386-apple-darwin7"
+	%struct.foo = type { i32, i32 }
+ at X = internal global %struct.foo* null		; <%struct.foo**> [#uses=2]
+
+define void @bar(i32 %Size) nounwind noinline {
+entry:
+	%tmp = malloc [1000000 x %struct.foo]		; <[1000000 x %struct.foo]*> [#uses=1]
+	%.sub = getelementptr [1000000 x %struct.foo]* %tmp, i32 0, i32 0		; <%struct.foo*> [#uses=1]
+	store %struct.foo* %.sub, %struct.foo** @X, align 4
+	ret void
+}
+
+define i32 @baz() nounwind readonly noinline {
+bb1.thread:
+	%tmpLD1 = load %struct.foo** @X, align 4		; <%struct.foo*> [#uses=2]
+	br label %bb1
+
+bb1:		; preds = %bb1, %bb1.thread
+	%tmp = phi %struct.foo* [ %tmpLD1, %bb1.thread ], [ %tmpLD1, %bb1 ]		; <%struct.foo*> [#uses=1]
+	%0 = getelementptr %struct.foo* %tmp, i32 1		; <%struct.foo*> [#uses=0]
+	br label %bb1
+}




From clattner at apple.com  Tue Dec 16 15:29:56 2008
From: clattner at apple.com (Chris Lattner)
Date: Tue, 16 Dec 2008 13:29:56 -0800
Subject: [llvm-commits] [llvm] r61092 - in /llvm/trunk:
	lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
	test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll
In-Reply-To: <1229462574.3034.9.camel@dgohman1>
References: <200812161821.mBGILgSG020190@zion.cs.uiuc.edu>
	<1229462574.3034.9.camel@dgohman1>
Message-ID: <36FEE712-F941-4099-85CD-A0A83760C4A0@apple.com>


On Dec 16, 2008, at 1:22 PM, Dan Gohman wrote:

> Hi Evan,
>
> I'm seeing this error trigger when building libgomp on x86_64-linux- 
> gnu.
> I've attached a reduced LLVM IR testcase.
>
> Here is the relevant C code, from libgomp/config/linux/x86/futex.h:
>
> static inline void
> futex_wake (int *addr, int count)
> {
>  long res;
>
>  __asm volatile ("syscall"
>                  : "=a" (res)
>                  : "0"(SYS_futex), "D" (addr), "S"(FUTEX_WAKE),
> "d"(count)
>                  : "r11", "rcx", "memory");
> }
>
> SYS_futex here is a constant. Would it be possible to support this
> specific case?

It would be best for llvm-gcc to widen the tied input/output to the  
larger of the two integer types.

-Chris


From dalej at apple.com  Tue Dec 16 15:30:53 2008
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 16 Dec 2008 13:30:53 -0800
Subject: [llvm-commits] [llvm] r61092 - in /llvm/trunk:
	lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
	test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll
In-Reply-To: <1229462574.3034.9.camel@dgohman1>
References: <200812161821.mBGILgSG020190@zion.cs.uiuc.edu>
	<1229462574.3034.9.camel@dgohman1>
Message-ID: <1691FB19-6364-4A9F-BF26-7446868826A8@apple.com>


On Dec 16, 2008, at 1:22 PMPST, Dan Gohman wrote:

> Hi Evan,
>
> I'm seeing this error trigger when building libgomp on x86_64-linux- 
> gnu.
> I've attached a reduced LLVM IR testcase.
>
> Here is the relevant C code, from libgomp/config/linux/x86/futex.h:
>
> static inline void
> futex_wake (int *addr, int count)
> {
>  long res;
>
>  __asm volatile ("syscall"
>                  : "=a" (res)
>                  : "0"(SYS_futex), "D" (addr), "S"(FUTEX_WAKE),
> "d"(count)
>                  : "r11", "rcx", "memory");
> }
>
> SYS_futex here is a constant. Would it be possible to support this
> specific case?

I don't think that would be any easier than supporting the general case.
This should work if you cast (or define) SYS_futex to be the same size  
as res.

> Dan
>
> On Tue, 2008-12-16 at 18:21 +0000, Evan Cheng wrote:
>> Author: evancheng
>> Date: Tue Dec 16 12:21:39 2008
>> New Revision: 61092
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=61092&view=rev
>> Log:
>> We have decided not to support inline asm where an output operand  
>> with a matching input operand with incompatible type (i.e. either  
>> one is a floating point and the other is an integer or the sizes of  
>> the types differ). SelectionDAGBuild will catch these and exit with  
>> an error.
>>
>> Modified:
>>    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
>>    llvm/trunk/test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll
>>
>> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp?rev=61092&r1=61091&r2=61092&view=diff
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp  
>> (original)
>> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp Tue  
>> Dec 16 12:21:39 2008
>> @@ -5048,20 +5048,21 @@
>>     SDISelAsmOperandInfo &OpInfo = ConstraintOperands[i];
>>
>>     // If this is an output operand with a matching input operand,  
>> look up the
>> -    // matching input.  It might have a different type (e.g. the  
>> output might be
>> -    // i32 and the input i64) and we need to pick the larger width  
>> to ensure we
>> -    // reserve the right number of registers.
>> +    // matching input. If their types mismatch, e.g. one is an  
>> integer, the
>> +    // other is floating point, or their sizes are different, flag  
>> it as an
>> +    // error.
>>     if (OpInfo.hasMatchingInput()) {
>>       SDISelAsmOperandInfo &Input =  
>> ConstraintOperands[OpInfo.MatchingInput];
>>       if (OpInfo.ConstraintVT != Input.ConstraintVT) {
>> -        assert(OpInfo.ConstraintVT.isInteger() &&
>> -               Input.ConstraintVT.isInteger() &&
>> -               "Asm constraints must be the same or different  
>> sized integers");
>> -        if (OpInfo.ConstraintVT.getSizeInBits() <
>> -            Input.ConstraintVT.getSizeInBits())
>> -          OpInfo.ConstraintVT = Input.ConstraintVT;
>> -        else
>> -          Input.ConstraintVT = OpInfo.ConstraintVT;
>> +        if ((OpInfo.ConstraintVT.isInteger() !=
>> +             Input.ConstraintVT.isInteger()) ||
>> +            (OpInfo.ConstraintVT.getSizeInBits() !=
>> +             Input.ConstraintVT.getSizeInBits())) {
>> +          cerr << "Unsupported asm: input constraint with a  
>> matching output "
>> +               << "constraint of incompatible type!\n";
>> +          exit(1);
>> +        }
>> +        Input.ConstraintVT = OpInfo.ConstraintVT;
>>       }
>>     }
>>
>>
>> Modified: llvm/trunk/test/CodeGen/PowerPC/2008-10-17- 
>> AsmMatchingOperands.ll
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll?rev=61092&r1=61091&r2=61092&view=diff
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- llvm/trunk/test/CodeGen/PowerPC/2008-10-17- 
>> AsmMatchingOperands.ll (original)
>> +++ llvm/trunk/test/CodeGen/PowerPC/2008-10-17- 
>> AsmMatchingOperands.ll Tue Dec 16 12:21:39 2008
>> @@ -1,4 +1,5 @@
>> ; RUN: llvm-as < %s | llc
>> +; XFAIL: *
>> ; PR2356
>> target datalayout = "E-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32- 
>> i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64- 
>> f128:64:128"
>> target triple = "powerpc-apple-darwin9"
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
-------------- next part --------------
A non-text attachment was scrubbed...
Name: omp_unset_nest_lock.ll
Type: text/x-matlab
Size: 936 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081216/56c65ca1/attachment.bin 
-------------- next part --------------
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


From resistor at mac.com  Tue Dec 16 15:35:08 2008
From: resistor at mac.com (Owen Anderson)
Date: Tue, 16 Dec 2008 21:35:08 -0000
Subject: [llvm-commits] [llvm] r61104 -
	/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp
Message-ID: <200812162135.mBGLZ9Jd026609@zion.cs.uiuc.edu>

Author: resistor
Date: Tue Dec 16 15:35:08 2008
New Revision: 61104

URL: http://llvm.org/viewvc/llvm-project?rev=61104&view=rev
Log:
Add code to renumber split intervals into new vregs.  This is disabled for now until I finish working out some iterator invalidation issues.

Modified:
    llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp

Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=61104&r1=61103&r2=61104&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original)
+++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Tue Dec 16 15:35:08 2008
@@ -169,6 +169,7 @@
                             MachineBasicBlock* MBB,
                             int& SS,
                             SmallPtrSet<MachineInstr*, 4>& RefsInMBB);
+    void RenumberValno(VNInfo* VN);
   };
 } // end anonymous namespace
 
@@ -699,6 +700,10 @@
   ShrinkWrapLiveInterval(ValNo, BarrierMBB, NULL, DefMI->getParent(), Visited,
                          Uses, UseMIs, UseMBBs);
 
+#if 0
+  if (!ValNo->hasPHIKill)
+    RenumberValno();
+#endif
   // FIXME: If ValNo->hasPHIKill is false, then renumber the val# by
   // the restore.
 
@@ -707,6 +712,49 @@
   UpdateRegisterInterval(ValNo, LIs->getUseIndex(BarrierIdx)+1,
                          LIs->getDefIndex(RestoreIdx));
 }
+
+/// RenumberValno - Split the given valno out into a new vreg, allowing it to
+/// be allocated to a different register.  This function creates a new vreg,
+/// copies the valno and its live ranges over to the new vreg's interval,
+/// removes them from the old interval, and rewrites all uses and defs of
+/// the original reg to the new vreg within those ranges.
+void PreAllocSplitting::RenumberValno(VNInfo* VN) {
+  // Create the new vreg
+  unsigned NewVReg = MRI->createVirtualRegister(MRI->getRegClass(CurrLI->reg));
+  
+  // Copy over the valno and ranges
+  LiveInterval& NewLI = LIs->getOrCreateInterval(NewVReg);
+  VNInfo* NewVN = NewLI.getNextValue(VN->def, VN->copy, 
+                                     LIs->getVNInfoAllocator());
+  NewLI.copyValNumInfo(NewVN, VN);
+  NewLI.MergeValueInAsValue(*CurrLI, VN, NewVN);
+  
+  // Remove the valno from the old interval
+  CurrLI->removeValNo(VN);
+  
+  // Rewrite defs and uses.  This is done in two stages to avoid invalidating
+  // the reg_iterator.
+  SmallVector<std::pair<MachineInstr*, unsigned>, 8> OpsToChange;
+  
+  for (MachineRegisterInfo::reg_iterator I = MRI->reg_begin(CurrLI->reg),
+         E = MRI->reg_end(); I != E; ++I) {
+    MachineOperand& MO = I.getOperand();
+    unsigned InstrIdx = LIs->getInstructionIndex(&*I);
+    
+    if ((MO.isUse() && NewLI.liveAt(LiveIntervals::getUseIndex(InstrIdx))) ||
+        (MO.isDef() && NewLI.liveAt(LiveIntervals::getDefIndex(InstrIdx))))
+      OpsToChange.push_back(std::make_pair(&*I, I.getOperandNo()));
+  }
+  
+  for (SmallVector<std::pair<MachineInstr*, unsigned>, 8>::iterator I =
+       OpsToChange.begin(), E = OpsToChange.end(); I != E; ++I) {
+    MachineInstr* Inst = I->first;
+    unsigned OpIdx = I->second;
+    MachineOperand& MO = Inst->getOperand(OpIdx);
+    MO.setReg(NewVReg);
+  }
+}
+
 bool PreAllocSplitting::Rematerialize(unsigned vreg, VNInfo* ValNo,
                                       MachineInstr* DefMI,
                                       MachineBasicBlock::iterator RestorePt,




From dalej at apple.com  Tue Dec 16 16:13:50 2008
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 16 Dec 2008 22:13:50 -0000
Subject: [llvm-commits] [llvm] r61107 - in /llvm/trunk:
 lib/CodeGen/SelectionDAG/DAGCombiner.cpp
 test/CodeGen/X86/2008-12-16-dagcombine-4.ll
Message-ID: <200812162213.mBGMDpuq028069@zion.cs.uiuc.edu>

Author: johannes
Date: Tue Dec 16 16:13:49 2008
New Revision: 61107

URL: http://llvm.org/viewvc/llvm-project?rev=61107&view=rev
Log:
A new dag combine; several permutations of this
are there under ADD, this one was missing.


Added:
    llvm/trunk/test/CodeGen/X86/2008-12-16-dagcombine-4.ll
Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp?rev=61107&r1=61106&r2=61107&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/DAGCombiner.cpp Tue Dec 16 16:13:49 2008
@@ -1178,6 +1178,12 @@
   // fold (A+B)-B -> A
   if (N0.getOpcode() == ISD::ADD && N0.getOperand(1) == N1)
     return N0.getOperand(0);
+  // fold ((A+(B-C))-B) -> A-C
+  if (N0.getOpcode() == ISD::ADD &&
+      N0.getOperand(1).getOpcode() == ISD::SUB &&
+      N0.getOperand(1).getOperand(0) == N1)
+    return DAG.getNode(ISD::SUB, VT, N0.getOperand(0), 
+                                     N0.getOperand(1).getOperand(1));
   // fold (sub x, (select cc, 0, c)) -> (select cc, x, (sub, x, c))
   if (N1.getOpcode() == ISD::SELECT && N1.getNode()->hasOneUse()) {
     SDValue Result = combineSelectAndUse(N, N1, N0, DAG, TLI, LegalOperations);

Added: llvm/trunk/test/CodeGen/X86/2008-12-16-dagcombine-4.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-12-16-dagcombine-4.ll?rev=61107&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/2008-12-16-dagcombine-4.ll (added)
+++ llvm/trunk/test/CodeGen/X86/2008-12-16-dagcombine-4.ll Tue Dec 16 16:13:49 2008
@@ -0,0 +1,14 @@
+; RUN: llvm-as < %s | llc -march=x86 | grep "(%esp)" | count 2
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+target triple = "i386-apple-darwin9.5"
+; a - a should be found and removed, leaving refs to only L and P
+define i32 @test(i32 %a, i32 %L, i32 %P) nounwind {
+entry:
+        %0 = sub i32 %a, %L
+        %1 = add i32 %P, %0
+	%2 = sub i32 %1, %a
+	br label %return
+
+return:		; preds = %bb3
+	ret i32 %2
+}




From dalej at apple.com  Tue Dec 16 16:16:29 2008
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 16 Dec 2008 22:16:29 -0000
Subject: [llvm-commits] [llvm] r61109 -
	/llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp
Message-ID: <200812162216.mBGMGUbb028167@zion.cs.uiuc.edu>

Author: johannes
Date: Tue Dec 16 16:16:28 2008
New Revision: 61109

URL: http://llvm.org/viewvc/llvm-project?rev=61109&view=rev
Log:
Clarify that the scale factor from CheckForIVReuse
can be negative.  Keep track of whether all uses of
an IV are outside the loop.  Some cosmetics; no
functional change.


Modified:
    llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp?rev=61109&r1=61108&r2=61109&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp Tue Dec 16 16:16:28 2008
@@ -191,7 +191,7 @@
     bool FindIVUserForCond(ICmpInst *Cond, IVStrideUse *&CondUse,
                            const SCEVHandle *&CondStride);
     bool RequiresTypeConversion(const Type *Ty, const Type *NewTy);
-    unsigned CheckForIVReuse(bool, bool, const SCEVHandle&,
+    int64_t CheckForIVReuse(bool, bool, bool, const SCEVHandle&,
                              IVExpr&, const Type*,
                              const std::vector<BasedUser>& UsersToProcess);
     bool ValidStride(bool, int64_t,
@@ -200,6 +200,7 @@
                               IVUsersOfOneStride &Uses,
                               Loop *L,
                               bool &AllUsesAreAddresses,
+                              bool &AllUsesAreOutsideLoop,
                               std::vector<BasedUser> &UsersToProcess);
     void StrengthReduceStridedIVUsers(const SCEVHandle &Stride,
                                       IVUsersOfOneStride &Uses,
@@ -522,7 +523,7 @@
 
     if (AddUserToIVUsers) {
       IVUsersOfOneStride &StrideUses = IVUsesByStride[Stride];
-      if (StrideUses.Users.empty())     // First occurance of this stride?
+      if (StrideUses.Users.empty())     // First occurrence of this stride?
         StrideOrder.push_back(Stride);
       
       // Okay, we found a user that we cannot reduce.  Analyze the instruction
@@ -1060,7 +1061,7 @@
         UseTy = SI->getOperand(0)->getType();
       if (!fitsInAddressMode(FreeResult, UseTy, TLI, Result!=Zero)) {
         // FIXME:  could split up FreeResult into pieces here, some hoisted
-        // and some not.  Doesn't seem worth it for now.
+        // and some not.  There is no obvious advantage to this.
         Result = SE->getAddExpr(Result, FreeResult);
         FreeResult = Zero;
         break;
@@ -1166,9 +1167,10 @@
 /// of a previous stride and it is a legal value for the target addressing
 /// mode scale component and optional base reg. This allows the users of
 /// this stride to be rewritten as prev iv * factor. It returns 0 if no
-/// reuse is possible.
-unsigned LoopStrengthReduce::CheckForIVReuse(bool HasBaseReg,
+/// reuse is possible.  Factors can be negative on same targets, e.g. ARM.
+int64_t LoopStrengthReduce::CheckForIVReuse(bool HasBaseReg,
                                 bool AllUsesAreAddresses,
+                                bool AllUsesAreOutsideLoop,
                                 const SCEVHandle &Stride, 
                                 IVExpr &IV, const Type *Ty,
                                 const std::vector<BasedUser>& UsersToProcess) {
@@ -1236,6 +1238,7 @@
                                               IVUsersOfOneStride &Uses,
                                               Loop *L,
                                               bool &AllUsesAreAddresses,
+                                              bool &AllUsesAreOutsideLoop,
                                        std::vector<BasedUser> &UsersToProcess) {
   UsersToProcess.reserve(Uses.Users.size());
   for (unsigned i = 0, e = Uses.Users.size(); i != e; ++i) {
@@ -1275,7 +1278,7 @@
       UsersToProcess[i].Base = 
         SE->getIntegerSCEV(0, UsersToProcess[i].Base->getType());
     } else {
-      
+
       // Addressing modes can be folded into loads and stores.  Be careful that
       // the store is through the expression, not of the expression though.
       bool isPHI = false;
@@ -1286,6 +1289,9 @@
         ++NumPHI;
       }
 
+      // Not all uses are outside the loop.
+      AllUsesAreOutsideLoop = false; 
+     
       // If this use isn't an address, then not all uses are addresses.
       if (!isAddress && !isPHI)
         AllUsesAreAddresses = false;
@@ -1320,6 +1326,11 @@
   // smaller-stride IV.
   bool AllUsesAreAddresses = true;
 
+  // Keep track if every use of a single stride is outside the loop.  If so,
+  // we want to be more aggressive about reusing a smaller-stride IV; a
+  // multiply outside the loop is better than another IV inside.  Well, usually.
+  bool AllUsesAreOutsideLoop = true;
+
   // Transform our list of users and offsets to a bit more complex table.  In
   // this new vector, each 'BasedUser' contains 'Base' the base of the
   // strided accessas well as the old information from Uses.  We progressively
@@ -1327,6 +1338,7 @@
   // have the full access expression to rewrite the use.
   std::vector<BasedUser> UsersToProcess;
   SCEVHandle CommonExprs = CollectIVUsers(Stride, Uses, L, AllUsesAreAddresses,
+                                          AllUsesAreOutsideLoop,
                                           UsersToProcess);
 
   // If we managed to find some expressions in common, we'll need to carry
@@ -1345,8 +1357,9 @@
   IVExpr   ReuseIV(SE->getIntegerSCEV(0, Type::Int32Ty),
                    SE->getIntegerSCEV(0, Type::Int32Ty),
                    0, 0);
-  unsigned RewriteFactor = 0;
+  int64_t RewriteFactor = 0;
   RewriteFactor = CheckForIVReuse(HaveCommonExprs, AllUsesAreAddresses,
+                                  AllUsesAreOutsideLoop,
                                   Stride, ReuseIV, CommonExprs->getType(),
                                   UsersToProcess);
   if (RewriteFactor != 0) {
@@ -1445,7 +1458,7 @@
     // Get a base value.
     SCEVHandle Base = UsersToProcess[i].Base;
     
-    // Compact everything with this base to be consequtive with this one.
+    // Compact everything with this base to be consecutive with this one.
     for (unsigned j = i+1; j != e; ++j) {
       if (UsersToProcess[j].Base == Base) {
         std::swap(UsersToProcess[i+1], UsersToProcess[j]);
@@ -1508,7 +1521,7 @@
 
       SCEVHandle RewriteExpr = SE->getUnknown(RewriteOp);
 
-      // If we had to insert new instrutions for RewriteOp, we have to
+      // If we had to insert new instructions for RewriteOp, we have to
       // consider that they may not have been able to end up immediately
       // next to RewriteOp, because non-PHI instructions may never precede
       // PHI instructions in a block. In this case, remember where the last
@@ -1535,7 +1548,7 @@
         if (!isa<ConstantInt>(CommonBaseV) ||
             !cast<ConstantInt>(CommonBaseV)->isZero())
           RewriteExpr = SE->getAddExpr(RewriteExpr,
-                                      SE->getUnknown(CommonBaseV));
+                                       SE->getUnknown(CommonBaseV));
       }
 
       // Now that we know what we need to do, insert code before User for the
@@ -1729,9 +1742,11 @@
       }
 
       bool AllUsesAreAddresses = true;
+      bool AllUsesAreOutsideLoop = true;
       std::vector<BasedUser> UsersToProcess;
       SCEVHandle CommonExprs = CollectIVUsers(SI->first, SI->second, L,
                                               AllUsesAreAddresses,
+                                              AllUsesAreOutsideLoop,
                                               UsersToProcess);
       // Avoid rewriting the compare instruction with an iv of new stride
       // if it's likely the new stride uses will be rewritten using the
@@ -2103,7 +2118,7 @@
   UIntPtrTy = TD->getIntPtrType();
   Changed = false;
 
-  // Find all uses of induction variables in this loop, and catagorize
+  // Find all uses of induction variables in this loop, and categorize
   // them by stride.  Start by finding all of the PHI nodes in the header for
   // this loop.  If they are induction variables, inspect their uses.
   SmallPtrSet<Instruction*,16> Processed;   // Don't reprocess instructions.




From echeng at apple.com  Tue Dec 16 20:15:46 2008
From: echeng at apple.com (Evan Cheng)
Date: Tue, 16 Dec 2008 18:15:46 -0800
Subject: [llvm-commits] [llvm] r61092 - in /llvm/trunk:
	lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
	test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll
In-Reply-To: <36FEE712-F941-4099-85CD-A0A83760C4A0@apple.com>
References: <200812161821.mBGILgSG020190@zion.cs.uiuc.edu>
	<1229462574.3034.9.camel@dgohman1>
	<36FEE712-F941-4099-85CD-A0A83760C4A0@apple.com>
Message-ID: <866AF5C5-53E6-471C-9187-42A53E24D7DD@apple.com>


On Dec 16, 2008, at 1:29 PM, Chris Lattner wrote:

>
> On Dec 16, 2008, at 1:22 PM, Dan Gohman wrote:
>
>> Hi Evan,
>>
>> I'm seeing this error trigger when building libgomp on x86_64-linux-
>> gnu.
>> I've attached a reduced LLVM IR testcase.
>>
>> Here is the relevant C code, from libgomp/config/linux/x86/futex.h:
>>
>> static inline void
>> futex_wake (int *addr, int count)
>> {
>> long res;
>>
>> __asm volatile ("syscall"
>>                 : "=a" (res)
>>                 : "0"(SYS_futex), "D" (addr), "S"(FUTEX_WAKE),
>> "d"(count)
>>                 : "r11", "rcx", "memory");
>> }
>>
>> SYS_futex here is a constant. Would it be possible to support this
>> specific case?
>
> It would be best for llvm-gcc to widen the tied input/output to the
> larger of the two integer types.

We have decided not to support this type of inline asm because it's  
not clear what's the right thing to do. Should we widen to cast down?  
I guess it's clear in certain cases (e.g ptr type). I'll take a look.

Evan

>
>
> -Chris
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From foldr at codedgers.com  Tue Dec 16 20:47:03 2008
From: foldr at codedgers.com (Mikhail Glushenkov)
Date: Wed, 17 Dec 2008 02:47:03 -0000
Subject: [llvm-commits] [llvm] r61117 - in /llvm/trunk:
 include/llvm/CompilerDriver/Common.td tools/llvmc/doc/LLVMC-Reference.rst
 utils/TableGen/LLVMCConfigurationEmitter.cpp
Message-ID: <200812170247.mBH2l4hU004840@zion.cs.uiuc.edu>

Author: foldr
Date: Tue Dec 16 20:47:01 2008
New Revision: 61117

URL: http://llvm.org/viewvc/llvm-project?rev=61117&view=rev
Log:
Some enhancements for the 'case' expression.

Add (error) and (empty).

Modified:
    llvm/trunk/include/llvm/CompilerDriver/Common.td
    llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst
    llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp

Modified: llvm/trunk/include/llvm/CompilerDriver/Common.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CompilerDriver/Common.td?rev=61117&r1=61116&r2=61117&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CompilerDriver/Common.td (original)
+++ llvm/trunk/include/llvm/CompilerDriver/Common.td Tue Dec 16 20:47:01 2008
@@ -67,6 +67,7 @@
 def forward_as;
 def stop_compilation;
 def unpack_values;
+def error;
 
 // Increase/decrease the edge weight.
 def inc_weight;

Modified: llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst?rev=61117&r1=61116&r2=61117&view=diff

==============================================================================
--- llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst (original)
+++ llvm/trunk/tools/llvmc/doc/LLVMC-Reference.rst Tue Dec 16 20:47:01 2008
@@ -387,6 +387,9 @@
     user.
     Example: ``(not_empty "o")``.
 
+  - ``empty`` - The opposite of ``not_empty``. Equivalent to ``(not (not_empty
+    X))``. Provided for convenience.
+
   - ``default`` - Always evaluates to true. Should always be the last
     test in the ``case`` expression.
 
@@ -487,7 +490,11 @@
 
    - ``append_cmd`` - append a string to the tool invocation
      command.
-     Example: ``(case (switch_on "pthread"), (append_cmd "-lpthread"))``
+     Example: ``(case (switch_on "pthread"), (append_cmd
+     "-lpthread"))``
+
+   - ``error` - exit with error.
+     Example: ``(error "Mixing -c and -S is not allowed!")``.
 
    - ``forward`` - forward an option unchanged.
      Example: ``(forward "Wall")``.

Modified: llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp?rev=61117&r1=61116&r2=61117&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Tue Dec 16 20:47:01 2008
@@ -798,7 +798,7 @@
     if (ActionName == "forward" || ActionName == "forward_as" ||
         ActionName == "unpack_values" || ActionName == "switch_on" ||
         ActionName == "parameter_equals" || ActionName == "element_in_list" ||
-        ActionName == "not_empty") {
+        ActionName == "not_empty" || ActionName == "empty") {
       checkNumberOfArguments(&Stmt, 1);
       const std::string& Name = InitPtrToString(Stmt.getArg(0));
       OptionNames_.insert(Name);
@@ -877,6 +877,7 @@
                       std::ostream& O) {
   checkNumberOfArguments(&d, 1);
   const std::string& OptName = InitPtrToString(d.getArg(0));
+
   if (TestName == "switch_on") {
     const OptionDescription& OptDesc = OptDescs.FindOption(OptName);
     if (!OptionType::IsSwitch(OptDesc.Type))
@@ -893,9 +894,11 @@
     // TODO: make this work with Edge::Weight (if possible).
     O << "LangMap.GetLanguage(inFile) == \"" << OptName << '\"';
     return true;
-  } else if (TestName == "not_empty") {
+  } else if (TestName == "not_empty" || TestName == "empty") {
+    const char* Test = (TestName == "empty") ? "" : "!";
+
     if (OptName == "o") {
-      O << "!OutputFilename.empty()";
+      O << Test << "OutputFilename.empty()";
       return true;
     }
     else {
@@ -903,7 +906,7 @@
       if (OptionType::IsSwitch(OptDesc.Type))
         throw OptName
           + ": incorrect option type - should be a list or parameter!";
-      O << '!' << OptDesc.GenVariableName() << ".empty()";
+      O << Test << OptDesc.GenVariableName() << ".empty()";
       return true;
     }
   }
@@ -1196,6 +1199,12 @@
       const std::string& Cmd = InitPtrToString(Dag.getArg(0));
       O << IndentLevel << "vec.push_back(\"" << Cmd << "\");\n";
     }
+    else if (ActionName == "error") {
+      O << IndentLevel << "throw std::runtime_error(\"" <<
+        (Dag.getNumArgs() >= 1 ? InitPtrToString(Dag.getArg(0))
+         : "Unknown error!")
+        << "\");\n";
+    }
     else if (ActionName == "forward") {
       checkNumberOfArguments(&Dag, 1);
       const std::string& Name = InitPtrToString(Dag.getArg(0));
@@ -1535,12 +1544,23 @@
   const DagInit& d = InitPtrToDag(i);
   const std::string& OpName = d.getOperator()->getAsString();
 
-  if (OpName == "inc_weight")
+  if (OpName == "inc_weight") {
     O << IndentLevel << "ret += ";
-  else if (OpName == "dec_weight")
+  }
+  else if (OpName == "dec_weight") {
     O << IndentLevel << "ret -= ";
+  }
+  else if (OpName == "error") {
+    O << IndentLevel << "throw std::runtime_error(\"" <<
+        (d.getNumArgs() >= 1 ? InitPtrToString(d.getArg(0))
+         : "Unknown error!")
+      << "\");\n";
+    return;
+  }
+
   else
-    throw "Unknown operator in edge properties list: " + OpName + '!';
+    throw "Unknown operator in edge properties list: " + OpName + '!' +
+      "Only 'inc_weight', 'dec_weight' and 'error' are allowed.";
 
   if (d.getNumArgs() > 0)
     O << InitPtrToInt(d.getArg(0)) << ";\n";




From foldr at codedgers.com  Tue Dec 16 20:47:31 2008
From: foldr at codedgers.com (Mikhail Glushenkov)
Date: Wed, 17 Dec 2008 02:47:31 -0000
Subject: [llvm-commits] [llvm] r61118 - /llvm/trunk/docs/CompilerDriver.html
Message-ID: <200812170247.mBH2lVco004863@zion.cs.uiuc.edu>

Author: foldr
Date: Tue Dec 16 20:47:30 2008
New Revision: 61118

URL: http://llvm.org/viewvc/llvm-project?rev=61118&view=rev
Log:
Update also the generated docs.

Modified:
    llvm/trunk/docs/CompilerDriver.html

Modified: llvm/trunk/docs/CompilerDriver.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CompilerDriver.html?rev=61118&r1=61117&r2=61118&view=diff

==============================================================================
--- llvm/trunk/docs/CompilerDriver.html (original)
+++ llvm/trunk/docs/CompilerDriver.html Tue Dec 16 20:47:30 2008
@@ -371,6 +371,8 @@
 either a parameter or a parameter list) is set by the
 user.
 Example: <tt class="docutils literal"><span class="pre">(not_empty</span> <span class="pre">&quot;o&quot;)</span></tt>.</li>
+<li><tt class="docutils literal"><span class="pre">empty</span></tt> - The opposite of <tt class="docutils literal"><span class="pre">not_empty</span></tt>. Equivalent to <tt class="docutils literal"><span class="pre">(not</span> <span class="pre">(not_empty</span>
+<span class="pre">X))</span></tt>. Provided for convenience.</li>
 <li><tt class="docutils literal"><span class="pre">default</span></tt> - Always evaluates to true. Should always be the last
 test in the <tt class="docutils literal"><span class="pre">case</span></tt> expression.</li>
 <li><tt class="docutils literal"><span class="pre">and</span></tt> - A standard logical combinator that returns true iff all
@@ -462,7 +464,10 @@
 <ul class="simple">
 <li><tt class="docutils literal"><span class="pre">append_cmd</span></tt> - append a string to the tool invocation
 command.
-Example: <tt class="docutils literal"><span class="pre">(case</span> <span class="pre">(switch_on</span> <span class="pre">&quot;pthread&quot;),</span> <span class="pre">(append_cmd</span> <span class="pre">&quot;-lpthread&quot;))</span></tt></li>
+Example: <tt class="docutils literal"><span class="pre">(case</span> <span class="pre">(switch_on</span> <span class="pre">&quot;pthread&quot;),</span> <span class="pre">(append_cmd</span>
+<span class="pre">&quot;-lpthread&quot;))</span></tt></li>
+<li><tt class="docutils literal"><span class="pre">error`</span> <span class="pre">-</span> <span class="pre">exit</span> <span class="pre">with</span> <span class="pre">error.</span>
+<span class="pre">Example:</span> <span class="pre">``(error</span> <span class="pre">&quot;Mixing</span> <span class="pre">-c</span> <span class="pre">and</span> <span class="pre">-S</span> <span class="pre">is</span> <span class="pre">not</span> <span class="pre">allowed!&quot;)</span></tt>.</li>
 <li><tt class="docutils literal"><span class="pre">forward</span></tt> - forward an option unchanged.
 Example: <tt class="docutils literal"><span class="pre">(forward</span> <span class="pre">&quot;Wall&quot;)</span></tt>.</li>
 <li><tt class="docutils literal"><span class="pre">forward_as</span></tt> - Change the name of an option, but forward the




From eli.friedman at gmail.com  Tue Dec 16 21:35:18 2008
From: eli.friedman at gmail.com (Eli Friedman)
Date: Wed, 17 Dec 2008 03:35:18 -0000
Subject: [llvm-commits] [llvm] r61119 - in /llvm/trunk:
 lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
 test/CodeGen/X86/2008-12-16-BadShift.ll
Message-ID: <200812170335.mBH3ZIU3006407@zion.cs.uiuc.edu>

Author: efriedma
Date: Tue Dec 16 21:35:17 2008
New Revision: 61119

URL: http://llvm.org/viewvc/llvm-project?rev=61119&view=rev
Log:
Fix for PR3225: disable a broken optimization in
DAGTypeLegalizer::ExpandShiftWithKnownAmountBit.

In terms of restoring the optimization, the best fix here isn't 
obvious... any ideas?


Added:
    llvm/trunk/test/CodeGen/X86/2008-12-16-BadShift.ll
Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp?rev=61119&r1=61118&r2=61119&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Tue Dec 16 21:35:17 2008
@@ -1211,6 +1211,8 @@
     }
   }
 
+#if 0
+  // FIXME: This code is broken for shifts with a zero amount!
   // If we know that all of the high bits of the shift amount are zero, then we
   // can do this as a couple of simple shifts.
   if ((KnownZero & HighBitMask) == HighBitMask) {
@@ -1232,6 +1234,7 @@
                      DAG.getNode(Op2, NVT, InL, Amt2));
     return true;
   }
+#endif
 
   return false;
 }

Added: llvm/trunk/test/CodeGen/X86/2008-12-16-BadShift.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-12-16-BadShift.ll?rev=61119&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/2008-12-16-BadShift.ll (added)
+++ llvm/trunk/test/CodeGen/X86/2008-12-16-BadShift.ll Tue Dec 16 21:35:17 2008
@@ -0,0 +1,19 @@
+; RUN: llvm-as < %s | llc | not grep shrl
+; Note: this test is really trying to make sure that the shift
+; returns the right result; shrl is most likely wrong,
+; but if CodeGen starts legitimately using an shrl here,
+; please adjust the test appropriately.
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
+target triple = "i386-pc-linux-gnu"
+ at .str = internal constant [6 x i8] c"%lld\0A\00"		; <[6 x i8]*> [#uses=1]
+
+define i64 @mebbe_shift(i32 %xx, i32 %test) nounwind {
+entry:
+	%conv = zext i32 %xx to i64		; <i64> [#uses=1]
+	%tobool = icmp ne i32 %test, 0		; <i1> [#uses=1]
+	%shl = select i1 %tobool, i64 3, i64 0		; <i64> [#uses=1]
+	%x.0 = shl i64 %conv, %shl		; <i64> [#uses=1]
+	ret i64 %x.0
+}
+




From clattner at apple.com  Tue Dec 16 22:16:18 2008
From: clattner at apple.com (Chris Lattner)
Date: Tue, 16 Dec 2008 20:16:18 -0800
Subject: [llvm-commits] [llvm] r61092 - in /llvm/trunk:
	lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
	test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll
In-Reply-To: <866AF5C5-53E6-471C-9187-42A53E24D7DD@apple.com>
References: <200812161821.mBGILgSG020190@zion.cs.uiuc.edu>
	<1229462574.3034.9.camel@dgohman1>
	<36FEE712-F941-4099-85CD-A0A83760C4A0@apple.com>
	<866AF5C5-53E6-471C-9187-42A53E24D7DD@apple.com>
Message-ID: <0E5ABBEE-8FC7-488A-B650-2B5B38DB6EC8@apple.com>


On Dec 16, 2008, at 6:15 PM, Evan Cheng wrote:

>
> On Dec 16, 2008, at 1:29 PM, Chris Lattner wrote:
>
>>
>> On Dec 16, 2008, at 1:22 PM, Dan Gohman wrote:
>>
>>> Hi Evan,
>>>
>>> I'm seeing this error trigger when building libgomp on x86_64-linux-
>>> gnu.
>>> I've attached a reduced LLVM IR testcase.
>>>
>>> Here is the relevant C code, from libgomp/config/linux/x86/futex.h:
>>>
>>> static inline void
>>> futex_wake (int *addr, int count)
>>> {
>>> long res;
>>>
>>> __asm volatile ("syscall"
>>>                : "=a" (res)
>>>                : "0"(SYS_futex), "D" (addr), "S"(FUTEX_WAKE),
>>> "d"(count)
>>>                : "r11", "rcx", "memory");
>>> }
>>>
>>> SYS_futex here is a constant. Would it be possible to support this
>>> specific case?
>>
>> It would be best for llvm-gcc to widen the tied input/output to the
>> larger of the two integer types.
>
> We have decided not to support this type of inline asm because it's
> not clear what's the right thing to do. Should we widen to cast down?
> I guess it's clear in certain cases (e.g ptr type). I'll take a look.

I guess there are three cases:

1. The input and output are different but same-sized types (e.g. two  
different pointers, intptr + pointer, etc)
2. The input is smaller than the output
3. The output is smaller than the input.

#1 should already work today.
#2 should be reasonably easy: llvm-gcc just widens the input (and on  
big endian, shifts the input) to an integer of the right size.
#3 is a bit trickier because the output needs to be an lvalue.

-Chris


From gohman at apple.com  Tue Dec 16 22:24:26 2008
From: gohman at apple.com (Dan Gohman)
Date: Wed, 17 Dec 2008 04:24:26 -0000
Subject: [llvm-commits] [llvm] r61120 -
	/llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
Message-ID: <200812170424.mBH4OR4t007856@zion.cs.uiuc.edu>

Author: djg
Date: Tue Dec 16 22:24:23 2008
New Revision: 61120

URL: http://llvm.org/viewvc/llvm-project?rev=61120&view=rev
Log:
Fix the comments for getDepth and getHeight.

Modified:
    llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h

Modified: llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h?rev=61120&r1=61119&r2=61120&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h (original)
+++ llvm/trunk/include/llvm/CodeGen/ScheduleDAG.h Tue Dec 16 22:24:23 2008
@@ -312,15 +312,15 @@
     /// the specified node.
     void removePred(const SDep &D);
 
-    /// getHeight - Return the height of this node, which is the length of the
-    /// maximum path down to any node with has no successors.
+    /// getDepth - Return the depth of this node, which is the length of the
+    /// maximum path up to any node with has no predecessors.
     unsigned getDepth() const {
       if (!isDepthCurrent) const_cast<SUnit *>(this)->ComputeDepth();
       return Depth;
     }
 
     /// getHeight - Return the height of this node, which is the length of the
-    /// maximum path up to any node with has no predecessors.
+    /// maximum path down to any node with has no successors.
     unsigned getHeight() const {
       if (!isHeightCurrent) const_cast<SUnit *>(this)->ComputeHeight();
       return Height;




From nicholas at mxc.ca  Tue Dec 16 22:25:00 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Tue, 16 Dec 2008 20:25:00 -0800
Subject: [llvm-commits] [llvm] r61030 - in
 /llvm/trunk:	include/llvm/Attributes.h
 lib/AsmParser/llvmAsmParser.y	lib/Bitcode/Writer/BitcodeWriter.cpp
 lib/VMCore/Attributes.cpp
In-Reply-To: <16e5fdf90812161104t73211b1atd91205b0b784144d@mail.gmail.com>
References: <200812150729.mBF7Ttg3027174@zion.cs.uiuc.edu>	<C67C9844-2D24-478A-B7A7-FF9BE4D72C23@gmail.com>	<49476D82.8070609@mxc.ca>	<16e5fdf90812161053n251e89c6vf245ad3b3777ff5b@mail.gmail.com>
	<16e5fdf90812161104t73211b1atd91205b0b784144d@mail.gmail.com>
Message-ID: <49487F1C.1050207@mxc.ca>

Bill Wendling wrote:
> On Tue, Dec 16, 2008 at 10:53 AM, Bill Wendling <isanbard at gmail.com> wrote:
>> On Tue, Dec 16, 2008 at 12:57 AM, Nick Lewycky <nicholas at mxc.ca> wrote:
>>> Bill Wendling wrote:
>>>> Nick,
>>>>
>>>> You patch r61019 is causing a bootstrap failure on PPC. Here's the
>>>> minimal testcase and the error:
>>>>
>>>> $ cat testcase.i
>>>> struct S {
>>>>    unsigned long long f1;
>>>>    unsigned long long f2;
>>>> };
>>>> static void func2(struct S);
>>>> void func1() {
>>>>    struct S a;
>>>>    func2(a);
>>>> }
>>>>
>>>> $ Volumes/SandBox/NightlyTest/test/llvm-gcc.obj/./prev-gcc/xgcc -B/
>>>> Volumes/SandBox/NightlyTest/test/llvm\
>>>> -gcc.obj/./prev-gcc/ -B/Volumes/SandBox/NightlyTest/test/llvm-
>>>> gcc.install/powerpc-apple-darwin9.5.0/bin\
>>>> / -c testcase.i
>>>> bash-3.2$ bash-3.2$ Assertion failed: (isPowerOf2_32(i) && "Alignment
>>>> must be a power of two."), functi\
>>>> on constructAlignmentFromInt, file /Volumes/SandBox/NightlyTest/test/
>>>> llvm.src/include/llvm/Attributes.h\
>>>> , line 81.
>>>> testcase.i: In function 'func1':
>>>> testcase.i:6: internal compiler error: Abort trap
>>>> Please submit a full bug report,
>>>> with preprocessed source if appropriate.
>>>> See <URL:http://developer.apple.com/bugreporter> for instructions.
>>>>
>>>> Unfortunately, this occurs in the front-end, so I can't create a .bc
>>>> file. Here is the backtrace:
>>>>
>>>> (gdb) bt
>>>> #0  0x95bfd278 in abort ()
>>>> #1  0x95bec904 in __assert_rtn ()
>>>> #2  0x0093396c in llvm::Attribute::constructAlignmentFromInt ()
>>>> #3  0x00862a6c in DefaultABI<(anonymous
>>>> namespace)::FunctionTypeConversion>::HandleArgument ()
>>>> #4  0x0084b4ec in TypeConverter::ConvertFunctionType ()
>>>> #5  0x007cf6fc in make_decl_llvm ()
>>>> #6  0x007e3790 in llvm_get_decl ()
>>>> #7  0x007e6fe0 in TreeToLLVM::EmitLV_DECL ()
>>>> #8  0x00816dcc in TreeToLLVM::EmitLV ()
>>>> #9  0x0081e7fc in TreeToLLVM::EmitADDR_EXPR ()
>>>> #10 0x00802734 in TreeToLLVM::Emit ()
>>>> #11 0x00801988 in TreeToLLVM::EmitCALL_EXPR ()
>>>> #12 0x00802750 in TreeToLLVM::Emit ()
>>>> #13 0x0081f558 in TreeToLLVM::EmitFunction ()
>>>> #14 0x007d22a4 in llvm_emit_code_for_current_function ()
>>>> #15 0x0018c3a8 in tree_rest_of_compilation ()
>>>> #16 0x0002d9bc in c_expand_body ()
>>>> #17 0x008df4dc in cgraph_expand_function ()
>>>> #18 0x008dba94 in cgraph_assemble_pending_functions ()
>>>> #19 0x008dc01c in cgraph_finalize_function ()
>>>> #20 0x0002d854 in finish_function ()
>>>> #21 0x000d88a0 in c_parser_declaration_or_fndef ()
>>>> #22 0x000d7afc in c_parser_external_declaration ()
>>>> #23 0x000d7968 in c_parser_translation_unit ()
>>>> #24 0x000eb214 in c_parse_file ()
>>>> #25 0x000c35dc in c_common_parse_file ()
>>>> #26 0x0070688c in compile_file ()
>>>> #27 0x007095e0 in do_compile ()
>>>> #28 0x00709680 in toplev_main ()
>>>> #29 0x0010b308 in main ()
>>>>
>>>> Could you back-out your changes and investigate?
>>> I'll do that if we can't resolve this quickly, but it's complicated by
>>> the fact that other patches have already gone in which depend on this
>>> one. I think it's just r61019 r61030 r61040 so far.
>>>
>>> The crash you pasted should only happen if there's a mismatch between
>>> LLVM and llvm-gcc versions. To be exact, it looks like llvm-gcc was
>>> picking up the newer Attribute.h from LLVM, while still linking against
>>> an older version of the LLVM libraries (perhaps installed in the system?).
>>>
>>> Could you please check to make sure that's not the case? If you're sure,
>>> I'll be happy to go ahead and back this change out (or you can do it if
>>> you like), but I want to be sure firts.
>>>
>> Hi Nick,
>>
>> It failed again last night, which was r61086. It was using the correct
>> header files.
>>
> Now it's failing on X86 in release mode. I'm going to go ahead and
> revert those patches.

Thanks Bill! I'll try to reproduce this locally and if I can't, I'll 
give you a buzz.

Nick

> 
> -bw
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> 



From gohman at apple.com  Tue Dec 16 22:25:53 2008
From: gohman at apple.com (Dan Gohman)
Date: Wed, 17 Dec 2008 04:25:53 -0000
Subject: [llvm-commits] [llvm] r61121 -
	/llvm/trunk/lib/CodeGen/ScheduleDAG.cpp
Message-ID: <200812170425.mBH4PslT007904@zion.cs.uiuc.edu>

Author: djg
Date: Tue Dec 16 22:25:52 2008
New Revision: 61121

URL: http://llvm.org/viewvc/llvm-project?rev=61121&view=rev
Log:
Use getDepth() and getHeight() instead of accessing the
Depth and Height members directly, as they may not be
current.

Modified:
    llvm/trunk/lib/CodeGen/ScheduleDAG.cpp

Modified: llvm/trunk/lib/CodeGen/ScheduleDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/ScheduleDAG.cpp?rev=61121&r1=61120&r2=61121&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/ScheduleDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/ScheduleDAG.cpp Tue Dec 16 22:25:52 2008
@@ -150,7 +150,7 @@
 /// fact that this node's depth just increased.
 ///
 void SUnit::setDepthToAtLeast(unsigned NewDepth) {
-  if (NewDepth <= Depth)
+  if (NewDepth <= getDepth())
     return;
   setDepthDirty();
   Depth = NewDepth;
@@ -161,7 +161,7 @@
 /// fact that this node's height just increased.
 ///
 void SUnit::setHeightToAtLeast(unsigned NewHeight) {
-  if (NewHeight <= Height)
+  if (NewHeight <= getHeight())
     return;
   setHeightDirty();
   Height = NewHeight;




From gohman at apple.com  Tue Dec 16 22:30:47 2008
From: gohman at apple.com (Dan Gohman)
Date: Wed, 17 Dec 2008 04:30:47 -0000
Subject: [llvm-commits] [llvm] r61122 -
	/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
Message-ID: <200812170430.mBH4UmV5008034@zion.cs.uiuc.edu>

Author: djg
Date: Tue Dec 16 22:30:46 2008
New Revision: 61122

URL: http://llvm.org/viewvc/llvm-project?rev=61122&view=rev
Log:
Double the amount of memory reserved for SUnits. This is a
temporary workaround for an obscure bug. When node cloning is
used, it is possible that more SUnits will be created, and
if the SUnits std::vector has to reallocate, it will
invalidate all the graph edges.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp?rev=61122&r1=61121&r2=61122&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp Tue Dec 16 22:30:46 2008
@@ -71,7 +71,9 @@
   // Reserve entries in the vector for each of the SUnits we are creating.  This
   // ensure that reallocation of the vector won't happen, so SUnit*'s won't get
   // invalidated.
-  SUnits.reserve(DAG->allnodes_size());
+  // FIXME: Multiply by 2 because we may clone nodes during scheduling.
+  // This is a temporary workaround.
+  SUnits.reserve(DAG->allnodes_size() * 2);
   
   // During scheduling, the NodeId field of SDNode is used to map SDNodes
   // to their associated SUnits by holding SUnits table indices. A value




From gohman at apple.com  Tue Dec 16 22:50:26 2008
From: gohman at apple.com (Dan Gohman)
Date: Tue, 16 Dec 2008 20:50:26 -0800
Subject: [llvm-commits] [llvm] r61119 - in /llvm/trunk:
 lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
 test/CodeGen/X86/2008-12-16-BadShift.ll
In-Reply-To: <200812170335.mBH3ZIU3006407@zion.cs.uiuc.edu>
References: <200812170335.mBH3ZIU3006407@zion.cs.uiuc.edu>
Message-ID: <1229489426.3034.213.camel@dgohman1>

On Wed, 2008-12-17 at 03:35 +0000, Eli Friedman wrote:
> Author: efriedma
> Date: Tue Dec 16 21:35:17 2008
> New Revision: 61119
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=61119&view=rev
> Log:
> Fix for PR3225: disable a broken optimization in
> DAGTypeLegalizer::ExpandShiftWithKnownAmountBit.
> 
> In terms of restoring the optimization, the best fix here isn't 
> obvious... any ideas?

>    // If we know that all of the high bits of the shift amount are zero, then we
>    // can do this as a couple of simple shifts.
>    if ((KnownZero & HighBitMask) == HighBitMask) {

It might be possible to rescue the optimization in some cases by
adding a check for known ones, with something like this:

  (KnownOne & ~HighBitMask) != 0

Dan




From sabre at nondot.org  Tue Dec 16 23:28:55 2008
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 17 Dec 2008 05:28:55 -0000
Subject: [llvm-commits] [llvm] r61123 - in /llvm/trunk:
 lib/Transforms/IPO/GlobalOpt.cpp test/Transforms/GlobalOpt/heap-sra-phi.ll
Message-ID: <200812170528.mBH5SvvL009757@zion.cs.uiuc.edu>

Author: lattner
Date: Tue Dec 16 23:28:49 2008
New Revision: 61123

URL: http://llvm.org/viewvc/llvm-project?rev=61123&view=rev
Log:
Enhance heap sra to be substantially more aggressive w.r.t PHI
nodes.  This allows it to do fairly general phi insertion if a 
load from a pointer global wants to be SRAd but the load is used
by (recursive) phi nodes.  This fixes a pessimization on ppc
introduced by Load PRE.

Added:
    llvm/trunk/test/Transforms/GlobalOpt/heap-sra-phi.ll
Modified:
    llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp

Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=61123&r1=61122&r2=61123&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Tue Dec 16 23:28:49 2008
@@ -34,6 +34,7 @@
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/StringExtras.h"
+#include "llvm/ADT/STLExtras.h"
 #include <algorithm>
 using namespace llvm;
 
@@ -1015,8 +1016,8 @@
 /// LoadUsesSimpleEnoughForHeapSRA - Verify that all uses of V (a load, or a phi
 /// of a load) are simple enough to perform heap SRA on.  This permits GEP's
 /// that index through the array and struct field, icmps of null, and PHIs.
-static bool LoadUsesSimpleEnoughForHeapSRA(Value *V, MallocInst *MI,
-                             SmallPtrSet<PHINode*, 32> &AnalyzedLoadUsingPHIs) {
+static bool LoadUsesSimpleEnoughForHeapSRA(Value *V,
+                                     SmallPtrSet<PHINode*, 32> &LoadUsingPHIs) {
   // We permit two users of the load: setcc comparing against the null
   // pointer, and a getelementptr of a specific form.
   for (Value::use_iterator UI = V->use_begin(), E = V->use_end(); UI != E;++UI){
@@ -1041,25 +1042,11 @@
     
     if (PHINode *PN = dyn_cast<PHINode>(User)) {
       // If we have already recursively analyzed this PHI, then it is safe.
-      if (AnalyzedLoadUsingPHIs.insert(PN))
+      if (LoadUsingPHIs.insert(PN))
         continue;
       
-      // We have a phi of a load from the global.  We can only handle this
-      // if the other PHI'd values are actually the same.  In this case,
-      // the rewriter will just drop the phi entirely.
-      for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) {
-        Value *IV = PN->getIncomingValue(i);
-        if (IV == V) continue;  // Trivial the same.
-        
-        // If the phi'd value is from the malloc that initializes the value,
-        // we can xform it.
-        if (IV == MI) continue;
-        
-        // Otherwise, we don't know what it is.
-        return false;
-      }
-      
-      if (!LoadUsesSimpleEnoughForHeapSRA(PN, MI, AnalyzedLoadUsingPHIs))
+      // Make sure all uses of the PHI are simple enough to transform.
+      if (!LoadUsesSimpleEnoughForHeapSRA(PN, LoadUsingPHIs))
         return false;
       
       continue;
@@ -1077,45 +1064,100 @@
 /// GV are simple enough to perform HeapSRA, return true.
 static bool AllGlobalLoadUsesSimpleEnoughForHeapSRA(GlobalVariable *GV,
                                                     MallocInst *MI) {
-  SmallPtrSet<PHINode*, 32> AnalyzedLoadUsingPHIs;
+  SmallPtrSet<PHINode*, 32> LoadUsingPHIs;
   for (Value::use_iterator UI = GV->use_begin(), E = GV->use_end(); UI != E; 
        ++UI)
     if (LoadInst *LI = dyn_cast<LoadInst>(*UI))
-      if (!LoadUsesSimpleEnoughForHeapSRA(LI, MI, AnalyzedLoadUsingPHIs))
+      if (!LoadUsesSimpleEnoughForHeapSRA(LI, LoadUsingPHIs))
+        return false;
+  
+  // If we reach here, we know that all uses of the loads and transitive uses
+  // (through PHI nodes) are simple enough to transform.  However, we don't know
+  // that all inputs the to the PHI nodes are in the same equivalence sets. 
+  // Check to verify that all operands of the PHIs are either PHIS that can be
+  // transformed, loads from GV, or MI itself.
+  for (SmallPtrSet<PHINode*, 32>::iterator I = LoadUsingPHIs.begin(),
+       E = LoadUsingPHIs.end(); I != E; ++I) {
+    PHINode *PN = *I;
+    for (unsigned op = 0, e = PN->getNumIncomingValues(); op != e; ++op) {
+      Value *InVal = PN->getIncomingValue(op);
+      
+      // PHI of the stored value itself is ok.
+      if (InVal == MI) continue;
+      
+      if (PHINode *InPN = dyn_cast<PHINode>(InVal)) {
+        // One of the PHIs in our set is (optimistically) ok.
+        if (LoadUsingPHIs.count(InPN))
+          continue;
         return false;
+      }
+      
+      // Load from GV is ok.
+      if (LoadInst *LI = dyn_cast<LoadInst>(InVal))
+        if (LI->getOperand(0) == GV)
+          continue;
+      
+      // UNDEF? NULL?
+      
+      // Anything else is rejected.
+      return false;
+    }
+  }
+  
   return true;
 }
 
-/// GetHeapSROALoad - Return the load for the specified field of the HeapSROA'd
-/// value, lazily creating it on demand.
-static Value *GetHeapSROALoad(Instruction *Load, unsigned FieldNo,
-                              const std::vector<GlobalVariable*> &FieldGlobals,
-                              std::vector<Value *> &InsertedLoadsForPtr) {
-  if (InsertedLoadsForPtr.size() <= FieldNo)
-    InsertedLoadsForPtr.resize(FieldNo+1);
-  if (InsertedLoadsForPtr[FieldNo] == 0)
-    InsertedLoadsForPtr[FieldNo] = new LoadInst(FieldGlobals[FieldNo],
-                                                Load->getName()+".f" + 
-                                                utostr(FieldNo), Load);
-  return InsertedLoadsForPtr[FieldNo];
+static Value *GetHeapSROAValue(Value *V, unsigned FieldNo,
+               DenseMap<Value*, std::vector<Value*> > &InsertedScalarizedValues,
+                   std::vector<std::pair<PHINode*, unsigned> > &PHIsToRewrite) {
+  std::vector<Value*> &FieldVals = InsertedScalarizedValues[V];
+  
+  if (FieldNo >= FieldVals.size())
+    FieldVals.resize(FieldNo+1);
+  
+  // If we already have this value, just reuse the previously scalarized
+  // version.
+  if (Value *FieldVal = FieldVals[FieldNo])
+    return FieldVal;
+  
+  // Depending on what instruction this is, we have several cases.
+  Value *Result;
+  if (LoadInst *LI = dyn_cast<LoadInst>(V)) {
+    // This is a scalarized version of the load from the global.  Just create
+    // a new Load of the scalarized global.
+    Result = new LoadInst(GetHeapSROAValue(LI->getOperand(0), FieldNo,
+                                           InsertedScalarizedValues,
+                                           PHIsToRewrite),
+                          LI->getName()+".f" + utostr(FieldNo), LI);
+  } else if (PHINode *PN = dyn_cast<PHINode>(V)) {
+    // PN's type is pointer to struct.  Make a new PHI of pointer to struct
+    // field.
+    const StructType *ST = 
+      cast<StructType>(cast<PointerType>(PN->getType())->getElementType());
+    
+    Result =PHINode::Create(PointerType::getUnqual(ST->getElementType(FieldNo)),
+                            PN->getName()+".f"+utostr(FieldNo), PN);
+    PHIsToRewrite.push_back(std::make_pair(PN, FieldNo));
+  } else {
+    assert(0 && "Unknown usable value");
+    Result = 0;
+  }
+  
+  return FieldVals[FieldNo] = Result;
 }
 
 /// RewriteHeapSROALoadUser - Given a load instruction and a value derived from
 /// the load, rewrite the derived value to use the HeapSRoA'd load.
-static void RewriteHeapSROALoadUser(LoadInst *Load, Instruction *LoadUser, 
-                               const std::vector<GlobalVariable*> &FieldGlobals,
-                                    std::vector<Value *> &InsertedLoadsForPtr) {
+static void RewriteHeapSROALoadUser(Instruction *LoadUser, 
+             DenseMap<Value*, std::vector<Value*> > &InsertedScalarizedValues,
+                   std::vector<std::pair<PHINode*, unsigned> > &PHIsToRewrite) {
   // If this is a comparison against null, handle it.
   if (ICmpInst *SCI = dyn_cast<ICmpInst>(LoadUser)) {
     assert(isa<ConstantPointerNull>(SCI->getOperand(1)));
     // If we have a setcc of the loaded pointer, we can use a setcc of any
     // field.
-    Value *NPtr;
-    if (InsertedLoadsForPtr.empty()) {
-      NPtr = GetHeapSROALoad(Load, 0, FieldGlobals, InsertedLoadsForPtr);
-    } else {
-      NPtr = InsertedLoadsForPtr.back();
-    }
+    Value *NPtr = GetHeapSROAValue(SCI->getOperand(0), 0,
+                                   InsertedScalarizedValues, PHIsToRewrite);
     
     Value *New = new ICmpInst(SCI->getPredicate(), NPtr,
                               Constant::getNullValue(NPtr->getType()),
@@ -1125,15 +1167,15 @@
     return;
   }
   
-  // Handle 'getelementptr Ptr, Idx, uint FieldNo ...'
+  // Handle 'getelementptr Ptr, Idx, i32 FieldNo ...'
   if (GetElementPtrInst *GEPI = dyn_cast<GetElementPtrInst>(LoadUser)) {
     assert(GEPI->getNumOperands() >= 3 && isa<ConstantInt>(GEPI->getOperand(2))
            && "Unexpected GEPI!");
   
     // Load the pointer for this field.
     unsigned FieldNo = cast<ConstantInt>(GEPI->getOperand(2))->getZExtValue();
-    Value *NewPtr = GetHeapSROALoad(Load, FieldNo,
-                                    FieldGlobals, InsertedLoadsForPtr);
+    Value *NewPtr = GetHeapSROAValue(GEPI->getOperand(0), FieldNo,
+                                     InsertedScalarizedValues, PHIsToRewrite);
     
     // Create the new GEP idx vector.
     SmallVector<Value*, 8> GEPIdx;
@@ -1147,41 +1189,26 @@
     GEPI->eraseFromParent();
     return;
   }
-  
-  // Handle PHI nodes.  PHI nodes must be merging in the same values, plus
-  // potentially the original malloc.  Insert phi nodes for each field, then
-  // process uses of the PHI.
-  PHINode *PN = cast<PHINode>(LoadUser);
-  std::vector<Value *> PHIsForField;
-  PHIsForField.resize(FieldGlobals.size());
-  for (unsigned i = 0, e = FieldGlobals.size(); i != e; ++i) {
-    Value *LoadV = GetHeapSROALoad(Load, i, FieldGlobals, InsertedLoadsForPtr);
 
-    PHINode *FieldPN = PHINode::Create(LoadV->getType(),
-                                       PN->getName()+"."+utostr(i), PN);
-    // Fill in the predecessor values.
-    for (unsigned pred = 0, e = PN->getNumIncomingValues(); pred != e; ++pred) {
-      // Each predecessor either uses the load or the original malloc.
-      Value *InVal = PN->getIncomingValue(pred);
-      BasicBlock *BB = PN->getIncomingBlock(pred);
-      Value *NewVal;
-      if (isa<MallocInst>(InVal)) {
-        // Insert a reload from the global in the predecessor.
-        NewVal = GetHeapSROALoad(BB->getTerminator(), i, FieldGlobals,
-                                 PHIsForField);
-      } else {
-        NewVal = InsertedLoadsForPtr[i];
-      }
-      FieldPN->addIncoming(NewVal, BB);
-    }
-    PHIsForField[i] = FieldPN;
-  }
-  
-  // Since PHIsForField specifies a phi for every input value, the lazy inserter
-  // will never insert a load.
-  while (!PN->use_empty())
-    RewriteHeapSROALoadUser(Load, PN->use_back(), FieldGlobals, PHIsForField);
-  PN->eraseFromParent();
+  // Recursively transform the users of PHI nodes.  This will lazily create the
+  // PHIs that are needed for individual elements.  Keep track of what PHIs we
+  // see in InsertedScalarizedValues so that we don't get infinite loops (very
+  // antisocial).  If the PHI is already in InsertedScalarizedValues, it has
+  // already been seen first by another load, so its uses have already been
+  // processed.
+  PHINode *PN = cast<PHINode>(LoadUser);
+  bool Inserted;
+  DenseMap<Value*, std::vector<Value*> >::iterator InsertPos;
+  tie(InsertPos, Inserted) =
+    InsertedScalarizedValues.insert(std::make_pair(PN, std::vector<Value*>()));
+  if (!Inserted) return;
+  
+  // If this is the first time we've seen this PHI, recursively process all
+  // users.
+  for (Value::use_iterator UI = PN->use_begin(), E = PN->use_end(); UI != E;
+       ++UI)
+    RewriteHeapSROALoadUser(cast<Instruction>(*UI), InsertedScalarizedValues,
+                            PHIsToRewrite);
 }
 
 /// RewriteUsesOfLoadForHeapSRoA - We are performing Heap SRoA on a global.  Ptr
@@ -1189,12 +1216,17 @@
 /// use FieldGlobals instead.  All uses of loaded values satisfy
 /// AllGlobalLoadUsesSimpleEnoughForHeapSRA.
 static void RewriteUsesOfLoadForHeapSRoA(LoadInst *Load, 
-                             const std::vector<GlobalVariable*> &FieldGlobals) {
-  std::vector<Value *> InsertedLoadsForPtr;
-  //InsertedLoadsForPtr.resize(FieldGlobals.size());
-  while (!Load->use_empty())
-    RewriteHeapSROALoadUser(Load, Load->use_back(), 
-                            FieldGlobals, InsertedLoadsForPtr);
+               DenseMap<Value*, std::vector<Value*> > &InsertedScalarizedValues,
+                   std::vector<std::pair<PHINode*, unsigned> > &PHIsToRewrite) {
+  for (Value::use_iterator UI = Load->use_begin(), E = Load->use_end();
+       UI != E; )
+    RewriteHeapSROALoadUser(cast<Instruction>(*UI++), InsertedScalarizedValues,
+                            PHIsToRewrite);
+  
+  if (Load->use_empty()) {
+    Load->eraseFromParent();
+    InsertedScalarizedValues.erase(Load);
+  }
 }
 
 /// PerformHeapAllocSRoA - MI is an allocation of an array of structures.  Break
@@ -1211,7 +1243,7 @@
   
   // Okay, at this point, there are no users of the malloc.  Insert N
   // new mallocs at the same place as MI, and N globals.
-  std::vector<GlobalVariable*> FieldGlobals;
+  std::vector<Value*> FieldGlobals;
   std::vector<MallocInst*> FieldMallocs;
   
   for (unsigned FieldNo = 0, e = STy->getNumElements(); FieldNo != e;++FieldNo){
@@ -1293,37 +1325,82 @@
   // MI is no longer needed, remove it.
   MI->eraseFromParent();
 
+  /// InsertedScalarizedLoads - As we process loads, if we can't immediately
+  /// update all uses of the load, keep track of what scalarized loads are
+  /// inserted for a given load.
+  DenseMap<Value*, std::vector<Value*> > InsertedScalarizedValues;
+  InsertedScalarizedValues[GV] = FieldGlobals;
+  
+  std::vector<std::pair<PHINode*, unsigned> > PHIsToRewrite;
   
   // Okay, the malloc site is completely handled.  All of the uses of GV are now
   // loads, and all uses of those loads are simple.  Rewrite them to use loads
   // of the per-field globals instead.
-  while (!GV->use_empty()) {
-    if (LoadInst *LI = dyn_cast<LoadInst>(GV->use_back())) {
-      RewriteUsesOfLoadForHeapSRoA(LI, FieldGlobals);
-      LI->eraseFromParent();
-    } else {
-      // Must be a store of null.
-      StoreInst *SI = cast<StoreInst>(GV->use_back());
-      assert(isa<Constant>(SI->getOperand(0)) &&
-             cast<Constant>(SI->getOperand(0))->isNullValue() &&
-             "Unexpected heap-sra user!");
-      
-      // Insert a store of null into each global.
-      for (unsigned i = 0, e = FieldGlobals.size(); i != e; ++i) {
-        Constant *Null = 
-          Constant::getNullValue(FieldGlobals[i]->getType()->getElementType());
-        new StoreInst(Null, FieldGlobals[i], SI);
-      }
-      // Erase the original store.
-      SI->eraseFromParent();
+  for (Value::use_iterator UI = GV->use_begin(), E = GV->use_end(); UI != E;) {
+    Instruction *User = cast<Instruction>(*UI++);
+    
+    if (LoadInst *LI = dyn_cast<LoadInst>(User)) {
+      RewriteUsesOfLoadForHeapSRoA(LI, InsertedScalarizedValues, PHIsToRewrite);
+      continue;
+    }
+    
+    // Must be a store of null.
+    StoreInst *SI = cast<StoreInst>(User);
+    assert(isa<ConstantPointerNull>(SI->getOperand(0)) &&
+           "Unexpected heap-sra user!");
+    
+    // Insert a store of null into each global.
+    for (unsigned i = 0, e = FieldGlobals.size(); i != e; ++i) {
+      const PointerType *PT = cast<PointerType>(FieldGlobals[i]->getType());
+      Constant *Null = Constant::getNullValue(PT->getElementType());
+      new StoreInst(Null, FieldGlobals[i], SI);
+    }
+    // Erase the original store.
+    SI->eraseFromParent();
+  }
+
+  // While we have PHIs that are interesting to rewrite, do it.
+  while (!PHIsToRewrite.empty()) {
+    PHINode *PN = PHIsToRewrite.back().first;
+    unsigned FieldNo = PHIsToRewrite.back().second;
+    PHIsToRewrite.pop_back();
+    PHINode *FieldPN = cast<PHINode>(InsertedScalarizedValues[PN][FieldNo]);
+    assert(FieldPN->getNumIncomingValues() == 0 &&"Already processed this phi");
+
+    // Add all the incoming values.  This can materialize more phis.
+    for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) {
+      Value *InVal = PN->getIncomingValue(i);
+      InVal = GetHeapSROAValue(InVal, FieldNo, InsertedScalarizedValues,
+                               PHIsToRewrite);
+      FieldPN->addIncoming(InVal, PN->getIncomingBlock(i));
     }
   }
-
+  
+  // Drop all inter-phi links and any loads that made it this far.
+  for (DenseMap<Value*, std::vector<Value*> >::iterator
+       I = InsertedScalarizedValues.begin(), E = InsertedScalarizedValues.end();
+       I != E; ++I) {
+    if (PHINode *PN = dyn_cast<PHINode>(I->first))
+      PN->dropAllReferences();
+    else if (LoadInst *LI = dyn_cast<LoadInst>(I->first))
+      LI->dropAllReferences();
+  }
+  
+  // Delete all the phis and loads now that inter-references are dead.
+  for (DenseMap<Value*, std::vector<Value*> >::iterator
+       I = InsertedScalarizedValues.begin(), E = InsertedScalarizedValues.end();
+       I != E; ++I) {
+    if (PHINode *PN = dyn_cast<PHINode>(I->first))
+      PN->eraseFromParent();
+    else if (LoadInst *LI = dyn_cast<LoadInst>(I->first))
+      LI->eraseFromParent();
+  }
+  
   // The old global is now dead, remove it.
   GV->eraseFromParent();
 
   ++NumHeapSRA;
-  return FieldGlobals[0];
+  return cast<GlobalVariable>(FieldGlobals[0]);
 }
 
 /// TryToOptimizeStoreOfMallocToGlobal - This function is called when we see a

Added: llvm/trunk/test/Transforms/GlobalOpt/heap-sra-phi.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/GlobalOpt/heap-sra-phi.ll?rev=61123&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/GlobalOpt/heap-sra-phi.ll (added)
+++ llvm/trunk/test/Transforms/GlobalOpt/heap-sra-phi.ll Tue Dec 16 23:28:49 2008
@@ -0,0 +1,41 @@
+; RUN: llvm-as < %s | opt -globalopt | llvm-dis | grep {tmp.f1 = phi i32. }
+; RUN: llvm-as < %s | opt -globalopt | llvm-dis | grep {tmp.f0 = phi i32. }
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+target triple = "i386-apple-darwin7"
+	%struct.foo = type { i32, i32 }
+ at X = internal global %struct.foo* null		; <%struct.foo**> [#uses=2]
+
+define void @bar(i32 %Size) nounwind noinline {
+entry:
+	%tmp = malloc [1000000 x %struct.foo]		; <[1000000 x %struct.foo]*> [#uses=1]
+	%.sub = getelementptr [1000000 x %struct.foo]* %tmp, i32 0, i32 0		; <%struct.foo*> [#uses=1]
+	store %struct.foo* %.sub, %struct.foo** @X, align 4
+	ret void
+}
+
+define i32 @baz() nounwind readonly noinline {
+bb1.thread:
+	%tmpLD1 = load %struct.foo** @X, align 4		; <%struct.foo*> [#uses=1]
+	br label %bb1
+
+bb1:		; preds = %bb1, %bb1.thread
+        %tmp = phi %struct.foo* [%tmpLD1, %bb1.thread ], [ %tmpLD2, %bb1 ]		; <i32> [#uses=2]
+	%i.0.reg2mem.0 = phi i32 [ 0, %bb1.thread ], [ %indvar.next, %bb1 ]		; <i32> [#uses=2]
+	%sum.0.reg2mem.0 = phi i32 [ 0, %bb1.thread ], [ %tmp3, %bb1 ]		; <i32> [#uses=1]
+	%tmp1 = getelementptr %struct.foo* %tmp, i32 %i.0.reg2mem.0, i32 0		; <i32*> [#uses=1]
+	%tmp2 = load i32* %tmp1, align 4		; <i32> [#uses=1]
+	%tmp6 = add i32 %tmp2, %sum.0.reg2mem.0		; <i32> [#uses=2]
+	%tmp4 = getelementptr %struct.foo* %tmp, i32 %i.0.reg2mem.0, i32 1		; <i32*> [#uses=1]
+        %tmp5 = load i32 * %tmp4
+        %tmp3 = add i32 %tmp5, %tmp6
+	%indvar.next = add i32 %i.0.reg2mem.0, 1		; <i32> [#uses=2]
+        
+      	%tmpLD2 = load %struct.foo** @X, align 4		; <%struct.foo*> [#uses=1]
+
+	%exitcond = icmp eq i32 %indvar.next, 1200		; <i1> [#uses=1]
+	br i1 %exitcond, label %bb2, label %bb1
+
+bb2:		; preds = %bb1
+	ret i32 %tmp3
+}




From eli.friedman at gmail.com  Tue Dec 16 23:40:28 2008
From: eli.friedman at gmail.com (Eli Friedman)
Date: Tue, 16 Dec 2008 21:40:28 -0800
Subject: [llvm-commits] Patch to safely restore optimization to testcase
	from PR3225 on x86
Message-ID: <f5aa3e9b0812162140v6d2db1e7m8a542866af36ab87@mail.gmail.com>

A little while ago, I committed a patch for PR3225 which disables a
dangerous optimization for expanding double-width shifts (e.g. 64-bit
shifts on x86).  This significantly pessimized the code generated on
x86 for the cases which the optimization covered.

The attached performs a similar optimization in x86 platform-specific
code, which significantly improves code quality for the cases it
covers; this version is safe because SHLD/SHRD do the right thing for
shifts with a zero amount.

Any comments?

-Eli
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: x.txt
Url: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081216/90d971ea/attachment.txt 

From sabre at nondot.org  Tue Dec 16 23:42:09 2008
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 17 Dec 2008 05:42:09 -0000
Subject: [llvm-commits] [llvm] r61124 -
	/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
Message-ID: <200812170542.mBH5g9dS010135@zion.cs.uiuc.edu>

Author: lattner
Date: Tue Dec 16 23:42:08 2008
New Revision: 61124

URL: http://llvm.org/viewvc/llvm-project?rev=61124&view=rev
Log:
insert some sequence points and preincrement an iterator to avoid
iterator invalidation problems.

Modified:
    llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp

Modified: llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp?rev=61124&r1=61123&r2=61124&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp (original)
+++ llvm/trunk/lib/Transforms/IPO/GlobalOpt.cpp Tue Dec 16 23:42:08 2008
@@ -1205,10 +1205,10 @@
   
   // If this is the first time we've seen this PHI, recursively process all
   // users.
-  for (Value::use_iterator UI = PN->use_begin(), E = PN->use_end(); UI != E;
-       ++UI)
-    RewriteHeapSROALoadUser(cast<Instruction>(*UI), InsertedScalarizedValues,
-                            PHIsToRewrite);
+  for (Value::use_iterator UI = PN->use_begin(), E = PN->use_end(); UI != E; ) {
+    Instruction *User = cast<Instruction>(*UI++);
+    RewriteHeapSROALoadUser(User, InsertedScalarizedValues, PHIsToRewrite);
+  }
 }
 
 /// RewriteUsesOfLoadForHeapSRoA - We are performing Heap SRoA on a global.  Ptr
@@ -1219,9 +1219,10 @@
                DenseMap<Value*, std::vector<Value*> > &InsertedScalarizedValues,
                    std::vector<std::pair<PHINode*, unsigned> > &PHIsToRewrite) {
   for (Value::use_iterator UI = Load->use_begin(), E = Load->use_end();
-       UI != E; )
-    RewriteHeapSROALoadUser(cast<Instruction>(*UI++), InsertedScalarizedValues,
-                            PHIsToRewrite);
+       UI != E; ) {
+    Instruction *User = cast<Instruction>(*UI++);
+    RewriteHeapSROALoadUser(User, InsertedScalarizedValues, PHIsToRewrite);
+  }
   
   if (Load->use_empty()) {
     Load->eraseFromParent();




From evan.cheng at apple.com  Wed Dec 17 01:38:07 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 17 Dec 2008 07:38:07 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61128 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
Message-ID: <200812170738.mBH7cG9Y013859@zion.cs.uiuc.edu>

Author: evancheng
Date: Wed Dec 17 01:37:53 2008
New Revision: 61128

URL: http://llvm.org/viewvc/llvm-project?rev=61128&view=rev
Log:
If this input operand is matching an output operand, e.g. '0', check if this is something that llvm supports. If the operand types are different, then emit an error if 1) one of the types is not integer, 2) if size of input type is larger than the output type. If the size of the integer input size is smaller than the integer output type, then cast it to the larger type and shift the value if the target is big endian.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=61128&r1=61127&r2=61128&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Wed Dec 17 01:37:53 2008
@@ -4066,6 +4066,7 @@
   // StoreCallResultAddr - The pointer to store the result of the call through.
   SmallVector<Value *, 4> StoreCallResultAddrs;
   SmallVector<const Type *, 4> CallResultTypes;
+  SmallVector<bool, 4> CallResultIsSigned;
   
   // Process outputs.
   int ValNum = 0;
@@ -4123,6 +4124,7 @@
     }
     
     LValue Dest = EmitLV(Operand);
+    CallResultIsSigned.push_back(!TYPE_UNSIGNED(TREE_TYPE(Operand)));
     const Type *DestValTy =
       cast<PointerType>(Dest.Ptr->getType())->getElementType();
     
@@ -4190,9 +4192,47 @@
           Op = LV.Ptr;
         }
       }
+
+      const Type *OpTy = Op->getType();
+      // If this input operand is matching an output operand, e.g. '0', check if
+      // this is something that llvm supports. If the operand types are
+      // different, then emit an error if 1) one of the types is not integer,
+      // 2) if size of input type is larger than the output type. If the size
+      // of the integer input size is smaller than the integer output type, then
+      // cast it to the larger type and shift the value if the target is big
+      // endian.
+      if (ISDIGIT(Constraint[0])) {
+        unsigned Match = atoi(Constraint);
+        const Type *OTy = CallResultTypes[Match];
+        if (OTy != OpTy) {
+          if (!OTy->isInteger() || !OpTy->isInteger()) {
+            error("%HUnsupported inline asm: input constraint with a matching "
+                  "output constraint of incompatible type!",
+                  &EXPR_LOCATION(exp));
+            return 0;
+          }
+          unsigned OTyBits = OTy->getPrimitiveSizeInBits();
+          unsigned OpTyBits = OpTy->getPrimitiveSizeInBits();
+          if (OTyBits == 0 || OpTyBits == 0 || OTyBits < OpTyBits) {
+            error("%HUnsupported inline asm: input constraint with a matching "
+                  "output constraint of incompatible type!",
+                  &EXPR_LOCATION(exp));
+            return 0;
+          } else if (OTyBits > OpTyBits) {
+            Op = CastToAnyType(Op, !TYPE_UNSIGNED(type),
+                               OTy, CallResultIsSigned[Match]);
+            if (BYTES_BIG_ENDIAN) {
+              Constant *ShAmt = ConstantInt::get(Op->getType(), 
+                                                 OTyBits-OpTyBits);
+              Op = Builder.CreateLShr(Op, ShAmt);
+            }
+            OpTy = Op->getType();
+          }
+        }
+      }
       
       CallOps.push_back(Op);
-      CallArgTypes.push_back(Op->getType());
+      CallArgTypes.push_back(OpTy);
     } else {                          // Memory operand.
       lang_hooks.mark_addressable(TREE_VALUE(Input));
       isIndirect = true;




From echeng at apple.com  Wed Dec 17 01:39:25 2008
From: echeng at apple.com (Evan Cheng)
Date: Tue, 16 Dec 2008 23:39:25 -0800
Subject: [llvm-commits] [llvm] r61030 - in /llvm/trunk:
	include/llvm/Attributes.h lib/AsmParser/llvmAsmParser.y
	lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Attributes.cpp
In-Reply-To: <49487F1C.1050207@mxc.ca>
References: <200812150729.mBF7Ttg3027174@zion.cs.uiuc.edu>
	<C67C9844-2D24-478A-B7A7-FF9BE4D72C23@gmail.com>
	<49476D82.8070609@mxc.ca>
	<16e5fdf90812161053n251e89c6vf245ad3b3777ff5b@mail.gmail.com>
	<16e5fdf90812161104t73211b1atd91205b0b784144d@mail.gmail.com>
	<49487F1C.1050207@mxc.ca>
Message-ID: <AE7CB564-C631-4343-8E7D-FE09E8101DA5@apple.com>

You may want to check if r61122 fixed all the bootstrapping issues?  
It's likely r61030 is not the real cause.

Evan

On Dec 16, 2008, at 8:25 PM, Nick Lewycky wrote:

> Bill Wendling wrote:
>> On Tue, Dec 16, 2008 at 10:53 AM, Bill Wendling  
>> <isanbard at gmail.com> wrote:
>>> On Tue, Dec 16, 2008 at 12:57 AM, Nick Lewycky <nicholas at mxc.ca>  
>>> wrote:
>>>> Bill Wendling wrote:
>>>>> Nick,
>>>>>
>>>>> You patch r61019 is causing a bootstrap failure on PPC. Here's the
>>>>> minimal testcase and the error:
>>>>>
>>>>> $ cat testcase.i
>>>>> struct S {
>>>>>   unsigned long long f1;
>>>>>   unsigned long long f2;
>>>>> };
>>>>> static void func2(struct S);
>>>>> void func1() {
>>>>>   struct S a;
>>>>>   func2(a);
>>>>> }
>>>>>
>>>>> $ Volumes/SandBox/NightlyTest/test/llvm-gcc.obj/./prev-gcc/xgcc - 
>>>>> B/
>>>>> Volumes/SandBox/NightlyTest/test/llvm\
>>>>> -gcc.obj/./prev-gcc/ -B/Volumes/SandBox/NightlyTest/test/llvm-
>>>>> gcc.install/powerpc-apple-darwin9.5.0/bin\
>>>>> / -c testcase.i
>>>>> bash-3.2$ bash-3.2$ Assertion failed: (isPowerOf2_32(i) &&  
>>>>> "Alignment
>>>>> must be a power of two."), functi\
>>>>> on constructAlignmentFromInt, file /Volumes/SandBox/NightlyTest/ 
>>>>> test/
>>>>> llvm.src/include/llvm/Attributes.h\
>>>>> , line 81.
>>>>> testcase.i: In function 'func1':
>>>>> testcase.i:6: internal compiler error: Abort trap
>>>>> Please submit a full bug report,
>>>>> with preprocessed source if appropriate.
>>>>> See <URL:http://developer.apple.com/bugreporter> for instructions.
>>>>>
>>>>> Unfortunately, this occurs in the front-end, so I can't create  
>>>>> a .bc
>>>>> file. Here is the backtrace:
>>>>>
>>>>> (gdb) bt
>>>>> #0  0x95bfd278 in abort ()
>>>>> #1  0x95bec904 in __assert_rtn ()
>>>>> #2  0x0093396c in llvm::Attribute::constructAlignmentFromInt ()
>>>>> #3  0x00862a6c in DefaultABI<(anonymous
>>>>> namespace)::FunctionTypeConversion>::HandleArgument ()
>>>>> #4  0x0084b4ec in TypeConverter::ConvertFunctionType ()
>>>>> #5  0x007cf6fc in make_decl_llvm ()
>>>>> #6  0x007e3790 in llvm_get_decl ()
>>>>> #7  0x007e6fe0 in TreeToLLVM::EmitLV_DECL ()
>>>>> #8  0x00816dcc in TreeToLLVM::EmitLV ()
>>>>> #9  0x0081e7fc in TreeToLLVM::EmitADDR_EXPR ()
>>>>> #10 0x00802734 in TreeToLLVM::Emit ()
>>>>> #11 0x00801988 in TreeToLLVM::EmitCALL_EXPR ()
>>>>> #12 0x00802750 in TreeToLLVM::Emit ()
>>>>> #13 0x0081f558 in TreeToLLVM::EmitFunction ()
>>>>> #14 0x007d22a4 in llvm_emit_code_for_current_function ()
>>>>> #15 0x0018c3a8 in tree_rest_of_compilation ()
>>>>> #16 0x0002d9bc in c_expand_body ()
>>>>> #17 0x008df4dc in cgraph_expand_function ()
>>>>> #18 0x008dba94 in cgraph_assemble_pending_functions ()
>>>>> #19 0x008dc01c in cgraph_finalize_function ()
>>>>> #20 0x0002d854 in finish_function ()
>>>>> #21 0x000d88a0 in c_parser_declaration_or_fndef ()
>>>>> #22 0x000d7afc in c_parser_external_declaration ()
>>>>> #23 0x000d7968 in c_parser_translation_unit ()
>>>>> #24 0x000eb214 in c_parse_file ()
>>>>> #25 0x000c35dc in c_common_parse_file ()
>>>>> #26 0x0070688c in compile_file ()
>>>>> #27 0x007095e0 in do_compile ()
>>>>> #28 0x00709680 in toplev_main ()
>>>>> #29 0x0010b308 in main ()
>>>>>
>>>>> Could you back-out your changes and investigate?
>>>> I'll do that if we can't resolve this quickly, but it's  
>>>> complicated by
>>>> the fact that other patches have already gone in which depend on  
>>>> this
>>>> one. I think it's just r61019 r61030 r61040 so far.
>>>>
>>>> The crash you pasted should only happen if there's a mismatch  
>>>> between
>>>> LLVM and llvm-gcc versions. To be exact, it looks like llvm-gcc was
>>>> picking up the newer Attribute.h from LLVM, while still linking  
>>>> against
>>>> an older version of the LLVM libraries (perhaps installed in the  
>>>> system?).
>>>>
>>>> Could you please check to make sure that's not the case? If  
>>>> you're sure,
>>>> I'll be happy to go ahead and back this change out (or you can do  
>>>> it if
>>>> you like), but I want to be sure firts.
>>>>
>>> Hi Nick,
>>>
>>> It failed again last night, which was r61086. It was using the  
>>> correct
>>> header files.
>>>
>> Now it's failing on X86 in release mode. I'm going to go ahead and
>> revert those patches.
>
> Thanks Bill! I'll try to reproduce this locally and if I can't, I'll
> give you a buzz.
>
> Nick
>
>>
>> -bw
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From echeng at apple.com  Wed Dec 17 01:42:01 2008
From: echeng at apple.com (Evan Cheng)
Date: Tue, 16 Dec 2008 23:42:01 -0800
Subject: [llvm-commits] [llvm] r61092 - in /llvm/trunk:
	lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
	test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll
In-Reply-To: <0E5ABBEE-8FC7-488A-B650-2B5B38DB6EC8@apple.com>
References: <200812161821.mBGILgSG020190@zion.cs.uiuc.edu>
	<1229462574.3034.9.camel@dgohman1>
	<36FEE712-F941-4099-85CD-A0A83760C4A0@apple.com>
	<866AF5C5-53E6-471C-9187-42A53E24D7DD@apple.com>
	<0E5ABBEE-8FC7-488A-B650-2B5B38DB6EC8@apple.com>
Message-ID: <D101D793-97CB-449F-88BC-E4F614F8F32F@apple.com>


On Dec 16, 2008, at 8:16 PM, Chris Lattner wrote:
>
> I guess there are three cases:
>
> 1. The input and output are different but same-sized types (e.g. two
> different pointers, intptr + pointer, etc)
> 2. The input is smaller than the output
> 3. The output is smaller than the input.
>
> #1 should already work today.

Yes.

>
> #2 should be reasonably easy: llvm-gcc just widens the input (and on
> big endian, shifts the input) to an integer of the right size.

Done. r61128.

>
> #3 is a bit trickier because the output needs to be an lvalue.

This is the one we are not supporting. Its semantics is rather unclear.

Evan

>
>
> -Chris
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From clattner at apple.com  Wed Dec 17 01:47:15 2008
From: clattner at apple.com (Chris Lattner)
Date: Tue, 16 Dec 2008 23:47:15 -0800
Subject: [llvm-commits] [llvm] r61092 - in /llvm/trunk:
	lib/CodeGen/SelectionDAG/SelectionDAGBuild.cpp
	test/CodeGen/PowerPC/2008-10-17-AsmMatchingOperands.ll
In-Reply-To: <D101D793-97CB-449F-88BC-E4F614F8F32F@apple.com>
References: <200812161821.mBGILgSG020190@zion.cs.uiuc.edu>
	<1229462574.3034.9.camel@dgohman1>
	<36FEE712-F941-4099-85CD-A0A83760C4A0@apple.com>
	<866AF5C5-53E6-471C-9187-42A53E24D7DD@apple.com>
	<0E5ABBEE-8FC7-488A-B650-2B5B38DB6EC8@apple.com>
	<D101D793-97CB-449F-88BC-E4F614F8F32F@apple.com>
Message-ID: <A7CEC368-7D7D-4D96-87E4-FC101AF32CAA@apple.com>


On Dec 16, 2008, at 11:42 PM, Evan Cheng wrote:

>
> On Dec 16, 2008, at 8:16 PM, Chris Lattner wrote:
>>
>> I guess there are three cases:
>>
>> 1. The input and output are different but same-sized types (e.g. two
>> different pointers, intptr + pointer, etc)
>> 2. The input is smaller than the output
>> 3. The output is smaller than the input.
>>
>> #1 should already work today.
>
> Yes.
>
>>
>> #2 should be reasonably easy: llvm-gcc just widens the input (and on
>> big endian, shifts the input) to an integer of the right size.
>
> Done. r61128.
>
>>
>> #3 is a bit trickier because the output needs to be an lvalue.
>
> This is the one we are not supporting. Its semantics is rather  
> unclear.

Awesome, I completely agree.  Thanks Evan!

-Chris


From wangmp at apple.com  Wed Dec 17 02:49:48 2008
From: wangmp at apple.com (Mon P Wang)
Date: Wed, 17 Dec 2008 08:49:48 -0000
Subject: [llvm-commits] [llvm] r61129 -
	/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
Message-ID: <200812170849.mBH8nnn5016096@zion.cs.uiuc.edu>

Author: wangmp
Date: Wed Dec 17 02:49:47 2008
New Revision: 61129

URL: http://llvm.org/viewvc/llvm-project?rev=61129&view=rev
Log:
Fix expansion of vsetcc to set the high bit for true instead of 1.

Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=61129&r1=61128&r2=61129&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Wed Dec 17 02:49:47 2008
@@ -3144,10 +3144,12 @@
         SDValue In1 = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, TmpEltVT,
                                   Tmp1, DAG.getIntPtrConstant(i));
         Ops[i] = DAG.getNode(ISD::SETCC, TLI.getSetCCResultType(In1), In1,
-                              DAG.getNode(ISD::EXTRACT_VECTOR_ELT, TmpEltVT,
-                                          Tmp2, DAG.getIntPtrConstant(i)),
-                              CC);
-        Ops[i] = DAG.getNode(ISD::SIGN_EXTEND, EltVT, Ops[i]);
+                             DAG.getNode(ISD::EXTRACT_VECTOR_ELT, TmpEltVT,
+                                         Tmp2, DAG.getIntPtrConstant(i)),
+                             CC);
+        Ops[i] = DAG.getNode(ISD::SELECT, EltVT, Ops[i],
+                             DAG.getConstant(EltVT.getIntegerVTBitMask(),EltVT),
+                             DAG.getConstant(0, EltVT));
       }
       Result = DAG.getNode(ISD::BUILD_VECTOR, VT, &Ops[0], NumElems);
       break;




From isanbard at gmail.com  Wed Dec 17 02:50:02 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Dec 2008 00:50:02 -0800
Subject: [llvm-commits] [llvm] r61030 - in /llvm/trunk:
	include/llvm/Attributes.h lib/AsmParser/llvmAsmParser.y
	lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Attributes.cpp
In-Reply-To: <AE7CB564-C631-4343-8E7D-FE09E8101DA5@apple.com>
References: <200812150729.mBF7Ttg3027174@zion.cs.uiuc.edu>
	<C67C9844-2D24-478A-B7A7-FF9BE4D72C23@gmail.com>
	<49476D82.8070609@mxc.ca>
	<16e5fdf90812161053n251e89c6vf245ad3b3777ff5b@mail.gmail.com>
	<16e5fdf90812161104t73211b1atd91205b0b784144d@mail.gmail.com>
	<49487F1C.1050207@mxc.ca>
	<AE7CB564-C631-4343-8E7D-FE09E8101DA5@apple.com>
Message-ID: <C80CBE19-26B5-4877-85C6-9737481BF92F@gmail.com>

It's still failing with the same error (that the .o files differ).

-bw

On Dec 16, 2008, at 11:39 PM, Evan Cheng wrote:

> You may want to check if r61122 fixed all the bootstrapping issues?
> It's likely r61030 is not the real cause.
>
> Evan
>
> On Dec 16, 2008, at 8:25 PM, Nick Lewycky wrote:
>
>> Bill Wendling wrote:
>>> On Tue, Dec 16, 2008 at 10:53 AM, Bill Wendling
>>> <isanbard at gmail.com> wrote:
>>>> On Tue, Dec 16, 2008 at 12:57 AM, Nick Lewycky <nicholas at mxc.ca>
>>>> wrote:
>>>>> Bill Wendling wrote:
>>>>>> Nick,
>>>>>>
>>>>>> You patch r61019 is causing a bootstrap failure on PPC. Here's  
>>>>>> the
>>>>>> minimal testcase and the error:
>>>>>>
>>>>>> $ cat testcase.i
>>>>>> struct S {
>>>>>>  unsigned long long f1;
>>>>>>  unsigned long long f2;
>>>>>> };
>>>>>> static void func2(struct S);
>>>>>> void func1() {
>>>>>>  struct S a;
>>>>>>  func2(a);
>>>>>> }
>>>>>>
>>>>>> $ Volumes/SandBox/NightlyTest/test/llvm-gcc.obj/./prev-gcc/xgcc -
>>>>>> B/
>>>>>> Volumes/SandBox/NightlyTest/test/llvm\
>>>>>> -gcc.obj/./prev-gcc/ -B/Volumes/SandBox/NightlyTest/test/llvm-
>>>>>> gcc.install/powerpc-apple-darwin9.5.0/bin\
>>>>>> / -c testcase.i
>>>>>> bash-3.2$ bash-3.2$ Assertion failed: (isPowerOf2_32(i) &&
>>>>>> "Alignment
>>>>>> must be a power of two."), functi\
>>>>>> on constructAlignmentFromInt, file /Volumes/SandBox/NightlyTest/
>>>>>> test/
>>>>>> llvm.src/include/llvm/Attributes.h\
>>>>>> , line 81.
>>>>>> testcase.i: In function 'func1':
>>>>>> testcase.i:6: internal compiler error: Abort trap
>>>>>> Please submit a full bug report,
>>>>>> with preprocessed source if appropriate.
>>>>>> See <URL:http://developer.apple.com/bugreporter> for  
>>>>>> instructions.
>>>>>>
>>>>>> Unfortunately, this occurs in the front-end, so I can't create
>>>>>> a .bc
>>>>>> file. Here is the backtrace:
>>>>>>
>>>>>> (gdb) bt
>>>>>> #0  0x95bfd278 in abort ()
>>>>>> #1  0x95bec904 in __assert_rtn ()
>>>>>> #2  0x0093396c in llvm::Attribute::constructAlignmentFromInt ()
>>>>>> #3  0x00862a6c in DefaultABI<(anonymous
>>>>>> namespace)::FunctionTypeConversion>::HandleArgument ()
>>>>>> #4  0x0084b4ec in TypeConverter::ConvertFunctionType ()
>>>>>> #5  0x007cf6fc in make_decl_llvm ()
>>>>>> #6  0x007e3790 in llvm_get_decl ()
>>>>>> #7  0x007e6fe0 in TreeToLLVM::EmitLV_DECL ()
>>>>>> #8  0x00816dcc in TreeToLLVM::EmitLV ()
>>>>>> #9  0x0081e7fc in TreeToLLVM::EmitADDR_EXPR ()
>>>>>> #10 0x00802734 in TreeToLLVM::Emit ()
>>>>>> #11 0x00801988 in TreeToLLVM::EmitCALL_EXPR ()
>>>>>> #12 0x00802750 in TreeToLLVM::Emit ()
>>>>>> #13 0x0081f558 in TreeToLLVM::EmitFunction ()
>>>>>> #14 0x007d22a4 in llvm_emit_code_for_current_function ()
>>>>>> #15 0x0018c3a8 in tree_rest_of_compilation ()
>>>>>> #16 0x0002d9bc in c_expand_body ()
>>>>>> #17 0x008df4dc in cgraph_expand_function ()
>>>>>> #18 0x008dba94 in cgraph_assemble_pending_functions ()
>>>>>> #19 0x008dc01c in cgraph_finalize_function ()
>>>>>> #20 0x0002d854 in finish_function ()
>>>>>> #21 0x000d88a0 in c_parser_declaration_or_fndef ()
>>>>>> #22 0x000d7afc in c_parser_external_declaration ()
>>>>>> #23 0x000d7968 in c_parser_translation_unit ()
>>>>>> #24 0x000eb214 in c_parse_file ()
>>>>>> #25 0x000c35dc in c_common_parse_file ()
>>>>>> #26 0x0070688c in compile_file ()
>>>>>> #27 0x007095e0 in do_compile ()
>>>>>> #28 0x00709680 in toplev_main ()
>>>>>> #29 0x0010b308 in main ()
>>>>>>
>>>>>> Could you back-out your changes and investigate?
>>>>> I'll do that if we can't resolve this quickly, but it's
>>>>> complicated by
>>>>> the fact that other patches have already gone in which depend on
>>>>> this
>>>>> one. I think it's just r61019 r61030 r61040 so far.
>>>>>
>>>>> The crash you pasted should only happen if there's a mismatch
>>>>> between
>>>>> LLVM and llvm-gcc versions. To be exact, it looks like llvm-gcc  
>>>>> was
>>>>> picking up the newer Attribute.h from LLVM, while still linking
>>>>> against
>>>>> an older version of the LLVM libraries (perhaps installed in the
>>>>> system?).
>>>>>
>>>>> Could you please check to make sure that's not the case? If
>>>>> you're sure,
>>>>> I'll be happy to go ahead and back this change out (or you can do
>>>>> it if
>>>>> you like), but I want to be sure firts.
>>>>>
>>>> Hi Nick,
>>>>
>>>> It failed again last night, which was r61086. It was using the
>>>> correct
>>>> header files.
>>>>
>>> Now it's failing on X86 in release mode. I'm going to go ahead and
>>> revert those patches.
>>
>> Thanks Bill! I'll try to reproduce this locally and if I can't, I'll
>> give you a buzz.
>>
>> Nick
>>
>>>
>>> -bw
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at cs.uiuc.edu
>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From baldrick at free.fr  Wed Dec 17 02:21:39 2008
From: baldrick at free.fr (Duncan Sands)
Date: Wed, 17 Dec 2008 09:21:39 +0100
Subject: [llvm-commits] [llvm] r61093 -
	/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypesGeneric.cpp
In-Reply-To: <200812161825.mBGIPbJs020324@zion.cs.uiuc.edu>
References: <200812161825.mBGIPbJs020324@zion.cs.uiuc.edu>
Message-ID: <200812170921.40686.baldrick@free.fr>

Hi Dan,

> Preserve SourceValue information when lowering produces multiple loads from
> different offsets within the same stack slot.

this is not the only such place in LegalizeTypes.

Ciao,

Duncan.


From brukman+llvm at gmail.com  Wed Dec 17 10:27:27 2008
From: brukman+llvm at gmail.com (Misha Brukman)
Date: Wed, 17 Dec 2008 16:27:27 -0000
Subject: [llvm-commits] [llvm] r61138 - /llvm/trunk/docs/GettingStarted.html
Message-ID: <200812171627.mBHGRRY9007710@zion.cs.uiuc.edu>

Author: brukman
Date: Wed Dec 17 10:27:23 2008
New Revision: 61138

URL: http://llvm.org/viewvc/llvm-project?rev=61138&view=rev
Log:
Added mention of the RELEASE_24 tag for the 2.4 release.

Modified:
    llvm/trunk/docs/GettingStarted.html

Modified: llvm/trunk/docs/GettingStarted.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/GettingStarted.html?rev=61138&r1=61137&r2=61138&view=diff

==============================================================================
--- llvm/trunk/docs/GettingStarted.html (original)
+++ llvm/trunk/docs/GettingStarted.html Wed Dec 17 10:27:23 2008
@@ -714,9 +714,10 @@
 <p>If you want to get a specific release (as opposed to the most recent
 revision), you can checkout it from the '<tt>tags</tt>' directory (instead of
 '<tt>trunk</tt>'). The following releases are located in the following
-  subdirectories of the '<tt>tags</tt>' directory:</p>
+subdirectories of the '<tt>tags</tt>' directory:</p>
 
 <ul>
+<li>Release 2.4: <b>RELEASE_24</b></li>
 <li>Release 2.3: <b>RELEASE_23</b></li>
 <li>Release 2.2: <b>RELEASE_22</b></li>
 <li>Release 2.1: <b>RELEASE_21</b></li>




From Axel.Naumann at cern.ch  Wed Dec 17 09:31:30 2008
From: Axel.Naumann at cern.ch (Axel Naumann)
Date: Wed, 17 Dec 2008 16:31:30 +0100
Subject: [llvm-commits] [PATCH] llvm-ld EmitShellScript and -L
Message-ID: <49491B52.40606@cern.ch>

Hi,

I wanted to load /usr/lib64/libreadline.so into lli (aka "link against it" in
llvm-ld). Impossible with llvm-ld, because it uses sys::Path::FindLibrary()
which only checks the system lib paths, so it always picked up
/usr/lib/libreadline.so. Even copying it into ./mylib, and specifying -L mylib
doesn't work - again because sys::Path::FindLibrary() doesn't know about
directories specified by -L.

Attached patch lets EmitShellScript iterate over LibPaths before asking
sys::Path::FindLibrary(), which fixes both of these issues for me: I can
specify shlib directories for lli with -L, and I can override libs found in the
system paths.

My first patch to LLVM so don't be too brutal, please ;-)

Cheers, Axel.
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: llvm-ld_EmitShellScript_libpath.diff
Url: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081217/d2554e77/attachment.pl 

From evan.cheng at apple.com  Wed Dec 17 11:58:06 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 17 Dec 2008 09:58:06 -0800
Subject: [llvm-commits] [llvm] r61030 - in /llvm/trunk:
	include/llvm/Attributes.h lib/AsmParser/llvmAsmParser.y
	lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Attributes.cpp
In-Reply-To: <C80CBE19-26B5-4877-85C6-9737481BF92F@gmail.com>
References: <200812150729.mBF7Ttg3027174@zion.cs.uiuc.edu>
	<C67C9844-2D24-478A-B7A7-FF9BE4D72C23@gmail.com>
	<49476D82.8070609@mxc.ca>
	<16e5fdf90812161053n251e89c6vf245ad3b3777ff5b@mail.gmail.com>
	<16e5fdf90812161104t73211b1atd91205b0b784144d@mail.gmail.com>
	<49487F1C.1050207@mxc.ca>
	<AE7CB564-C631-4343-8E7D-FE09E8101DA5@apple.com>
	<C80CBE19-26B5-4877-85C6-9737481BF92F@gmail.com>
Message-ID: <968532E1-8BF8-40BC-8786-3CF7B055D3F2@apple.com>

Rats. Is it possible to find a previous revision (with r61122 patch  
applied) when it bootstrapped?

Thanks,

Evan

On Dec 17, 2008, at 12:50 AM, Bill Wendling wrote:

> It's still failing with the same error (that the .o files differ).
>
> -bw
>
> On Dec 16, 2008, at 11:39 PM, Evan Cheng wrote:
>
>> You may want to check if r61122 fixed all the bootstrapping issues?
>> It's likely r61030 is not the real cause.
>>
>> Evan
>>
>> On Dec 16, 2008, at 8:25 PM, Nick Lewycky wrote:
>>
>>> Bill Wendling wrote:
>>>> On Tue, Dec 16, 2008 at 10:53 AM, Bill Wendling
>>>> <isanbard at gmail.com> wrote:
>>>>> On Tue, Dec 16, 2008 at 12:57 AM, Nick Lewycky <nicholas at mxc.ca>
>>>>> wrote:
>>>>>> Bill Wendling wrote:
>>>>>>> Nick,
>>>>>>>
>>>>>>> You patch r61019 is causing a bootstrap failure on PPC. Here's
>>>>>>> the
>>>>>>> minimal testcase and the error:
>>>>>>>
>>>>>>> $ cat testcase.i
>>>>>>> struct S {
>>>>>>> unsigned long long f1;
>>>>>>> unsigned long long f2;
>>>>>>> };
>>>>>>> static void func2(struct S);
>>>>>>> void func1() {
>>>>>>> struct S a;
>>>>>>> func2(a);
>>>>>>> }
>>>>>>>
>>>>>>> $ Volumes/SandBox/NightlyTest/test/llvm-gcc.obj/./prev-gcc/ 
>>>>>>> xgcc -
>>>>>>> B/
>>>>>>> Volumes/SandBox/NightlyTest/test/llvm\
>>>>>>> -gcc.obj/./prev-gcc/ -B/Volumes/SandBox/NightlyTest/test/llvm-
>>>>>>> gcc.install/powerpc-apple-darwin9.5.0/bin\
>>>>>>> / -c testcase.i
>>>>>>> bash-3.2$ bash-3.2$ Assertion failed: (isPowerOf2_32(i) &&
>>>>>>> "Alignment
>>>>>>> must be a power of two."), functi\
>>>>>>> on constructAlignmentFromInt, file /Volumes/SandBox/NightlyTest/
>>>>>>> test/
>>>>>>> llvm.src/include/llvm/Attributes.h\
>>>>>>> , line 81.
>>>>>>> testcase.i: In function 'func1':
>>>>>>> testcase.i:6: internal compiler error: Abort trap
>>>>>>> Please submit a full bug report,
>>>>>>> with preprocessed source if appropriate.
>>>>>>> See <URL:http://developer.apple.com/bugreporter> for
>>>>>>> instructions.
>>>>>>>
>>>>>>> Unfortunately, this occurs in the front-end, so I can't create
>>>>>>> a .bc
>>>>>>> file. Here is the backtrace:
>>>>>>>
>>>>>>> (gdb) bt
>>>>>>> #0  0x95bfd278 in abort ()
>>>>>>> #1  0x95bec904 in __assert_rtn ()
>>>>>>> #2  0x0093396c in llvm::Attribute::constructAlignmentFromInt ()
>>>>>>> #3  0x00862a6c in DefaultABI<(anonymous
>>>>>>> namespace)::FunctionTypeConversion>::HandleArgument ()
>>>>>>> #4  0x0084b4ec in TypeConverter::ConvertFunctionType ()
>>>>>>> #5  0x007cf6fc in make_decl_llvm ()
>>>>>>> #6  0x007e3790 in llvm_get_decl ()
>>>>>>> #7  0x007e6fe0 in TreeToLLVM::EmitLV_DECL ()
>>>>>>> #8  0x00816dcc in TreeToLLVM::EmitLV ()
>>>>>>> #9  0x0081e7fc in TreeToLLVM::EmitADDR_EXPR ()
>>>>>>> #10 0x00802734 in TreeToLLVM::Emit ()
>>>>>>> #11 0x00801988 in TreeToLLVM::EmitCALL_EXPR ()
>>>>>>> #12 0x00802750 in TreeToLLVM::Emit ()
>>>>>>> #13 0x0081f558 in TreeToLLVM::EmitFunction ()
>>>>>>> #14 0x007d22a4 in llvm_emit_code_for_current_function ()
>>>>>>> #15 0x0018c3a8 in tree_rest_of_compilation ()
>>>>>>> #16 0x0002d9bc in c_expand_body ()
>>>>>>> #17 0x008df4dc in cgraph_expand_function ()
>>>>>>> #18 0x008dba94 in cgraph_assemble_pending_functions ()
>>>>>>> #19 0x008dc01c in cgraph_finalize_function ()
>>>>>>> #20 0x0002d854 in finish_function ()
>>>>>>> #21 0x000d88a0 in c_parser_declaration_or_fndef ()
>>>>>>> #22 0x000d7afc in c_parser_external_declaration ()
>>>>>>> #23 0x000d7968 in c_parser_translation_unit ()
>>>>>>> #24 0x000eb214 in c_parse_file ()
>>>>>>> #25 0x000c35dc in c_common_parse_file ()
>>>>>>> #26 0x0070688c in compile_file ()
>>>>>>> #27 0x007095e0 in do_compile ()
>>>>>>> #28 0x00709680 in toplev_main ()
>>>>>>> #29 0x0010b308 in main ()
>>>>>>>
>>>>>>> Could you back-out your changes and investigate?
>>>>>> I'll do that if we can't resolve this quickly, but it's
>>>>>> complicated by
>>>>>> the fact that other patches have already gone in which depend on
>>>>>> this
>>>>>> one. I think it's just r61019 r61030 r61040 so far.
>>>>>>
>>>>>> The crash you pasted should only happen if there's a mismatch
>>>>>> between
>>>>>> LLVM and llvm-gcc versions. To be exact, it looks like llvm-gcc
>>>>>> was
>>>>>> picking up the newer Attribute.h from LLVM, while still linking
>>>>>> against
>>>>>> an older version of the LLVM libraries (perhaps installed in the
>>>>>> system?).
>>>>>>
>>>>>> Could you please check to make sure that's not the case? If
>>>>>> you're sure,
>>>>>> I'll be happy to go ahead and back this change out (or you can do
>>>>>> it if
>>>>>> you like), but I want to be sure firts.
>>>>>>
>>>>> Hi Nick,
>>>>>
>>>>> It failed again last night, which was r61086. It was using the
>>>>> correct
>>>>> header files.
>>>>>
>>>> Now it's failing on X86 in release mode. I'm going to go ahead and
>>>> revert those patches.
>>>
>>> Thanks Bill! I'll try to reproduce this locally and if I can't, I'll
>>> give you a buzz.
>>>
>>> Nick
>>>
>>>>
>>>> -bw
>>>> _______________________________________________
>>>> llvm-commits mailing list
>>>> llvm-commits at cs.uiuc.edu
>>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>>>
>>>
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at cs.uiuc.edu
>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From brukman+llvm at gmail.com  Wed Dec 17 12:07:06 2008
From: brukman+llvm at gmail.com (Misha Brukman)
Date: Wed, 17 Dec 2008 18:07:06 -0000
Subject: [llvm-commits] [llvm] r61142 - /llvm/trunk/docs/FAQ.html
Message-ID: <200812171807.mBHI79tF010801@zion.cs.uiuc.edu>

Author: brukman
Date: Wed Dec 17 12:06:53 2008
New Revision: 61142

URL: http://llvm.org/viewvc/llvm-project?rev=61142&view=rev
Log:
Instead of referring to the license file in the 2.3 release, refer to the
always-current SVN version.

Modified:
    llvm/trunk/docs/FAQ.html

Modified: llvm/trunk/docs/FAQ.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/FAQ.html?rev=61142&r1=61141&r2=61142&view=diff

==============================================================================
--- llvm/trunk/docs/FAQ.html (original)
+++ llvm/trunk/docs/FAQ.html Wed Dec 17 12:06:53 2008
@@ -142,7 +142,7 @@
 <div class="answer">
 <p>Yes.  The modified source distribution must retain the copyright notice and
 follow the three bulletted conditions listed in the <a
-href="http://llvm.org/releases/2.3/LICENSE.TXT">LLVM license</a>.</p>
+href="http://llvm.org/svn/llvm-project/llvm/trunk/LICENSE.TXT">LLVM license</a>.</p>
 </div>
 
 <div class="question">




From brukman+llvm at gmail.com  Wed Dec 17 12:12:01 2008
From: brukman+llvm at gmail.com (Misha Brukman)
Date: Wed, 17 Dec 2008 18:12:01 -0000
Subject: [llvm-commits] [llvm] r61143 - /llvm/trunk/docs/FAQ.html
Message-ID: <200812171812.mBHIC7OS010961@zion.cs.uiuc.edu>

Author: brukman
Date: Wed Dec 17 12:11:40 2008
New Revision: 61143

URL: http://llvm.org/viewvc/llvm-project?rev=61143&view=rev
Log:
Simplified marking code regions -- no need to use <div> to surround <pre> tags.

Modified:
    llvm/trunk/docs/FAQ.html

Modified: llvm/trunk/docs/FAQ.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/FAQ.html?rev=61143&r1=61142&r2=61143&view=diff

==============================================================================
--- llvm/trunk/docs/FAQ.html (original)
+++ llvm/trunk/docs/FAQ.html Wed Dec 17 12:11:40 2008
@@ -234,11 +234,9 @@
   <li><p>Run <tt>configure</tt> with an alternative <tt>PATH</tt> that is
       correct. In a Borne compatible shell, the syntax would be:</p>
 
-<div class="doc_code">
-<pre>
+<pre class="doc_code">
 % PATH=[the path without the bad program] ./configure ...
 </pre>
-</div>
 
       <p>This is still somewhat inconvenient, but it allows <tt>configure</tt>
          to do its work without having to adjust your <tt>PATH</tt>
@@ -278,9 +276,9 @@
 can just run the following command in the top level directory of your object
 tree:</p>
 
-<div class="doc_code">
-<pre>% ./config.status &lt;relative path to Makefile&gt;</pre>
-</div>
+<pre class="doc_code">
+% ./config.status &lt;relative path to Makefile&gt;
+</pre>
 
 <p>If the Makefile is new, you will have to modify the configure script to copy
 it over.</p>
@@ -315,18 +313,16 @@
 
 <p>For example, if you built LLVM with the command:</p>
 
-<div class="doc_code">
-<pre>% gmake ENABLE_PROFILING=1</pre>
-</div>
+<pre class="doc_code">
+% gmake ENABLE_PROFILING=1
+</pre>
 
 <p>...then you must run the tests with the following commands:</p>
 
-<div class="doc_code">
-<pre>
+<pre class="doc_code">
 % cd llvm/test
 % gmake ENABLE_PROFILING=1
 </pre>
-</div>
 
 </div>
 
@@ -365,25 +361,21 @@
 <div class="answer">
 <p>If the error is of the form:</p>
 
-<div class="doc_code">
-<pre>
+<pre class="doc_code">
 gmake[2]: *** No rule to make target `/path/to/somefile', needed by
 `/path/to/another/file.d'.<br>
 Stop.
 </pre>
-</div>
 
 <p>This may occur anytime files are moved within the Subversion repository or 
 removed entirely.  In this case, the best solution is to erase all 
 <tt>.d</tt> files, which list dependencies for source files, and rebuild:</p>
 
-<div class="doc_code">
-<pre>
+<pre class="doc_code">
 % cd $LLVM_OBJ_DIR
 % rm -f `find . -name \*\.d` 
 % gmake 
 </pre>
-</div>
 
 <p>In other cases, it may be necessary to run <tt>make clean</tt> before
 rebuilding.</p>
@@ -540,13 +532,11 @@
 The only way this can happen is if you haven't installed the runtime library. To
 correct this, do:</p>
 
-<div class="doc_code">
-<pre>
+<pre class="doc_code">
 % cd llvm/runtime
 % make clean ; make install-bytecode
 </pre>
 </div>
-</div>
 
 <div class="question">
 <p>
@@ -583,21 +573,17 @@
 <ol>
   <li><p>Compile your program as normal with llvm-g++:</p>
 
-<div class="doc_code">
-<pre>
+<pre class="doc_code">
 % llvm-g++ x.cpp -o program
 </pre>
-</div>
 
   <p>or:</p>
 
-<div class="doc_code">
-<pre>
+<pre class="doc_code">
 % llvm-g++ a.cpp -c
 % llvm-g++ b.cpp -c
 % llvm-g++ a.o b.o -o program
 </pre>
-</div>
 
       <p>With llvm-gcc3, this will generate program and program.bc.  The .bc
          file is the LLVM version of the program all linked together.</p></li>
@@ -605,19 +591,15 @@
   <li><p>Convert the LLVM code to C code, using the LLC tool with the C
       backend:</p>
 
-<div class="doc_code">
-<pre>
+<pre class="doc_code">
 % llc -march=c program.bc -o program.c
-</pre>
-</div></li>
+</pre></li>
 
 <li><p>Finally, compile the C file:</p>
 
-<div class="doc_code">
-<pre>
+<pre class="doc_code">
 % cc x.c
-</pre>
-</div></li>
+</pre></li>
 
 </ol>
 
@@ -708,11 +690,9 @@
 a value that is not defined.  You can get these if you do not initialize a 
 variable before you use it.  For example, the C function:</p>
 
-<div class="doc_code">
-<pre>
+<pre class="doc_code">
 int X() { int i; return i; }
 </pre>
-</div>
 
 <p>Is compiled to "<tt>ret i32 undef</tt>" because "<tt>i</tt>" never has
 a value specified for it.</p>




From isanbard at gmail.com  Wed Dec 17 13:32:10 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Dec 2008 11:32:10 -0800
Subject: [llvm-commits] [llvm] r61030 - in /llvm/trunk:
	include/llvm/Attributes.h lib/AsmParser/llvmAsmParser.y
	lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Attributes.cpp
In-Reply-To: <968532E1-8BF8-40BC-8786-3CF7B055D3F2@apple.com>
References: <200812150729.mBF7Ttg3027174@zion.cs.uiuc.edu>
	<C67C9844-2D24-478A-B7A7-FF9BE4D72C23@gmail.com>
	<49476D82.8070609@mxc.ca>
	<16e5fdf90812161053n251e89c6vf245ad3b3777ff5b@mail.gmail.com>
	<16e5fdf90812161104t73211b1atd91205b0b784144d@mail.gmail.com>
	<49487F1C.1050207@mxc.ca>
	<AE7CB564-C631-4343-8E7D-FE09E8101DA5@apple.com>
	<C80CBE19-26B5-4877-85C6-9737481BF92F@gmail.com>
	<968532E1-8BF8-40BC-8786-3CF7B055D3F2@apple.com>
Message-ID: <16e5fdf90812171132x580fb0a5i449885811ab9ca9e@mail.gmail.com>

Version 2089 that I tagged on Sunday built just fine. I didn't apply
61122, of course.

-bw

On Wed, Dec 17, 2008 at 9:58 AM, Evan Cheng <evan.cheng at apple.com> wrote:
> Rats. Is it possible to find a previous revision (with r61122 patch
> applied) when it bootstrapped?
>
> Thanks,
>
> Evan
>


From kremenek at apple.com  Wed Dec 17 13:44:48 2008
From: kremenek at apple.com (Ted Kremenek)
Date: Wed, 17 Dec 2008 19:44:48 -0000
Subject: [llvm-commits] [llvm] r61148 - /llvm/tags/checker/checker-134/
Message-ID: <200812171944.mBHJimkx013797@zion.cs.uiuc.edu>

Author: kremenek
Date: Wed Dec 17 13:44:47 2008
New Revision: 61148

URL: http://llvm.org/viewvc/llvm-project?rev=61148&view=rev
Log:
Tagging checker-134.

Added:
    llvm/tags/checker/checker-134/
      - copied from r61147, llvm/trunk/



From isanbard at gmail.com  Wed Dec 17 14:59:59 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Dec 2008 20:59:59 -0000
Subject: [llvm-commits] [llvm] r61150 - in /llvm/trunk/lib/AsmParser:
 llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y.cvs
Message-ID: <200812172100.mBHL00kd016332@zion.cs.uiuc.edu>

Author: void
Date: Wed Dec 17 14:59:57 2008
New Revision: 61150

URL: http://llvm.org/viewvc/llvm-project?rev=61150&view=rev
Log:
Forgot to revert r61031 when I reverted r61019, r61030, and r61040.

Modified:
    llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs?rev=61150&r1=61149&r2=61150&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Wed Dec 17 14:59:57 2008
@@ -219,8 +219,8 @@
      SRET = 400,
      NOUNWIND = 401,
      NOALIAS = 402,
-     NOCAPTURE = 403,
-     BYVAL = 404,
+     BYVAL = 403,
+     NEST = 404,
      READNONE = 405,
      READONLY = 406,
      GC = 407,
@@ -229,10 +229,9 @@
      ALWAYSINLINE = 410,
      SSP = 411,
      SSPREQ = 412,
-     NEST = 413,
-     DEFAULT = 414,
-     HIDDEN = 415,
-     PROTECTED = 416
+     DEFAULT = 413,
+     HIDDEN = 414,
+     PROTECTED = 415
    };
 #endif
 /* Tokens.  */
@@ -381,8 +380,8 @@
 #define SRET 400
 #define NOUNWIND 401
 #define NOALIAS 402
-#define NOCAPTURE 403
-#define BYVAL 404
+#define BYVAL 403
+#define NEST 404
 #define READNONE 405
 #define READONLY 406
 #define GC 407
@@ -391,10 +390,9 @@
 #define ALWAYSINLINE 410
 #define SSP 411
 #define SSPREQ 412
-#define NEST 413
-#define DEFAULT 414
-#define HIDDEN 415
-#define PROTECTED 416
+#define DEFAULT 413
+#define HIDDEN 414
+#define PROTECTED 415
 
 
 
@@ -1442,7 +1440,7 @@
   llvm::FCmpInst::Predicate         FPredicate;
 }
 /* Line 187 of yacc.c.  */
-#line 1446 "llvmAsmParser.tab.c"
+#line 1444 "llvmAsmParser.tab.c"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -1455,7 +1453,7 @@
 
 
 /* Line 216 of yacc.c.  */
-#line 1459 "llvmAsmParser.tab.c"
+#line 1457 "llvmAsmParser.tab.c"
 
 #ifdef short
 # undef short
@@ -1670,20 +1668,20 @@
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  44
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2372
+#define YYLAST   2434
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  176
+#define YYNTOKENS  175
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  87
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  352
+#define YYNRULES  351
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  712
+#define YYNSTATES  711
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   416
+#define YYMAXUTOK   415
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -1695,15 +1693,15 @@
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     162,   163,   166,     2,   165,     2,     2,     2,     2,     2,
+     161,   162,   165,     2,   164,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     171,   164,   172,     2,     2,     2,     2,     2,     2,     2,
+     170,   163,   171,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   168,   167,   170,     2,     2,     2,     2,     2,   175,
+       2,   167,   166,   169,     2,     2,     2,     2,     2,   174,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     169,     2,     2,   173,     2,   174,     2,     2,     2,     2,
+     168,     2,     2,   172,     2,   173,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1732,7 +1730,7 @@
      125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
      135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
      145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160,   161
+     155,   156,   157,   158,   159,   160
 };
 
 #if YYDEBUG
@@ -1751,37 +1749,37 @@
      160,   162,   164,   166,   167,   169,   171,   172,   174,   176,
      178,   180,   181,   183,   185,   186,   188,   190,   192,   194,
      196,   199,   201,   203,   205,   207,   209,   211,   213,   215,
-     217,   219,   222,   223,   226,   228,   230,   232,   234,   235,
+     217,   220,   221,   224,   226,   228,   230,   232,   233,   236,
      238,   240,   242,   244,   246,   248,   250,   252,   254,   256,
-     258,   260,   262,   263,   266,   267,   270,   271,   274,   275,
-     279,   282,   283,   285,   286,   290,   292,   295,   297,   299,
-     301,   303,   305,   307,   309,   311,   313,   317,   319,   322,
-     328,   334,   340,   346,   350,   353,   359,   364,   367,   369,
-     371,   373,   377,   379,   383,   385,   386,   388,   392,   397,
-     401,   405,   410,   415,   419,   426,   432,   435,   438,   441,
-     444,   447,   450,   453,   456,   459,   462,   465,   468,   475,
-     481,   490,   497,   504,   512,   520,   528,   536,   543,   552,
-     561,   567,   575,   579,   581,   583,   585,   587,   588,   591,
-     598,   600,   601,   603,   606,   607,   611,   612,   616,   620,
-     624,   628,   629,   638,   639,   649,   650,   660,   666,   669,
-     673,   675,   679,   683,   687,   691,   693,   694,   700,   704,
-     706,   710,   712,   713,   725,   727,   729,   734,   736,   738,
-     741,   745,   746,   748,   750,   752,   754,   756,   758,   760,
-     762,   764,   766,   768,   772,   776,   779,   782,   786,   789,
-     795,   800,   802,   808,   810,   812,   814,   816,   818,   820,
-     823,   825,   829,   832,   835,   839,   843,   846,   847,   849,
-     852,   855,   859,   869,   879,   888,   904,   906,   908,   915,
-     921,   924,   927,   934,   942,   947,   952,   959,   966,   967,
-     968,   972,   975,   979,   982,   984,   990,   996,  1003,  1010,
-    1017,  1024,  1029,  1036,  1041,  1046,  1053,  1060,  1063,  1073,
-    1075,  1077,  1078,  1082,  1089,  1093,  1100,  1103,  1109,  1117,
-    1123,  1128,  1133
+     258,   260,   261,   264,   265,   268,   269,   272,   273,   277,
+     280,   281,   283,   284,   288,   290,   293,   295,   297,   299,
+     301,   303,   305,   307,   309,   311,   315,   317,   320,   326,
+     332,   338,   344,   348,   351,   357,   362,   365,   367,   369,
+     371,   375,   377,   381,   383,   384,   386,   390,   395,   399,
+     403,   408,   413,   417,   424,   430,   433,   436,   439,   442,
+     445,   448,   451,   454,   457,   460,   463,   466,   473,   479,
+     488,   495,   502,   510,   518,   526,   534,   541,   550,   559,
+     565,   573,   577,   579,   581,   583,   585,   586,   589,   596,
+     598,   599,   601,   604,   605,   609,   610,   614,   618,   622,
+     626,   627,   636,   637,   647,   648,   658,   664,   667,   671,
+     673,   677,   681,   685,   689,   691,   692,   698,   702,   704,
+     708,   710,   711,   723,   725,   727,   732,   734,   736,   739,
+     743,   744,   746,   748,   750,   752,   754,   756,   758,   760,
+     762,   764,   766,   770,   774,   777,   780,   784,   787,   793,
+     798,   800,   806,   808,   810,   812,   814,   816,   818,   821,
+     823,   827,   830,   833,   837,   841,   844,   845,   847,   850,
+     853,   857,   867,   877,   886,   902,   904,   906,   913,   919,
+     922,   925,   932,   940,   945,   950,   957,   964,   965,   966,
+     970,   973,   977,   980,   982,   988,   994,  1001,  1008,  1015,
+    1022,  1027,  1034,  1039,  1044,  1051,  1058,  1061,  1071,  1073,
+    1075,  1076,  1080,  1087,  1091,  1098,  1101,  1107,  1115,  1121,
+    1126,  1131
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     223,     0,    -1,    75,    -1,    76,    -1,    77,    -1,    78,
+     222,     0,    -1,    75,    -1,    76,    -1,    77,    -1,    78,
       -1,    79,    -1,    80,    -1,    81,    -1,    82,    -1,    83,
       -1,    87,    -1,    88,    -1,    89,    -1,    84,    -1,    85,
       -1,    86,    -1,   120,    -1,   121,    -1,   122,    -1,   123,
@@ -1792,110 +1790,109 @@
       -1,   106,    -1,   107,    -1,   108,    -1,   109,    -1,   110,
       -1,   111,    -1,   112,    -1,   113,    -1,   100,    -1,   101,
       -1,   102,    -1,   103,    -1,    26,    -1,    27,    -1,    19,
-      -1,    22,    -1,    24,    -1,   182,    -1,    -1,    55,   162,
-       4,   163,    -1,    -1,   182,   164,    -1,    -1,     7,   164,
-      -1,    20,    -1,    23,    -1,   189,    -1,    -1,   187,   164,
+      -1,    22,    -1,    24,    -1,   181,    -1,    -1,    55,   161,
+       4,   162,    -1,    -1,   181,   163,    -1,    -1,     7,   163,
+      -1,    20,    -1,    23,    -1,   188,    -1,    -1,   186,   163,
       -1,    42,    -1,    44,    -1,    43,    -1,    45,    -1,    47,
       -1,    49,    -1,    46,    -1,    48,    -1,    51,    -1,    -1,
-     159,    -1,   160,    -1,   161,    -1,    -1,    46,    -1,    48,
+     158,    -1,   159,    -1,   160,    -1,    -1,    46,    -1,    48,
       -1,    -1,    42,    -1,    43,    -1,    44,    -1,    47,    -1,
       -1,    44,    -1,    42,    -1,    -1,    63,    -1,    64,    -1,
       65,    -1,    66,    -1,    67,    -1,    62,     4,    -1,   142,
       -1,   121,    -1,   141,    -1,   122,    -1,   144,    -1,   145,
-      -1,   147,    -1,   148,    -1,   149,    -1,   158,    -1,    54,
-       4,    -1,    -1,   198,   197,    -1,   144,    -1,   142,    -1,
-     141,    -1,   147,    -1,    -1,   200,   199,    -1,   143,    -1,
-     146,    -1,   144,    -1,   142,    -1,   141,    -1,   150,    -1,
-     151,    -1,   154,    -1,   155,    -1,   153,    -1,   156,    -1,
-     157,    -1,    -1,   202,   201,    -1,    -1,   152,    22,    -1,
-      -1,    54,     4,    -1,    -1,   165,    54,     4,    -1,    34,
-      22,    -1,    -1,   206,    -1,    -1,   165,   209,   208,    -1,
-     206,    -1,    54,     4,    -1,    11,    -1,    12,    -1,    13,
-      -1,    16,    -1,    15,    -1,    14,    -1,    17,    -1,    50,
-      -1,   210,    -1,   211,   184,   166,    -1,   245,    -1,   167,
-       4,    -1,   211,   162,   215,   163,   202,    -1,    10,   162,
-     215,   163,   202,    -1,   168,     4,   169,   211,   170,    -1,
-     171,     4,   169,   211,   172,    -1,   173,   216,   174,    -1,
-     173,   174,    -1,   171,   173,   216,   174,   172,    -1,   171,
-     173,   174,   172,    -1,   211,   198,    -1,   211,    -1,    10,
-      -1,   212,    -1,   214,   165,   212,    -1,   214,    -1,   214,
-     165,    39,    -1,    39,    -1,    -1,   211,    -1,   216,   165,
-     211,    -1,   211,   168,   219,   170,    -1,   211,   168,   170,
-      -1,   211,   175,    22,    -1,   211,   171,   219,   172,    -1,
-     211,   173,   219,   174,    -1,   211,   173,   174,    -1,   211,
-     171,   173,   219,   174,   172,    -1,   211,   171,   173,   174,
-     172,    -1,   211,    40,    -1,   211,    41,    -1,   211,   245,
-      -1,   211,   218,    -1,   211,    25,    -1,   211,     3,    -1,
-     211,     5,    -1,   211,     4,    -1,   211,     6,    -1,   211,
-      26,    -1,   211,    27,    -1,   211,     9,    -1,   179,   162,
-     217,    38,   211,   163,    -1,   119,   162,   217,   257,   163,
-      -1,   133,   162,   217,   165,   217,   165,   217,   163,    -1,
-     177,   162,   217,   165,   217,   163,    -1,   178,   162,   217,
-     165,   217,   163,    -1,    90,   180,   162,   217,   165,   217,
-     163,    -1,    91,   181,   162,   217,   165,   217,   163,    -1,
-      92,   180,   162,   217,   165,   217,   163,    -1,    93,   181,
-     162,   217,   165,   217,   163,    -1,   135,   162,   217,   165,
-     217,   163,    -1,   136,   162,   217,   165,   217,   165,   217,
-     163,    -1,   137,   162,   217,   165,   217,   165,   217,   163,
-      -1,   139,   162,   217,   258,   163,    -1,   140,   162,   217,
-     165,   217,   258,   163,    -1,   219,   165,   217,    -1,   217,
-      -1,    32,    -1,    33,    -1,    37,    -1,    -1,   213,   245,
-      -1,   125,   162,   222,    38,   211,   163,    -1,   224,    -1,
-      -1,   225,    -1,   224,   225,    -1,    -1,    31,   226,   241,
-      -1,    -1,    30,   227,   242,    -1,    60,    59,   231,    -1,
-     185,    18,   211,    -1,   185,    18,    10,    -1,    -1,   188,
-     192,   221,   220,   217,   184,   228,   208,    -1,    -1,   188,
-     190,   192,   221,   220,   217,   184,   229,   208,    -1,    -1,
-     188,   191,   192,   221,   220,   211,   184,   230,   208,    -1,
-     188,   192,    35,   195,   222,    -1,    52,   232,    -1,    56,
-     164,   233,    -1,    22,    -1,    53,   164,    22,    -1,    68,
-     164,    22,    -1,   168,   234,   170,    -1,   234,   165,    22,
-      -1,    22,    -1,    -1,   235,   165,   211,   198,   183,    -1,
-     211,   198,   183,    -1,   235,    -1,   235,   165,    39,    -1,
-      39,    -1,    -1,   196,   200,   213,   187,   162,   236,   163,
-     202,   207,   204,   203,    -1,    28,    -1,   173,    -1,   194,
-     192,   237,   238,    -1,    29,    -1,   174,    -1,   249,   240,
-      -1,   193,   192,   237,    -1,    -1,    61,    -1,     3,    -1,
-       4,    -1,     5,    -1,     6,    -1,     9,    -1,    26,    -1,
-      27,    -1,    40,    -1,    41,    -1,    25,    -1,   171,   219,
-     172,    -1,   168,   219,   170,    -1,   168,   170,    -1,   175,
-      22,    -1,   173,   219,   174,    -1,   173,   174,    -1,   171,
-     173,   219,   174,   172,    -1,   171,   173,   174,   172,    -1,
-     218,    -1,    59,   243,    22,   165,    22,    -1,     7,    -1,
-       8,    -1,   182,    -1,   187,    -1,   245,    -1,   244,    -1,
-     211,   246,    -1,   247,    -1,   248,   165,   247,    -1,   249,
-     250,    -1,   239,   250,    -1,   251,   185,   252,    -1,   251,
-     186,   252,    -1,   251,   254,    -1,    -1,    21,    -1,    69,
-     248,    -1,    69,    10,    -1,    70,    17,   246,    -1,    70,
-      11,   246,   165,    17,   246,   165,    17,   246,    -1,    71,
-      11,   246,   165,    17,   246,   168,   253,   170,    -1,    71,
-      11,   246,   165,    17,   246,   168,   170,    -1,    72,   196,
-     200,   213,   246,   162,   256,   163,   202,    38,    17,   246,
-      73,    17,   246,    -1,    73,    -1,    74,    -1,   253,    11,
-     244,   165,    17,   246,    -1,    11,   244,   165,    17,   246,
-      -1,   185,   260,    -1,   186,   260,    -1,   211,   168,   246,
-     165,   246,   170,    -1,   255,   165,   168,   246,   165,   246,
-     170,    -1,   211,   198,   246,   198,    -1,    17,   198,   246,
-     198,    -1,   256,   165,   211,   198,   246,   198,    -1,   256,
-     165,    17,   198,   246,   198,    -1,    -1,    -1,   257,   165,
-     247,    -1,   165,     4,    -1,   258,   165,     4,    -1,    58,
-      57,    -1,    57,    -1,   177,   211,   246,   165,   246,    -1,
-     178,   211,   246,   165,   246,    -1,    90,   180,   211,   246,
-     165,   246,    -1,    91,   181,   211,   246,   165,   246,    -1,
-      92,   180,   211,   246,   165,   246,    -1,    93,   181,   211,
-     246,   165,   246,    -1,   179,   247,    38,   211,    -1,   133,
-     247,   165,   247,   165,   247,    -1,   134,   247,   165,   211,
-      -1,   135,   247,   165,   247,    -1,   136,   247,   165,   247,
-     165,   247,    -1,   137,   247,   165,   247,   165,   247,    -1,
-     132,   255,    -1,   259,   196,   200,   213,   246,   162,   256,
-     163,   202,    -1,   262,    -1,    36,    -1,    -1,   114,   211,
-     205,    -1,   114,   211,   165,    11,   246,   205,    -1,   115,
-     211,   205,    -1,   115,   211,   165,    11,   246,   205,    -1,
-     116,   247,    -1,   261,   117,   211,   246,   205,    -1,   261,
-     118,   247,   165,   211,   246,   205,    -1,   138,   211,   246,
-     165,     4,    -1,   119,   211,   246,   257,    -1,   139,   211,
-     246,   258,    -1,   140,   211,   246,   165,   211,   246,   258,
-      -1
+      -1,   147,    -1,   148,    -1,   149,    -1,    54,     4,    -1,
+      -1,   197,   196,    -1,   144,    -1,   142,    -1,   141,    -1,
+     147,    -1,    -1,   199,   198,    -1,   143,    -1,   146,    -1,
+     144,    -1,   142,    -1,   141,    -1,   150,    -1,   151,    -1,
+     154,    -1,   155,    -1,   153,    -1,   156,    -1,   157,    -1,
+      -1,   201,   200,    -1,    -1,   152,    22,    -1,    -1,    54,
+       4,    -1,    -1,   164,    54,     4,    -1,    34,    22,    -1,
+      -1,   205,    -1,    -1,   164,   208,   207,    -1,   205,    -1,
+      54,     4,    -1,    11,    -1,    12,    -1,    13,    -1,    16,
+      -1,    15,    -1,    14,    -1,    17,    -1,    50,    -1,   209,
+      -1,   210,   183,   165,    -1,   244,    -1,   166,     4,    -1,
+     210,   161,   214,   162,   201,    -1,    10,   161,   214,   162,
+     201,    -1,   167,     4,   168,   210,   169,    -1,   170,     4,
+     168,   210,   171,    -1,   172,   215,   173,    -1,   172,   173,
+      -1,   170,   172,   215,   173,   171,    -1,   170,   172,   173,
+     171,    -1,   210,   197,    -1,   210,    -1,    10,    -1,   211,
+      -1,   213,   164,   211,    -1,   213,    -1,   213,   164,    39,
+      -1,    39,    -1,    -1,   210,    -1,   215,   164,   210,    -1,
+     210,   167,   218,   169,    -1,   210,   167,   169,    -1,   210,
+     174,    22,    -1,   210,   170,   218,   171,    -1,   210,   172,
+     218,   173,    -1,   210,   172,   173,    -1,   210,   170,   172,
+     218,   173,   171,    -1,   210,   170,   172,   173,   171,    -1,
+     210,    40,    -1,   210,    41,    -1,   210,   244,    -1,   210,
+     217,    -1,   210,    25,    -1,   210,     3,    -1,   210,     5,
+      -1,   210,     4,    -1,   210,     6,    -1,   210,    26,    -1,
+     210,    27,    -1,   210,     9,    -1,   178,   161,   216,    38,
+     210,   162,    -1,   119,   161,   216,   256,   162,    -1,   133,
+     161,   216,   164,   216,   164,   216,   162,    -1,   176,   161,
+     216,   164,   216,   162,    -1,   177,   161,   216,   164,   216,
+     162,    -1,    90,   179,   161,   216,   164,   216,   162,    -1,
+      91,   180,   161,   216,   164,   216,   162,    -1,    92,   179,
+     161,   216,   164,   216,   162,    -1,    93,   180,   161,   216,
+     164,   216,   162,    -1,   135,   161,   216,   164,   216,   162,
+      -1,   136,   161,   216,   164,   216,   164,   216,   162,    -1,
+     137,   161,   216,   164,   216,   164,   216,   162,    -1,   139,
+     161,   216,   257,   162,    -1,   140,   161,   216,   164,   216,
+     257,   162,    -1,   218,   164,   216,    -1,   216,    -1,    32,
+      -1,    33,    -1,    37,    -1,    -1,   212,   244,    -1,   125,
+     161,   221,    38,   210,   162,    -1,   223,    -1,    -1,   224,
+      -1,   223,   224,    -1,    -1,    31,   225,   240,    -1,    -1,
+      30,   226,   241,    -1,    60,    59,   230,    -1,   184,    18,
+     210,    -1,   184,    18,    10,    -1,    -1,   187,   191,   220,
+     219,   216,   183,   227,   207,    -1,    -1,   187,   189,   191,
+     220,   219,   216,   183,   228,   207,    -1,    -1,   187,   190,
+     191,   220,   219,   210,   183,   229,   207,    -1,   187,   191,
+      35,   194,   221,    -1,    52,   231,    -1,    56,   163,   232,
+      -1,    22,    -1,    53,   163,    22,    -1,    68,   163,    22,
+      -1,   167,   233,   169,    -1,   233,   164,    22,    -1,    22,
+      -1,    -1,   234,   164,   210,   197,   182,    -1,   210,   197,
+     182,    -1,   234,    -1,   234,   164,    39,    -1,    39,    -1,
+      -1,   195,   199,   212,   186,   161,   235,   162,   201,   206,
+     203,   202,    -1,    28,    -1,   172,    -1,   193,   191,   236,
+     237,    -1,    29,    -1,   173,    -1,   248,   239,    -1,   192,
+     191,   236,    -1,    -1,    61,    -1,     3,    -1,     4,    -1,
+       5,    -1,     6,    -1,     9,    -1,    26,    -1,    27,    -1,
+      40,    -1,    41,    -1,    25,    -1,   170,   218,   171,    -1,
+     167,   218,   169,    -1,   167,   169,    -1,   174,    22,    -1,
+     172,   218,   173,    -1,   172,   173,    -1,   170,   172,   218,
+     173,   171,    -1,   170,   172,   173,   171,    -1,   217,    -1,
+      59,   242,    22,   164,    22,    -1,     7,    -1,     8,    -1,
+     181,    -1,   186,    -1,   244,    -1,   243,    -1,   210,   245,
+      -1,   246,    -1,   247,   164,   246,    -1,   248,   249,    -1,
+     238,   249,    -1,   250,   184,   251,    -1,   250,   185,   251,
+      -1,   250,   253,    -1,    -1,    21,    -1,    69,   247,    -1,
+      69,    10,    -1,    70,    17,   245,    -1,    70,    11,   245,
+     164,    17,   245,   164,    17,   245,    -1,    71,    11,   245,
+     164,    17,   245,   167,   252,   169,    -1,    71,    11,   245,
+     164,    17,   245,   167,   169,    -1,    72,   195,   199,   212,
+     245,   161,   255,   162,   201,    38,    17,   245,    73,    17,
+     245,    -1,    73,    -1,    74,    -1,   252,    11,   243,   164,
+      17,   245,    -1,    11,   243,   164,    17,   245,    -1,   184,
+     259,    -1,   185,   259,    -1,   210,   167,   245,   164,   245,
+     169,    -1,   254,   164,   167,   245,   164,   245,   169,    -1,
+     210,   197,   245,   197,    -1,    17,   197,   245,   197,    -1,
+     255,   164,   210,   197,   245,   197,    -1,   255,   164,    17,
+     197,   245,   197,    -1,    -1,    -1,   256,   164,   246,    -1,
+     164,     4,    -1,   257,   164,     4,    -1,    58,    57,    -1,
+      57,    -1,   176,   210,   245,   164,   245,    -1,   177,   210,
+     245,   164,   245,    -1,    90,   179,   210,   245,   164,   245,
+      -1,    91,   180,   210,   245,   164,   245,    -1,    92,   179,
+     210,   245,   164,   245,    -1,    93,   180,   210,   245,   164,
+     245,    -1,   178,   246,    38,   210,    -1,   133,   246,   164,
+     246,   164,   246,    -1,   134,   246,   164,   210,    -1,   135,
+     246,   164,   246,    -1,   136,   246,   164,   246,   164,   246,
+      -1,   137,   246,   164,   246,   164,   246,    -1,   132,   254,
+      -1,   258,   195,   199,   212,   245,   161,   255,   162,   201,
+      -1,   261,    -1,    36,    -1,    -1,   114,   210,   204,    -1,
+     114,   210,   164,    11,   245,   204,    -1,   115,   210,   204,
+      -1,   115,   210,   164,    11,   245,   204,    -1,   116,   246,
+      -1,   260,   117,   210,   245,   204,    -1,   260,   118,   246,
+     164,   210,   245,   204,    -1,   138,   210,   245,   164,     4,
+      -1,   119,   210,   245,   256,    -1,   139,   210,   245,   257,
+      -1,   140,   210,   245,   164,   210,   245,   257,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -1912,31 +1909,31 @@
     1230,  1231,  1232,  1236,  1237,  1238,  1242,  1243,  1244,  1245,
     1246,  1250,  1251,  1252,  1255,  1256,  1257,  1258,  1259,  1260,
     1261,  1268,  1269,  1270,  1271,  1272,  1273,  1274,  1275,  1276,
-    1277,  1278,  1282,  1283,  1288,  1289,  1290,  1291,  1294,  1295,
+    1277,  1281,  1282,  1287,  1288,  1289,  1290,  1293,  1294,  1300,
     1301,  1302,  1303,  1304,  1305,  1306,  1307,  1308,  1309,  1310,
-    1311,  1312,  1315,  1316,  1322,  1323,  1330,  1331,  1339,  1340,
-    1351,  1359,  1360,  1365,  1366,  1367,  1372,  1387,  1387,  1387,
-    1387,  1387,  1387,  1387,  1390,  1394,  1398,  1405,  1410,  1418,
-    1453,  1484,  1489,  1499,  1509,  1513,  1523,  1530,  1539,  1546,
-    1551,  1556,  1563,  1564,  1571,  1578,  1586,  1592,  1604,  1632,
-    1648,  1675,  1703,  1729,  1749,  1775,  1795,  1807,  1814,  1880,
-    1890,  1900,  1911,  1924,  1935,  1949,  1956,  1963,  1981,  1993,
-    2014,  2022,  2028,  2039,  2044,  2049,  2054,  2059,  2065,  2071,
-    2077,  2085,  2096,  2100,  2108,  2108,  2111,  2111,  2114,  2126,
-    2147,  2152,  2160,  2161,  2165,  2165,  2169,  2169,  2172,  2175,
-    2199,  2211,  2210,  2222,  2221,  2231,  2230,  2241,  2281,  2284,
-    2290,  2300,  2304,  2309,  2311,  2316,  2321,  2330,  2340,  2351,
-    2355,  2364,  2373,  2378,  2527,  2527,  2529,  2538,  2538,  2540,
-    2545,  2557,  2561,  2566,  2570,  2574,  2579,  2584,  2588,  2592,
-    2596,  2600,  2604,  2608,  2630,  2652,  2658,  2671,  2683,  2688,
-    2700,  2706,  2710,  2720,  2724,  2728,  2733,  2740,  2740,  2746,
-    2755,  2760,  2765,  2769,  2778,  2787,  2800,  2809,  2813,  2821,
-    2841,  2845,  2850,  2861,  2880,  2889,  2993,  2997,  3004,  3015,
-    3028,  3037,  3050,  3061,  3071,  3082,  3090,  3100,  3107,  3110,
-    3111,  3119,  3125,  3134,  3138,  3143,  3159,  3176,  3188,  3200,
-    3214,  3228,  3240,  3261,  3268,  3274,  3280,  3286,  3301,  3411,
-    3416,  3420,  3427,  3434,  3444,  3451,  3461,  3469,  3483,  3500,
-    3514,  3529,  3544
+    1311,  1314,  1315,  1321,  1322,  1329,  1330,  1336,  1337,  1346,
+    1354,  1355,  1360,  1361,  1362,  1367,  1380,  1380,  1380,  1380,
+    1380,  1380,  1380,  1383,  1387,  1391,  1398,  1403,  1411,  1446,
+    1477,  1482,  1492,  1502,  1506,  1516,  1523,  1532,  1539,  1544,
+    1549,  1556,  1557,  1564,  1571,  1579,  1585,  1597,  1625,  1641,
+    1668,  1696,  1722,  1742,  1768,  1788,  1800,  1807,  1873,  1883,
+    1893,  1904,  1917,  1928,  1942,  1949,  1956,  1974,  1986,  2007,
+    2015,  2021,  2032,  2037,  2042,  2047,  2052,  2058,  2064,  2070,
+    2078,  2089,  2093,  2101,  2101,  2104,  2104,  2107,  2119,  2140,
+    2145,  2153,  2154,  2158,  2158,  2162,  2162,  2165,  2168,  2192,
+    2204,  2203,  2215,  2214,  2224,  2223,  2234,  2274,  2277,  2283,
+    2293,  2297,  2302,  2304,  2309,  2314,  2323,  2333,  2344,  2348,
+    2357,  2366,  2371,  2520,  2520,  2522,  2531,  2531,  2533,  2538,
+    2550,  2554,  2559,  2563,  2567,  2572,  2577,  2581,  2585,  2589,
+    2593,  2597,  2601,  2623,  2645,  2651,  2664,  2676,  2681,  2693,
+    2699,  2703,  2713,  2717,  2721,  2726,  2733,  2733,  2739,  2748,
+    2753,  2758,  2762,  2771,  2780,  2793,  2802,  2806,  2814,  2834,
+    2838,  2843,  2854,  2873,  2882,  2986,  2990,  2997,  3008,  3021,
+    3030,  3043,  3054,  3064,  3075,  3083,  3093,  3100,  3103,  3104,
+    3112,  3118,  3127,  3131,  3136,  3152,  3169,  3181,  3193,  3207,
+    3221,  3233,  3254,  3261,  3267,  3273,  3279,  3294,  3404,  3409,
+    3413,  3420,  3427,  3437,  3444,  3454,  3462,  3476,  3493,  3507,
+    3522,  3537
 };
 #endif
 
@@ -1967,11 +1964,11 @@
   "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", "PTRTOINT", "PHI_TOK",
   "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR",
   "GETRESULT", "EXTRACTVALUE", "INSERTVALUE", "SIGNEXT", "ZEROEXT",
-  "NORETURN", "INREG", "SRET", "NOUNWIND", "NOALIAS", "NOCAPTURE", "BYVAL",
+  "NORETURN", "INREG", "SRET", "NOUNWIND", "NOALIAS", "BYVAL", "NEST",
   "READNONE", "READONLY", "GC", "OPTSIZE", "NOINLINE", "ALWAYSINLINE",
-  "SSP", "SSPREQ", "NEST", "DEFAULT", "HIDDEN", "PROTECTED", "'('", "')'",
-  "'='", "','", "'*'", "'\\\\'", "'['", "'x'", "']'", "'<'", "'>'", "'{'",
-  "'}'", "'c'", "$accept", "ArithmeticOps", "LogicalOps", "CastOps",
+  "SSP", "SSPREQ", "DEFAULT", "HIDDEN", "PROTECTED", "'('", "')'", "'='",
+  "','", "'*'", "'\\\\'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'",
+  "'c'", "$accept", "ArithmeticOps", "LogicalOps", "CastOps",
   "IPredicates", "FPredicates", "LocalName", "OptLocalName",
   "OptAddrSpace", "OptLocalAssign", "LocalNumber", "GlobalName",
   "OptGlobalAssign", "GlobalAssign", "GVInternalLinkage",
@@ -2015,50 +2012,50 @@
      385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
      395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
      405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
-     415,   416,    40,    41,    61,    44,    42,    92,    91,   120,
-      93,    60,    62,   123,   125,    99
+     415,    40,    41,    61,    44,    42,    92,    91,   120,    93,
+      60,    62,   123,   125,    99
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   176,   177,   177,   177,   177,   177,   177,   177,   177,
-     177,   178,   178,   178,   178,   178,   178,   179,   179,   179,
+       0,   175,   176,   176,   176,   176,   176,   176,   176,   176,
+     176,   177,   177,   177,   177,   177,   177,   178,   178,   178,
+     178,   178,   178,   178,   178,   178,   178,   178,   178,   179,
      179,   179,   179,   179,   179,   179,   179,   179,   179,   180,
-     180,   180,   180,   180,   180,   180,   180,   180,   180,   181,
-     181,   181,   181,   181,   181,   181,   181,   181,   181,   181,
-     181,   181,   181,   181,   181,   182,   182,   182,   183,   183,
-     184,   184,   185,   185,   186,   187,   187,   188,   188,   189,
-     190,   190,   190,   190,   190,   190,   191,   191,   191,   192,
-     192,   192,   192,   193,   193,   193,   194,   194,   194,   194,
-     194,   195,   195,   195,   196,   196,   196,   196,   196,   196,
-     196,   197,   197,   197,   197,   197,   197,   197,   197,   197,
-     197,   197,   198,   198,   199,   199,   199,   199,   200,   200,
-     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
-     201,   201,   202,   202,   203,   203,   204,   204,   205,   205,
-     206,   207,   207,   208,   208,   209,   209,   210,   210,   210,
-     210,   210,   210,   210,   211,   211,   211,   211,   211,   211,
-     211,   211,   211,   211,   211,   211,   211,   212,   213,   213,
-     214,   214,   215,   215,   215,   215,   216,   216,   217,   217,
+     180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
+     180,   180,   180,   180,   180,   181,   181,   181,   182,   182,
+     183,   183,   184,   184,   185,   186,   186,   187,   187,   188,
+     189,   189,   189,   189,   189,   189,   190,   190,   190,   191,
+     191,   191,   191,   192,   192,   192,   193,   193,   193,   193,
+     193,   194,   194,   194,   195,   195,   195,   195,   195,   195,
+     195,   196,   196,   196,   196,   196,   196,   196,   196,   196,
+     196,   197,   197,   198,   198,   198,   198,   199,   199,   200,
+     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
+     200,   201,   201,   202,   202,   203,   203,   204,   204,   205,
+     206,   206,   207,   207,   208,   208,   209,   209,   209,   209,
+     209,   209,   209,   210,   210,   210,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   211,   212,   212,   213,
+     213,   214,   214,   214,   214,   215,   215,   216,   216,   216,
+     216,   216,   216,   216,   216,   216,   216,   216,   216,   216,
+     216,   216,   216,   216,   216,   216,   216,   217,   217,   217,
      217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
-     217,   217,   217,   217,   217,   217,   217,   217,   218,   218,
-     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
-     218,   218,   219,   219,   220,   220,   221,   221,   222,   222,
-     223,   223,   224,   224,   226,   225,   227,   225,   225,   225,
-     225,   228,   225,   229,   225,   230,   225,   225,   225,   225,
-     231,   232,   232,   233,   234,   234,   234,   235,   235,   236,
-     236,   236,   236,   237,   238,   238,   239,   240,   240,   241,
-     242,   243,   243,   244,   244,   244,   244,   244,   244,   244,
-     244,   244,   244,   244,   244,   244,   244,   244,   244,   244,
-     244,   244,   244,   245,   245,   245,   245,   246,   246,   247,
-     248,   248,   249,   249,   250,   250,   251,   251,   251,   252,
-     252,   252,   252,   252,   252,   252,   252,   252,   253,   253,
-     254,   254,   255,   255,   256,   256,   256,   256,   256,   257,
-     257,   258,   258,   259,   259,   260,   260,   260,   260,   260,
-     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
-     261,   261,   262,   262,   262,   262,   262,   262,   262,   262,
-     262,   262,   262
+     217,   218,   218,   219,   219,   220,   220,   221,   221,   222,
+     222,   223,   223,   225,   224,   226,   224,   224,   224,   224,
+     227,   224,   228,   224,   229,   224,   224,   224,   224,   230,
+     231,   231,   232,   233,   233,   233,   234,   234,   235,   235,
+     235,   235,   236,   237,   237,   238,   239,   239,   240,   241,
+     242,   242,   243,   243,   243,   243,   243,   243,   243,   243,
+     243,   243,   243,   243,   243,   243,   243,   243,   243,   243,
+     243,   243,   244,   244,   244,   244,   245,   245,   246,   247,
+     247,   248,   248,   249,   249,   250,   250,   250,   251,   251,
+     251,   251,   251,   251,   251,   251,   251,   252,   252,   253,
+     253,   254,   254,   255,   255,   255,   255,   255,   256,   256,
+     257,   257,   258,   258,   259,   259,   259,   259,   259,   259,
+     259,   259,   259,   259,   259,   259,   259,   259,   259,   260,
+     260,   261,   261,   261,   261,   261,   261,   261,   261,   261,
+     261,   261
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -2075,31 +2072,31 @@
        1,     1,     1,     0,     1,     1,     0,     1,     1,     1,
        1,     0,     1,     1,     0,     1,     1,     1,     1,     1,
        2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     2,     0,     2,     1,     1,     1,     1,     0,     2,
+       2,     0,     2,     1,     1,     1,     1,     0,     2,     1,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     0,     2,     0,     2,     0,     2,     0,     3,
-       2,     0,     1,     0,     3,     1,     2,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     3,     1,     2,     5,
-       5,     5,     5,     3,     2,     5,     4,     2,     1,     1,
-       1,     3,     1,     3,     1,     0,     1,     3,     4,     3,
-       3,     4,     4,     3,     6,     5,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     6,     5,
-       8,     6,     6,     7,     7,     7,     7,     6,     8,     8,
-       5,     7,     3,     1,     1,     1,     1,     0,     2,     6,
-       1,     0,     1,     2,     0,     3,     0,     3,     3,     3,
-       3,     0,     8,     0,     9,     0,     9,     5,     2,     3,
-       1,     3,     3,     3,     3,     1,     0,     5,     3,     1,
-       3,     1,     0,    11,     1,     1,     4,     1,     1,     2,
-       3,     0,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     3,     3,     2,     2,     3,     2,     5,
-       4,     1,     5,     1,     1,     1,     1,     1,     1,     2,
-       1,     3,     2,     2,     3,     3,     2,     0,     1,     2,
-       2,     3,     9,     9,     8,    15,     1,     1,     6,     5,
-       2,     2,     6,     7,     4,     4,     6,     6,     0,     0,
-       3,     2,     3,     2,     1,     5,     5,     6,     6,     6,
-       6,     4,     6,     4,     4,     6,     6,     2,     9,     1,
-       1,     0,     3,     6,     3,     6,     2,     5,     7,     5,
-       4,     4,     7
+       1,     0,     2,     0,     2,     0,     2,     0,     3,     2,
+       0,     1,     0,     3,     1,     2,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     3,     1,     2,     5,     5,
+       5,     5,     3,     2,     5,     4,     2,     1,     1,     1,
+       3,     1,     3,     1,     0,     1,     3,     4,     3,     3,
+       4,     4,     3,     6,     5,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     6,     5,     8,
+       6,     6,     7,     7,     7,     7,     6,     8,     8,     5,
+       7,     3,     1,     1,     1,     1,     0,     2,     6,     1,
+       0,     1,     2,     0,     3,     0,     3,     3,     3,     3,
+       0,     8,     0,     9,     0,     9,     5,     2,     3,     1,
+       3,     3,     3,     3,     1,     0,     5,     3,     1,     3,
+       1,     0,    11,     1,     1,     4,     1,     1,     2,     3,
+       0,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     3,     3,     2,     2,     3,     2,     5,     4,
+       1,     5,     1,     1,     1,     1,     1,     1,     2,     1,
+       3,     2,     2,     3,     3,     2,     0,     1,     2,     2,
+       3,     9,     9,     8,    15,     1,     1,     6,     5,     2,
+       2,     6,     7,     4,     4,     6,     6,     0,     0,     3,
+       2,     3,     2,     1,     5,     5,     6,     6,     6,     6,
+       4,     6,     4,     4,     6,     6,     2,     9,     1,     1,
+       0,     3,     6,     3,     6,     2,     5,     7,     5,     4,
+       4,     7
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -2107,314 +2104,310 @@
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-      68,    55,    65,    56,    66,    57,   226,   224,     0,     0,
-       0,     0,     0,     0,    79,    67,     0,    68,   222,    83,
-      86,     0,     0,   238,     0,     0,    62,     0,    69,    70,
+      68,    55,    65,    56,    66,    57,   225,   223,     0,     0,
+       0,     0,     0,     0,    79,    67,     0,    68,   221,    83,
+      86,     0,     0,   237,     0,     0,    62,     0,    69,    70,
       72,    71,    73,    76,    74,    77,    75,    78,    80,    81,
-      82,    79,    79,   217,     1,   223,    84,    85,    79,   227,
-      87,    88,    89,    90,    79,   297,   225,   297,     0,     0,
-     246,   239,   240,   228,   283,   284,   230,   147,   148,   149,
-     152,   151,   150,   153,   154,     0,     0,     0,     0,   285,
-     286,   155,   229,   157,   217,   217,    91,   216,     0,    94,
-      94,   298,   293,    63,   257,   258,   259,   292,   241,   242,
-     245,     0,   175,   158,     0,     0,     0,     0,   164,   176,
-       0,     0,   175,     0,     0,     0,    93,    92,     0,   214,
-     215,     0,     0,    95,    96,    97,    98,    99,   118,   260,
-       0,     0,   341,   341,   296,     0,   243,   174,   112,   170,
-     172,     0,     0,     0,     0,     0,     0,   163,     0,     0,
-     156,     0,     0,   169,     0,   168,     0,   237,    61,    61,
-     100,     0,   254,   255,   256,    64,   340,   324,     0,     0,
-       0,     0,    94,   306,   307,     2,     3,     4,     5,     6,
+      82,    79,    79,   216,     1,   222,    84,    85,    79,   226,
+      87,    88,    89,    90,    79,   296,   224,   296,     0,     0,
+     245,   238,   239,   227,   282,   283,   229,   146,   147,   148,
+     151,   150,   149,   152,   153,     0,     0,     0,     0,   284,
+     285,   154,   228,   156,   216,   216,    91,   215,     0,    94,
+      94,   297,   292,    63,   256,   257,   258,   291,   240,   241,
+     244,     0,   174,   157,     0,     0,     0,     0,   163,   175,
+       0,     0,   174,     0,     0,     0,    93,    92,     0,   213,
+     214,     0,     0,    95,    96,    97,    98,    99,   117,   259,
+       0,     0,   340,   340,   295,     0,   242,   173,   111,   169,
+     171,     0,     0,     0,     0,     0,     0,   162,     0,     0,
+     155,     0,     0,   168,     0,   167,     0,   236,    61,    61,
+     100,     0,   253,   254,   255,    64,   339,   323,     0,     0,
+       0,     0,    94,   305,   306,     2,     3,     4,     5,     6,
        7,     8,     9,    10,    14,    15,    16,    11,    12,    13,
        0,     0,     0,     0,     0,     0,     0,     0,    17,    18,
       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   294,    94,   310,     0,   339,   295,   311,   244,
-     167,     0,   132,    61,    61,   166,     0,   177,     0,   132,
-      61,    61,     0,   218,   191,   193,   192,   194,   197,   190,
-     195,   196,   186,   187,     0,     0,     0,     0,     0,     0,
+       0,     0,   293,    94,   309,     0,   338,   294,   310,   243,
+     166,     0,   131,    61,    61,   165,     0,   176,     0,   131,
+      61,    61,     0,   217,   190,   192,   191,   193,   196,   189,
+     194,   195,   185,   186,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   189,   188,   231,   116,   115,   114,   117,   119,
-       0,   323,   300,    61,   290,   299,     0,     0,     0,   118,
+       0,     0,   188,   187,   230,   115,   114,   113,   116,   118,
+       0,   322,   299,    61,   289,   298,     0,     0,     0,   117,
       29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
        0,    53,    54,    49,    50,    51,    52,    39,    40,    41,
       42,    43,    44,    45,    46,    47,    48,     0,     0,     0,
-     138,   138,   346,    61,    61,   337,     0,     0,     0,     0,
-       0,    61,    61,    61,    61,    61,     0,   118,     0,     0,
+     137,   137,   345,    61,    61,   336,     0,     0,     0,     0,
+       0,    61,    61,    61,    61,    61,     0,   117,     0,     0,
        0,   102,   104,   103,   101,   105,   106,   107,   108,   109,
-     110,   113,   173,   171,   160,   161,   162,   165,    60,   159,
-     233,   235,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   179,   213,     0,     0,     0,   183,
-       0,   180,     0,     0,     0,   143,     0,   263,   264,   265,
-     266,   267,   272,   268,   269,   270,   271,   261,     0,     0,
-       0,     0,   281,   288,   287,   289,     0,     0,   301,     0,
-       0,    61,    61,    61,    61,     0,   342,     0,   344,   319,
+     112,   172,   170,   159,   160,   161,   164,    60,   158,   232,
+     234,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   178,   212,     0,     0,     0,   182,     0,
+     179,     0,     0,     0,   142,     0,   262,   263,   264,   265,
+     266,   271,   267,   268,   269,   270,   260,     0,     0,     0,
+       0,   280,   287,   286,   288,     0,     0,   300,     0,     0,
+      61,    61,    61,    61,     0,   341,     0,   343,   318,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    61,     0,   111,   124,   123,   120,
-     122,   121,   125,   126,   129,   127,   128,   130,   131,   133,
-     143,   143,     0,     0,     0,     0,     0,   319,     0,     0,
-       0,     0,     0,     0,     0,   178,   164,   176,     0,   181,
-     182,     0,     0,     0,     0,   232,   252,   262,     0,   275,
-       0,     0,     0,   278,     0,   276,   291,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   350,     0,     0,
-       0,   333,   334,     0,     0,     0,     0,   351,     0,     0,
-       0,   331,     0,   138,     0,   234,   236,    61,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   212,
-     185,     0,     0,     0,     0,     0,     0,   145,   143,   251,
-     112,   249,     0,     0,   274,   164,     0,   273,   277,     0,
-       0,     0,     0,     0,     0,     0,   138,   139,   138,     0,
-       0,     0,     0,     0,     0,   349,   321,     0,    61,   325,
-     326,     0,     0,   347,    61,   219,     0,     0,     0,     0,
-     199,     0,     0,     0,     0,   210,     0,   184,     0,     0,
-      61,   140,   146,   144,    59,     0,   132,     0,   280,     0,
-       0,     0,   318,   327,   328,   329,   330,   343,   345,   320,
-       0,     0,   332,   335,   336,   322,     0,   318,   138,     0,
-       0,     0,     0,     0,   207,     0,     0,     0,   201,   202,
-     198,    58,   248,   250,   112,   141,   282,   279,     0,     0,
-     112,   112,     0,   312,     0,   352,     0,   348,   203,   204,
-     205,   206,     0,     0,     0,   211,    59,   142,   136,     0,
-       0,   304,     0,     0,     0,   132,     0,   313,   132,   200,
-     208,   209,   247,     0,   134,   302,     0,     0,   303,   102,
-     104,   112,   112,     0,   112,   112,   338,   137,     0,   253,
-       0,     0,   315,   314,     0,     0,     0,   135,     0,     0,
-       0,   112,   112,   309,     0,     0,   317,   316,   308,     0,
-       0,   305
+       0,     0,     0,    61,     0,   110,   123,   122,   119,   121,
+     120,   124,   125,   128,   126,   127,   129,   130,   132,   142,
+     142,     0,     0,     0,     0,     0,   318,     0,     0,     0,
+       0,     0,     0,     0,   177,   163,   175,     0,   180,   181,
+       0,     0,     0,     0,   231,   251,   261,     0,   274,     0,
+       0,     0,   277,     0,   275,   290,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   349,     0,     0,     0,
+     332,   333,     0,     0,     0,     0,   350,     0,     0,     0,
+     330,     0,   137,     0,   233,   235,    61,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   211,   184,
+       0,     0,     0,     0,     0,     0,   144,   142,   250,   111,
+     248,     0,     0,   273,   163,     0,   272,   276,     0,     0,
+       0,     0,     0,     0,     0,   137,   138,   137,     0,     0,
+       0,     0,     0,     0,   348,   320,     0,    61,   324,   325,
+       0,     0,   346,    61,   218,     0,     0,     0,     0,   198,
+       0,     0,     0,     0,   209,     0,   183,     0,     0,    61,
+     139,   145,   143,    59,     0,   131,     0,   279,     0,     0,
+       0,   317,   326,   327,   328,   329,   342,   344,   319,     0,
+       0,   331,   334,   335,   321,     0,   317,   137,     0,     0,
+       0,     0,     0,   206,     0,     0,     0,   200,   201,   197,
+      58,   247,   249,   111,   140,   281,   278,     0,     0,   111,
+     111,     0,   311,     0,   351,     0,   347,   202,   203,   204,
+     205,     0,     0,     0,   210,    59,   141,   135,     0,     0,
+     303,     0,     0,     0,   131,     0,   312,   131,   199,   207,
+     208,   246,     0,   133,   301,     0,     0,   302,   102,   104,
+     111,   111,     0,   111,   111,   337,   136,     0,   252,     0,
+       0,   314,   313,     0,     0,     0,   134,     0,     0,     0,
+     111,   111,   308,     0,     0,   316,   315,   307,     0,     0,
+     304
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,   269,   270,   271,   300,   317,    79,   632,   113,    12,
+      -1,   269,   270,   271,   300,   317,    79,   631,   113,    12,
      133,    80,    14,    15,    41,    42,    43,    48,    54,   118,
-     128,   351,   230,   279,   161,   449,   354,   689,   674,   416,
-     537,   658,   475,   538,    81,   158,   139,   156,   140,   141,
-     110,   375,   402,   376,   121,    88,   157,    16,    17,    18,
-      20,    19,   385,   450,   451,    63,    23,    61,   101,   541,
-     542,   129,   164,    55,    96,    56,    49,   478,   403,    83,
-     405,   284,   285,    57,    92,    93,   222,   662,   134,   325,
-     642,   497,   507,   223,   224,   225,   226
+     128,   350,   230,   279,   161,   448,   353,   688,   673,   415,
+     536,   657,   474,   537,    81,   158,   139,   156,   140,   141,
+     110,   374,   401,   375,   121,    88,   157,    16,    17,    18,
+      20,    19,   384,   449,   450,    63,    23,    61,   101,   540,
+     541,   129,   164,    55,    96,    56,    49,   477,   402,    83,
+     404,   284,   285,    57,    92,    93,   222,   661,   134,   325,
+     641,   496,   506,   223,   224,   225,   226
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -611
+#define YYPACT_NINF -619
 static const yytype_int16 yypact[] =
 {
-     828,  -611,  -611,  -611,  -611,  -611,  -611,  -611,    -5,   -90,
-      68,   -25,   113,   -20,    -9,  -611,   153,  1107,  -611,   173,
-      15,    36,    48,  -611,    -3,   196,  -611,  1950,  -611,  -611,
-    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
-    -611,   137,   137,   190,  -611,  -611,  -611,  -611,   137,  -611,
-    -611,  -611,  -611,  -611,   137,   203,  -611,     3,   212,   215,
-     229,  -611,  -611,  -611,  -611,  -611,    83,  -611,  -611,  -611,
-    -611,  -611,  -611,  -611,  -611,   252,   268,     7,    87,  -611,
-    -611,  -611,    73,  -611,   238,   238,   186,  -611,    22,   200,
-     200,  -611,  -611,    42,  -611,  -611,  -611,  -611,  -611,  -611,
-    -611,     8,  1765,  -611,   110,   121,   573,    83,  -611,    73,
-    -114,   138,  1765,   142,    22,    22,  -611,  -611,  1368,  -611,
-    -611,  1991,   298,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
-     -16,   168,  2181,  2181,  -611,   311,  -611,  -611,    73,  -611,
-     169,   174,  1991,  1991,   164,   -95,  1991,  -611,   334,   178,
-    -611,  1991,  1991,    83,   182,    73,   287,  -611,  1319,   293,
-    -611,  1680,  -611,  -611,  -611,  -611,  -611,  -611,   295,  2032,
-     119,   339,   200,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
-    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
-     465,   412,   465,   412,  1991,  1991,  1991,  1991,  -611,  -611,
-    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
-    1991,  1991,  1991,  1991,  1991,  1991,  1991,  1991,  1991,  1991,
-    1991,  1991,  -611,   200,  -611,   -33,  -611,  -611,  -611,  -611,
-     271,  1818,  -611,    -8,   -39,  -611,   181,    73,   191,  -611,
-     293,    -2,  1368,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
-    -611,  -611,  -611,  -611,   465,   412,   465,   412,   193,   195,
-     199,   201,   202,   205,   206,  1721,  2061,   659,   336,   210,
-     211,   213,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
-     187,  -611,    83,   973,  -611,   197,  1492,  1492,  1492,  -611,
-    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
-    1991,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
-    -611,  -611,  -611,  -611,  -611,  -611,  -611,  1991,  1991,  1991,
-       1,    17,  -611,   973,   -30,   214,   216,   218,   220,   221,
-     224,   973,   973,   973,   973,   973,   322,  -611,  1991,  1991,
-     361,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
-    -611,  -611,  -611,  -611,   657,  -611,  -611,  -611,  -611,   657,
-    -611,   142,   338,   226,   228,   232,   233,  1991,  1991,  1991,
-    1991,  1991,  1991,  1991,  -611,  -611,    41,   743,    32,  -611,
-     -83,  -611,  1991,  1991,  1991,   236,   240,  -611,  -611,  -611,
-    -611,  -611,  -611,  -611,  -611,  -611,  -611,   313,  1859,  2117,
-    1023,   355,  -611,  -611,  -611,  -611,  1991,   243,  -611,   245,
-    1680,   973,   973,   973,   973,    33,  -611,    35,  -611,  -611,
-    1492,   235,  1991,  1991,  1991,  1991,  1991,   256,   257,   258,
-     265,   267,  1991,  1680,   973,   269,  -611,  -611,  -611,  -611,
-    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
-     236,   236,  1991,  1991,  1991,  1991,  1991,  -611,   270,   272,
-     275,   276,   257,   284,  1991,  -611,   219,  1146,   -69,  -611,
-    -611,   286,   288,   340,    11,  -611,  1891,  -611,   383,  -611,
-      44,  1195,    43,  -611,   -53,  -611,  -611,   400,   416,  1492,
-     289,   291,   296,   297,  1492,   432,  1492,   301,   306,  1492,
-     307,    73,  -611,   308,   309,   448,   456,   312,  1991,  1492,
-    1492,    73,  1492,   314,  1991,  -611,  -611,   -14,   315,   316,
-     319,   320,    78,  1991,  1991,  1991,  1991,    94,  1991,  -611,
-    -611,   304,  1991,  1991,  1991,   441,   474,  -611,   236,  -611,
-      73,   321,   324,   329,  -611,   325,   -52,  -611,  -611,  1492,
-    1492,   345,  1492,  1492,  1492,  1492,   314,  -611,   314,  1991,
-    1492,   331,  1991,  1991,  1991,  -611,  -611,   494,   973,  -611,
-    -611,   365,   447,  -611,   973,  -611,  1991,  1991,  1991,  1991,
-    -611,   367,   371,   370,   375,  -611,   257,  -611,   378,   379,
-     126,  -611,  -611,  -611,   198,  1932,  -611,   521,  -611,   372,
-     380,   381,  2158,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
-     377,  1492,  -611,  -611,  -611,  -611,   257,  2158,   314,   385,
-     387,   388,   389,  1991,  -611,  1991,  1991,   122,  -611,  -611,
-    -611,  -611,  -611,  -611,    73,   127,  -611,  -611,   536,     2,
-      74,    73,   136,  -611,   401,   312,   140,  -611,  -611,  -611,
-    -611,  -611,   407,   409,   410,  -611,   198,  -611,   523,  1492,
-    1630,  -611,     4,   816,   816,  -611,  2199,  -611,  -611,  -611,
-    -611,  -611,  -611,   571,   430,  -611,   437,  1630,  -611,   442,
-     443,  -611,  -611,   349,    74,    73,   657,  -611,   584,  -611,
-     592,   449,   271,   271,   595,   816,   816,  -611,  1492,   599,
-    1492,  -611,  -611,  -611,  1492,   544,   271,   271,  -611,   601,
-    1492,  -611
+     790,  -619,  -619,  -619,  -619,  -619,  -619,  -619,    10,   -86,
+      53,   -45,   136,    38,    62,  -619,    49,  1492,  -619,   117,
+     167,    39,    43,  -619,    45,   151,  -619,  1999,  -619,  -619,
+    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
+    -619,   -27,   -27,   146,  -619,  -619,  -619,  -619,   -27,  -619,
+    -619,  -619,  -619,  -619,   -27,   197,  -619,     9,   216,   224,
+     228,  -619,  -619,  -619,  -619,  -619,   105,  -619,  -619,  -619,
+    -619,  -619,  -619,  -619,  -619,   266,   269,     2,   481,  -619,
+    -619,  -619,   -37,  -619,   244,   244,   156,  -619,    69,   213,
+     213,  -619,  -619,    40,  -619,  -619,  -619,  -619,  -619,  -619,
+    -619,   -70,  1724,  -619,   118,   119,   550,   105,  -619,   -37,
+    -118,   124,  1724,   125,    69,    69,  -619,  -619,  1768,  -619,
+    -619,  2024,   285,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
+     -16,   131,  2294,  2294,  -619,   273,  -619,  -619,   -37,  -619,
+     132,   135,  2024,  2024,   127,   -83,  2024,  -619,   295,   138,
+    -619,  2024,  2024,   105,   145,   -37,    46,  -619,  1278,   252,
+    -619,  1679,  -619,  -619,  -619,  -619,  -619,  -619,   251,  2065,
+      78,   298,   213,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
+    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
+     630,   660,   630,   660,  2024,  2024,  2024,  2024,  -619,  -619,
+    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
+    2024,  2024,  2024,  2024,  2024,  2024,  2024,  2024,  2024,  2024,
+    2024,  2024,  -619,   213,  -619,    59,  -619,  -619,  -619,  -619,
+     335,  1817,  -619,   -39,   -42,  -619,   147,   -37,   158,  -619,
+     252,   -10,  1768,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
+    -619,  -619,  -619,  -619,   630,   660,   630,   660,   160,   161,
+     170,   171,   172,   174,   175,  1858,  2124,   984,   312,   176,
+     181,   182,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
+      64,  -619,   105,   934,  -619,   180,  1450,  1450,  1450,  -619,
+    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
+    2024,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
+    -619,  -619,  -619,  -619,  -619,  -619,  -619,  2024,  2024,  2024,
+     -24,   -19,  -619,   934,   -40,   183,   184,   187,   188,   189,
+     190,   934,   934,   934,   934,   934,   307,  -619,  2024,  2024,
+     342,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
+    -619,  -619,  -619,   557,  -619,  -619,  -619,  -619,   557,  -619,
+     125,   317,   195,   196,   200,   201,  2024,  2024,  2024,  2024,
+    2024,  2024,  2024,  -619,  -619,    -9,  1155,  -120,  -619,   -76,
+    -619,  2024,  2024,  2024,   203,   202,  -619,  -619,  -619,  -619,
+    -619,  -619,  -619,  -619,  -619,  -619,   299,  1899,  2165,  1327,
+     343,  -619,  -619,  -619,  -619,  2024,   204,  -619,   208,  1679,
+     934,   934,   934,   934,    17,  -619,    28,  -619,  -619,  1450,
+     206,  2024,  2024,  2024,  2024,  2024,   210,   211,   212,   214,
+     217,  2024,  1679,   934,   218,  -619,  -619,  -619,  -619,  -619,
+    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,   203,
+     203,  2024,  2024,  2024,  2024,  2024,  -619,   220,   222,   227,
+     229,   211,   230,  2024,  -619,   193,  1106,   -73,  -619,  -619,
+     238,   240,   339,     6,  -619,  1940,  -619,   366,  -619,    -3,
+    1638,   -97,  -619,   -11,  -619,  -619,   375,   390,  1450,   248,
+     250,   255,   256,  1450,   411,  1450,   257,   258,  1450,   259,
+     -37,  -619,   260,   262,   412,   423,   265,  2024,  1450,  1450,
+     -37,  1450,   268,  2024,  -619,  -619,   -23,   270,   271,   272,
+     274,    55,  2024,  2024,  2024,  2024,    66,  2024,  -619,  -619,
+     276,  2024,  2024,  2024,   408,   429,  -619,   203,  -619,   -37,
+     275,   280,   284,  -619,   279,    35,  -619,  -619,  1450,  1450,
+     291,  1450,  1450,  1450,  1450,   268,  -619,   268,  2024,  1450,
+     289,  2024,  2024,  2024,  -619,  -619,   433,   934,  -619,  -619,
+     294,   404,  -619,   934,  -619,  2024,  2024,  2024,  2024,  -619,
+     296,   304,   303,   305,  -619,   211,  -619,   306,   308,   -12,
+    -619,  -619,  -619,   522,  1958,  -619,   449,  -619,   314,   311,
+     319,  2190,  -619,  -619,  -619,  -619,  -619,  -619,  -619,   309,
+    1450,  -619,  -619,  -619,  -619,   211,  2190,   268,   328,   337,
+     344,   351,  2024,  -619,  2024,  2024,    72,  -619,  -619,  -619,
+    -619,  -619,  -619,   -37,   173,  -619,  -619,   497,    -2,   -13,
+     -37,    73,  -619,   346,   265,    87,  -619,  -619,  -619,  -619,
+    -619,   354,   360,   361,  -619,   522,  -619,   470,  1450,  1588,
+    -619,     3,   778,   778,  -619,  2231,  -619,  -619,  -619,  -619,
+    -619,  -619,   521,   374,  -619,   363,  1588,  -619,   367,   368,
+    -619,  -619,   474,   -13,   -37,   557,  -619,   508,  -619,   516,
+     370,   335,   335,   523,   778,   778,  -619,  1450,   525,  1450,
+    -619,  -619,  -619,  1450,   465,   335,   335,  -619,   526,  1450,
+    -619
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -611,   183,   185,   189,  -166,  -110,     0,   -36,  -116,   528,
-    -611,     6,  -611,  -611,  -611,  -611,    27,  -611,  -611,  -611,
-    -145,  -611,  -526,  -611,  -260,  -611,  -237,  -611,  -611,  -314,
-     -13,  -611,  -420,  -611,  -611,   -26,   393,  -157,  -611,   514,
-     522,    75,  -153,  -258,   209,   246,   390,  -611,  -611,   610,
-    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
-    -611,   539,  -611,  -611,  -611,  -611,  -611,  -611,  -610,   -85,
-     223,  -193,  -611,  -611,   574,  -611,   497,  -611,  -611,  -611,
-      16,   184,  -452,  -611,   505,  -611,  -611
+    -619,   110,   128,   130,  -158,  -132,     0,  -116,  -126,   452,
+    -619,     8,  -619,  -619,  -619,  -619,    31,  -619,  -619,  -619,
+    -148,  -619,  -436,  -619,  -254,  -619,  -236,  -619,  -619,  -316,
+     -87,  -619,  -393,  -619,  -619,   -26,   318,  -150,  -619,   436,
+     445,  -114,  -156,  -240,   157,   199,   310,  -619,  -619,   536,
+    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
+    -619,   466,  -619,  -619,  -619,  -619,  -619,  -619,  -618,  -108,
+     186,  -192,  -619,  -619,   502,  -619,   438,  -619,  -619,  -619,
+     -38,   121,  -451,  -619,   446,  -619,  -619
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -222
+#define YYTABLE_NINF -221
 static const yytype_int16 yytable[] =
 {
-      11,    82,   359,   322,   280,   272,    13,   418,   378,   380,
-     527,   105,   162,   660,   594,   677,   111,    11,   326,   327,
-     328,   329,   330,    13,    91,   111,   318,   289,   336,   410,
-     515,   516,    94,    29,    30,    31,    32,    33,    34,    35,
-      36,   111,    37,   274,   494,   535,   496,   111,    21,   131,
-     676,   146,   109,   111,   119,   120,   111,    50,    51,    52,
-     147,     1,    53,    22,     3,   536,     5,   691,    84,    85,
-     146,   243,   111,   273,    24,    89,   138,   433,   337,   236,
-     109,    90,   464,   319,   338,   339,   138,   495,   363,   495,
-     365,   470,   155,    11,    64,    65,   464,   107,    67,    68,
-      69,    70,    71,    72,    73,   531,     1,     2,   656,     3,
-       4,     5,   464,   464,   663,   664,   233,   234,   593,   468,
-     237,   548,   599,   112,   360,   361,   241,    25,   111,  -153,
-     286,    27,   112,   356,   627,   155,   287,    74,   420,    26,
-     480,   482,   484,   283,    28,   364,   435,   366,   112,   575,
-      38,    39,    40,    44,   112,   692,   693,   163,   695,   696,
-     112,   535,   355,   112,   645,    60,   415,   -61,   320,   321,
-     283,   323,   661,   135,   678,   706,   707,    95,   136,   112,
-     106,   111,   417,   -61,   324,   283,   283,   283,   283,   283,
-     331,   332,   333,   334,   335,   283,   159,   464,   404,   573,
-      58,   404,   404,   404,   469,   138,   464,     2,   464,   464,
-       4,   465,    59,   486,   544,   547,   155,     1,    62,    46,
-       3,    47,     5,   546,    91,    86,   240,    87,   116,   500,
-     117,   502,   503,   504,    98,   112,  -153,    99,   404,   -61,
-    -153,   580,   607,   559,   608,   102,   404,   404,   404,   404,
-     404,   100,   340,   489,    75,    76,   103,   585,    77,   567,
-      78,   108,   122,   123,   124,   125,   126,   127,   437,   438,
-     439,   440,   104,   441,   411,    87,   512,   442,   443,   142,
-     444,   445,   446,   447,   448,   655,   386,   567,   112,   630,
-     143,   412,   413,   414,    64,    65,    38,    39,    40,   665,
-     148,   666,   160,   668,   647,   666,     1,     2,   150,     3,
-       4,     5,   434,   283,   272,   219,   219,   220,   220,   341,
-     342,   221,   221,   151,   152,   340,   404,   404,   404,   404,
-     114,   115,   165,   229,   231,   404,   235,   232,   238,   343,
-     344,   239,   345,   346,   242,   347,   348,   349,   111,   404,
-     288,   467,   281,   357,   358,   367,   350,   368,   381,   635,
-     432,   369,   406,   370,   371,   436,   609,   372,   373,   612,
-     613,   614,   382,   383,   477,   384,   452,   485,   534,   421,
-     283,   422,   273,   423,   155,   424,   425,   694,   453,   426,
-     454,   530,   341,   342,   455,   456,   283,   501,   283,   283,
-     283,   474,   476,   499,   404,   543,   511,   155,   487,   404,
-     488,   404,   343,   344,   404,   345,   346,   549,   347,   348,
-     349,   505,   506,   508,   404,   404,   517,   404,   683,   350,
-     509,   686,   510,   550,   514,   523,   557,   524,   301,   302,
-     525,   526,   457,   458,   459,   460,   461,   462,   463,   528,
-     540,   532,   565,   533,   552,   467,   553,   471,   472,   473,
-     566,   554,   555,   591,   404,   404,   559,   404,   404,   404,
-     404,   560,   562,   563,   564,   404,   587,   567,   592,   572,
-     576,   577,   568,   404,   578,   579,   595,   596,   574,   404,
-     437,   438,   439,   440,   597,   441,   611,   598,   615,   442,
-     443,   495,   444,   445,   446,   447,   448,   602,   590,   407,
-     408,   409,   303,   304,   305,   306,   307,   308,   309,   310,
-     311,   312,   313,   314,   315,   316,   404,   617,   518,   519,
-     520,   521,   623,   283,   624,   625,   283,   283,   283,   529,
-     626,   628,   629,   636,   637,   638,   419,   643,   648,   639,
-     649,   650,   651,   659,   427,   428,   429,   430,   431,   290,
-     291,   292,   293,   294,   295,   296,   297,   298,   299,   634,
-     669,   667,   670,   671,   404,   687,   641,   673,   404,   404,
-      64,    65,   688,   107,    67,    68,    69,    70,    71,    72,
-      73,   641,     1,     2,   631,     3,     4,     5,   581,   582,
-     583,   584,   690,   586,   -18,   -19,   697,   588,   589,   698,
-     404,   404,   700,   404,   699,   404,   704,   709,   710,   404,
-     672,   132,   657,    74,   353,   404,   149,    45,   145,   130,
-     227,    97,   362,   646,   490,   491,   492,   493,   228,     0,
-     685,   522,     0,   498,     0,     0,     0,     0,     0,     0,
-       0,   619,   620,   621,   622,     0,   631,   513,     0,     0,
-       0,     0,     0,     0,     0,     0,    64,    65,     0,   107,
-      67,    68,    69,    70,    71,    72,    73,     0,     1,     2,
-       0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   652,     0,
-     653,   654,     0,     0,     0,     0,     0,     0,     0,    74,
-       0,     0,   551,     0,     0,     0,     0,   556,     0,   558,
-       0,     0,   561,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   569,   570,     0,   571,     0,     0,     0,     0,
-      75,    76,     0,     0,    77,     0,    78,   144,     0,     0,
-      64,    65,     0,   107,    67,    68,    69,    70,    71,    72,
-      73,     0,     1,     2,     0,     3,     4,     5,     0,     0,
-       0,     0,   600,   601,     0,   603,   604,   605,   606,     0,
-       0,     0,     0,   610,     0,     0,     0,     0,     0,     0,
-       0,   616,     0,    74,     0,     0,     0,   618,   437,   438,
-     439,   440,     0,   441,     0,     0,     0,   442,   443,     0,
-     444,   445,   446,   447,   448,     0,     0,     0,     0,   387,
-     388,   389,   390,    64,    65,   391,    75,    76,  -221,     0,
-      77,     0,    78,   379,   644,     1,     2,     0,     3,     4,
-       5,   392,   393,   394,     0,     0,   -63,     1,     2,     0,
-       3,     4,     5,     0,     0,     0,   395,   396,     6,     7,
+      11,    82,   272,   358,   322,   417,   105,   159,    13,   659,
+     526,   280,   162,   111,   676,   111,   111,    11,   111,   326,
+     327,   328,   329,   330,   289,    13,   377,   379,   493,   336,
+      91,   111,   111,   274,   318,   409,   111,   240,    94,   495,
+     534,   675,  -152,   111,   463,   111,   146,   131,   243,    44,
+     273,   468,   109,    64,    65,   147,   514,   515,   690,     1,
+     535,   319,     3,    21,     5,     1,     2,   463,     3,     4,
+       5,   494,    84,    85,   546,   337,   138,    24,    22,    89,
+     109,   146,   494,   432,     2,    90,   138,     4,   463,   286,
+     236,   463,   155,    11,   135,   287,   362,   469,   364,   136,
+     530,   119,   120,   593,    29,    30,    31,    32,    33,    34,
+      35,    36,    25,    37,   359,   360,   233,   234,    26,   112,
+     237,   112,   112,   363,   112,   365,   241,   419,   -61,   355,
+     354,    38,    39,    40,   626,   155,   467,   112,   112,   574,
+     414,   -61,   112,   283,   592,   416,   -61,   434,  -152,   112,
+     629,   112,  -152,   463,    27,   463,   163,   479,   481,   483,
+     464,   463,   547,    46,   644,    47,   543,   660,   320,   321,
+     283,   323,   677,    62,   106,   403,   338,   339,   403,   403,
+     403,    86,    95,    87,   324,   283,   283,   283,   283,   283,
+     331,   332,   333,   334,   335,   283,   572,   655,   116,   463,
+     117,    28,    58,   662,   663,   138,    59,   534,   598,    50,
+      51,    52,    60,   485,    53,   403,   155,   579,    91,   558,
+      38,    39,    40,   403,   403,   403,   403,   403,   584,   499,
+     566,   501,   502,   503,   654,   664,   566,   665,    98,   606,
+     545,   607,   219,   219,   691,   692,    99,   694,   695,   667,
+     100,   665,   456,   457,   458,   459,   460,   461,   462,   488,
+     220,   220,   221,   221,   705,   706,   102,   470,   471,   472,
+     103,   151,   152,   104,   410,   122,   123,   124,   125,   126,
+     127,    87,   511,   114,   115,   148,   142,   143,   385,   160,
+     150,   411,   412,   413,   165,   229,   231,   232,   235,   238,
+     239,   646,   403,   403,   403,   403,   242,   111,   281,   288,
+     272,   403,   433,   283,   436,   437,   438,   439,   356,   440,
+     357,   366,   367,   441,   442,   403,   443,   444,   445,   446,
+     447,   368,   369,   370,   380,   371,   372,   381,   517,   518,
+     519,   520,   382,   383,   405,   431,   435,   420,   421,   528,
+     466,   422,   423,   424,   425,   451,   452,   453,   273,   634,
+     476,   454,   455,   475,   529,   484,   608,   473,   486,   611,
+     612,   613,   487,   498,   504,   505,   507,   533,   508,   283,
+     403,   509,   513,   155,   522,   403,   523,   403,   542,   340,
+     403,   524,   548,   525,   527,   283,   500,   283,   283,   283,
+     403,   403,   531,   403,   532,   510,   155,   549,   580,   581,
+     582,   583,   551,   585,   552,   556,   564,   587,   588,   553,
+     554,   558,   559,   561,   562,   516,   563,   565,   682,   566,
+     590,   685,   571,   591,   575,   576,   577,   614,   578,   594,
+     403,   403,   595,   403,   403,   403,   403,   586,   596,   539,
+     597,   403,   601,   610,   466,   616,   341,   342,   494,   403,
+     622,   618,   619,   620,   621,   403,   623,   624,   627,   625,
+     628,   635,   406,   407,   408,   637,   343,   344,   642,   345,
+     346,   567,   347,   348,   349,   636,   638,   573,    64,    65,
+     647,   107,    67,    68,    69,    70,    71,    72,    73,   648,
+       1,     2,   403,     3,     4,     5,   649,   589,   651,   418,
+     652,   653,   693,   650,   658,   666,   668,   426,   427,   428,
+     429,   430,   669,   670,   672,   686,   687,   689,   -18,   -19,
+     696,    74,   283,   697,   698,   283,   283,   283,   708,   671,
+     699,     1,   703,   709,     3,   132,     5,   656,   149,   352,
+     403,   145,   361,    45,   403,   403,   130,    64,    65,    97,
+     107,    67,    68,    69,    70,    71,    72,    73,   633,     1,
+       2,   227,     3,     4,     5,   640,   340,   521,   645,   228,
+       0,     0,     0,     0,     0,     0,   403,   403,     0,   403,
+     640,   403,     0,   630,     0,   403,   489,   490,   491,   492,
+      74,   403,     0,     0,     0,   497,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   436,   437,   438,   439,   512,
+     440,     0,     0,     0,   441,   442,     0,   443,   444,   445,
+     446,   447,     0,     0,     0,     0,     0,     0,     0,   684,
+       0,     0,     0,   341,   342,     0,     0,    75,    76,     0,
+       0,    77,     0,    78,   108,   630,     0,     0,     0,     0,
+       0,     0,     0,   343,   344,     0,   345,   346,     0,   347,
+     348,   349,     0,     0,   550,     0,     0,     0,     0,   555,
+       0,   557,     0,     0,   560,     0,   301,   302,     0,     0,
+       0,     0,     0,     0,   568,   569,     0,   570,   436,   437,
+     438,   439,     0,   440,     0,     0,     0,   441,   442,     0,
+     443,   444,   445,   446,   447,     0,    75,    76,     0,     0,
+      77,     0,    78,   144,   290,   291,   292,   293,   294,   295,
+     296,   297,   298,   299,   599,   600,     0,   602,   603,   604,
+     605,     0,     0,     0,     0,   609,     0,     0,     0,     0,
+       0,     0,     0,   615,     0,     0,     0,     0,     0,   617,
+     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
+     313,   314,   315,   316,     0,     0,     0,     0,     0,     0,
+       0,   386,   387,   388,   389,    64,    65,   390,     0,     0,
+    -220,     0,     0,     0,     0,     0,   643,     1,     2,     0,
+       3,     4,     5,   391,   392,   393,     0,     0,   -63,     1,
+       2,     0,     3,     4,     5,     0,     0,     0,   394,   395,
+       6,     7,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   340,     0,     0,     0,     0,   396,     0,     0,
+       0,     0,     8,     0,   674,     0,     9,     0,   680,   681,
+      10,     0,     0,   175,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,   185,   186,   187,   188,   189,   254,   255,
+     256,   257,     0,     0,     0,     0,     0,     0,     0,     0,
+     700,   701,     0,   702,     0,   704,     0,     0,     0,   707,
+       0,     0,     0,     0,     0,   710,     0,   258,   198,   678,
+     679,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+       0,   259,     0,   260,   261,   262,     0,   263,   264,   343,
+     344,     0,   345,   346,     0,   347,   348,   349,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   386,   387,   388,
+     389,    64,    65,   390,     0,   397,     0,     0,   398,     0,
+     399,     0,   400,     1,     2,     0,     3,     4,     5,   391,
+     392,   393,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   394,   395,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   111,
+       0,    64,    65,   396,   107,    67,    68,    69,    70,    71,
+      72,    73,     0,     1,     2,     0,     3,     4,     5,   175,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
+     186,   187,   188,   189,   254,   255,   256,   257,     0,     0,
+       0,     0,     0,     0,    74,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     340,     0,     0,     0,     0,   397,     0,     0,     0,     0,
-       8,     0,   675,     0,     9,     0,   681,   682,    10,     0,
-       0,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,   185,   186,   187,   188,   189,   254,   255,   256,   257,
-      75,    76,     0,     0,    77,     0,    78,   466,   701,   702,
-       0,   703,     0,   705,     0,     0,     0,   708,     0,     0,
-       0,     0,     0,   711,     0,   258,   198,   679,   680,   201,
-     202,   203,   204,   205,   206,   207,   208,   209,     0,   259,
-       0,   260,   261,   262,     0,   263,   264,   343,   344,     0,
-     345,   346,     0,   347,   348,   349,     0,     0,     0,     0,
-       0,     0,     0,     0,   350,     0,   387,   388,   389,   390,
-      64,    65,   391,     0,   398,     0,     0,   399,     0,   400,
-       0,   401,     1,     2,     0,     3,     4,     5,   392,   393,
-     394,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   395,   396,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   111,     0,
-      64,    65,   397,   107,    67,    68,    69,    70,    71,    72,
-      73,     0,     1,     2,     0,     3,     4,     5,   175,   176,
-     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
-     187,   188,   189,   254,   255,   256,   257,     0,     0,     0,
-       0,     0,     0,    74,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   258,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,     0,   259,     0,   260,
+     261,   262,     0,   263,   264,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   258,   198,   199,   200,   201,   202,   203,   204,
-     205,   206,   207,   208,   209,     0,   259,  -220,   260,   261,
-     262,     0,   263,   264,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   -63,     1,     2,     0,     3,
-       4,     5,     0,     0,     0,   112,     0,     6,     7,     0,
-       0,   398,     0,     0,   399,     0,   400,     0,   401,   244,
-     245,   246,   247,    64,    65,   248,     0,     0,     0,     8,
-       0,     0,     0,     9,     0,     1,     2,    10,     3,     4,
+       0,     0,     0,     0,     0,   112,     0,     0,     0,     0,
+       0,   397,     0,     0,   398,     0,   399,     0,   400,   244,
+     245,   246,   247,    64,    65,   248,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     1,     2,     0,     3,     4,
        5,   249,   250,   251,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   252,   253,     0,     0,
-      75,    76,     0,     0,    77,     0,    78,   483,     0,     0,
+      75,    76,     0,     0,    77,     0,    78,   378,     0,     0,
        0,   111,    64,    65,     0,   107,    67,    68,    69,    70,
       71,    72,    73,     0,     1,     2,     0,     3,     4,     5,
        0,   175,   176,   177,   178,   179,   180,   181,   182,   183,
@@ -2425,238 +2418,244 @@
      202,   203,   204,   205,   206,   207,   208,   209,     0,   259,
        0,   260,   261,   262,     0,   263,   264,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   112,     0,
-       0,     0,   -61,     0,   265,     0,     0,   266,     0,   267,
-       0,   268,   244,   245,   246,   247,    64,    65,   248,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     1,     2,
-       0,     3,     4,     5,   249,   250,   251,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   252,
-     253,     0,    75,    76,     0,     0,    77,     0,    78,   545,
-       0,     0,     0,     0,   111,    64,    65,     0,   153,    67,
-      68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
-       3,     4,     5,     0,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,   187,   188,   189,   254,
-     255,   256,   257,     0,     0,     0,     0,     0,    74,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   258,   198,
-     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
-     209,     0,   259,     0,   260,   261,   262,     0,   263,   264,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   112,     0,     0,     0,     0,     0,   265,     0,     0,
-     266,     0,   267,   154,   268,   387,   388,   389,   390,    64,
-      65,   391,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     1,     2,     0,     3,     4,     5,   392,   393,   394,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   395,   396,     0,    75,    76,     0,     0,    77,
-       0,    78,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   397,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
-     188,   189,   254,   255,   256,   257,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   112,     0,     0,
+       0,   -61,     0,   265,     0,     0,   266,     0,   267,     0,
+     268,   244,   245,   246,   247,    64,    65,   248,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     1,     2,     0,
+       3,     4,     5,   249,   250,   251,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   252,   253,
+       0,    75,    76,     0,     0,    77,     0,    78,   465,     0,
+       0,     0,     0,   111,    64,    65,     0,   107,    67,    68,
+      69,    70,    71,    72,    73,     0,     1,     2,     0,     3,
+       4,     5,     0,   175,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,   185,   186,   187,   188,   189,   254,   255,
+     256,   257,     0,     0,     0,     0,     0,    74,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   258,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+       0,   259,     0,   260,   261,   262,     0,   263,   264,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   258,   198,   199,   200,   201,   202,   203,   204,   205,
-     206,   207,   208,   209,     0,   259,     0,   260,   261,   262,
-       0,   263,   264,   387,   388,   389,   390,     0,     0,   391,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   112,
+       0,     0,     0,     0,     0,   265,     0,     0,   266,     0,
+     267,     0,   268,   386,   387,   388,   389,    64,    65,   390,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     1,
+       2,     0,     3,     4,     5,   391,   392,   393,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   392,   393,   394,     0,     0,
-     398,     0,     0,   399,     0,   400,     0,   401,     0,     0,
-     395,   396,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    64,    65,   397,
-     153,    67,    68,    69,    70,    71,    72,    73,     0,     1,
-       2,     0,     3,     4,     5,   175,   176,   177,   178,   179,
+     394,   395,  -219,    75,    76,     0,     0,    77,     0,    78,
+     482,     0,     0,     0,     0,     0,     0,     0,     0,   396,
+     -63,     1,     2,     0,     3,     4,     5,     0,     0,     0,
+       0,     0,     6,     7,     0,   175,   176,   177,   178,   179,
      180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
-     254,   255,   256,   257,     0,     0,     0,     0,    64,    65,
-      74,   107,    67,    68,    69,    70,    71,    72,    73,     0,
-       1,     2,     0,     3,     4,     5,     0,     0,     0,   258,
+     254,   255,   256,   257,     8,     0,     0,     0,     9,     0,
+       0,     0,    10,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   258,
      198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
      208,   209,     0,   259,     0,   260,   261,   262,     0,   263,
-     264,    74,    64,    65,     0,   107,    67,    68,    69,    70,
-      71,    72,    73,     0,     1,     2,     0,     3,     4,     5,
-       0,     0,     0,     0,     0,     0,     0,     0,   398,     0,
-       0,   399,     0,   400,   137,   401,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    74,     0,     0,     0,     0,
-       0,   275,   276,     0,   277,    64,    65,   278,   107,    67,
+     264,   386,   387,   388,   389,     0,     0,   390,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   391,   392,   393,     0,   397,     0,     0,
+     398,     0,   399,     0,   400,     0,     0,     0,   394,   395,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    64,    65,   396,   107,    67,
       68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
-       3,     4,     5,     0,     0,     0,     0,    75,    76,     0,
-       0,    77,     0,    78,     0,     0,     0,   352,     0,     0,
-       0,     0,     0,     0,     0,     0,    64,    65,    74,   107,
+       3,     4,     5,   175,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,   185,   186,   187,   188,   189,   254,   255,
+     256,   257,     0,     0,     0,     0,    64,    65,    74,   153,
       67,    68,    69,    70,    71,    72,    73,     0,     1,     2,
-       0,     3,     4,     5,     0,     0,     0,     0,    75,    76,
-       0,   374,    77,     0,    78,     0,     0,     0,    64,    65,
-       0,   107,    67,    68,    69,    70,    71,    72,    73,    74,
-       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     539,     0,    75,    76,     0,     0,    77,     0,    78,    64,
-      65,    74,   107,    67,    68,    69,    70,    71,    72,    73,
-       0,     1,     2,     0,     3,     4,     5,    64,    65,     0,
-      66,    67,    68,    69,    70,    71,    72,    73,     0,     1,
-       2,   633,     3,     4,     5,     0,     0,     0,     0,     0,
-       0,     0,    74,     0,     0,    75,    76,     0,     0,    77,
-       0,    78,     0,     0,     0,     0,     0,     0,    64,    65,
-      74,   107,    67,    68,    69,    70,    71,    72,    73,     0,
-       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    75,    76,     0,   479,
-      77,     0,    78,     0,     0,     0,     0,     0,     0,    64,
-      65,    74,   282,    67,    68,    69,    70,    71,    72,    73,
-       0,     1,     2,     0,     3,     4,     5,     0,    75,    76,
-       0,     0,    77,     0,    78,     0,     0,     0,    64,    65,
-       0,   107,    67,    68,    69,    70,    71,    72,    73,     0,
-       1,     2,    74,     3,     4,     5,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    75,
-      76,     0,     0,    77,     0,    78,     0,     0,     0,     0,
-       0,    74,     0,     0,     0,     0,     0,    75,    76,     0,
-       0,    77,     0,    78,    64,    65,     0,   107,    67,    68,
+       0,     3,     4,     5,     0,     0,     0,   258,   198,   199,
+     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
+       0,   259,     0,   260,   261,   262,     0,   263,   264,    74,
+       0,    64,    65,     0,   107,    67,    68,    69,    70,    71,
+      72,    73,     0,     1,     2,     0,     3,     4,     5,     0,
+       0,     0,     0,     0,     0,   397,     0,     0,   398,     0,
+     399,     0,   400,   137,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    74,    64,    65,     0,   153,    67,
+      68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
+       3,     4,     5,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,    75,    76,     0,     0,    77,     0,
+      78,   544,     0,     0,     0,     0,     0,     0,    74,     0,
+     275,   276,     0,   277,    64,    65,   278,   107,    67,    68,
       69,    70,    71,    72,    73,     0,     1,     2,     0,     3,
-       4,     5,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    75,    76,
-       0,     0,    77,     0,    78,    64,    65,    74,   107,    67,
-      68,    69,    70,    71,    72,   640,     0,     1,     2,     0,
+       4,     5,     0,     0,     0,    75,    76,     0,     0,    77,
+       0,    78,     0,     0,     0,     0,   351,     0,     0,     0,
+       0,     0,     0,     0,     0,    64,    65,    74,   107,    67,
+      68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
        3,     4,     5,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    75,
-      76,     0,     0,    77,     0,    78,    64,    65,    74,   107,
-      67,    68,    69,    70,    71,    72,   684,   166,     1,     2,
-       0,     3,     4,     5,     0,     0,     0,     0,    75,    76,
-       0,     0,    77,     0,   377,     0,     0,     0,   167,   168,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,   192,   193,     0,     0,     0,     0,     0,
+      75,    76,     0,   154,    77,     0,    78,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    64,    65,    74,   107,
+      67,    68,    69,    70,    71,    72,    73,     0,     1,     2,
+       0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    75,    76,     0,     0,    77,     0,
-     481,     0,     0,     0,     0,   194,   195,   196,     0,     0,
-     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
-     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
-     217,   218,     0,     0,     0,    75,    76,     0,     0,    77,
-       0,    78,     0,     0,     0,     0,     0,     0,     0,     0,
+      78,     0,     0,     0,     0,     0,     0,    64,    65,    74,
+     107,    67,    68,    69,    70,    71,    72,    73,     0,     1,
+       2,     0,     3,     4,     5,    64,    65,     0,   107,    67,
+      68,    69,    70,    71,    72,    73,     0,     1,     2,   538,
+       3,     4,     5,    75,    76,     0,     0,    77,     0,    78,
+      74,     0,     0,     0,     0,     0,     0,   632,     0,     0,
+       0,     0,     0,     0,     0,     0,    64,    65,    74,    66,
+      67,    68,    69,    70,    71,    72,    73,     0,     1,     2,
+       0,     3,     4,     5,    75,    76,     0,   373,    77,     0,
+      78,    64,    65,     0,   107,    67,    68,    69,    70,    71,
+      72,    73,     0,     1,     2,     0,     3,     4,     5,    74,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    75,    76,     0,   478,    77,
+       0,    78,    64,    65,    74,   282,    67,    68,    69,    70,
+      71,    72,    73,     0,     1,     2,     0,     3,     4,     5,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    75,    76,     0,     0,
-      77,     0,    78
+      77,     0,    78,     0,     0,    74,     0,     0,     0,     0,
+       0,     0,     0,     0,    75,    76,     0,     0,    77,     0,
+      78,    64,    65,     0,   107,    67,    68,    69,    70,    71,
+      72,    73,     0,     1,     2,     0,     3,     4,     5,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    75,    76,     0,     0,    77,
+       0,    78,    64,    65,    74,   107,    67,    68,    69,    70,
+      71,    72,    73,     0,     1,     2,     0,     3,     4,     5,
+      75,    76,     0,     0,    77,     0,    78,    64,    65,     0,
+     107,    67,    68,    69,    70,    71,    72,   639,     0,     1,
+       2,     0,     3,     4,     5,    74,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    75,    76,     0,     0,    77,     0,    78,    64,    65,
+      74,   107,    67,    68,    69,    70,    71,    72,   683,     0,
+       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,    74,     0,     0,     0,     0,     0,     0,     0,     0,
+      75,    76,     0,     0,    77,     0,   376,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     166,    75,    76,     0,     0,    77,     0,   480,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   167,   168,     0,     0,     0,    75,    76,     0,     0,
+      77,     0,    78,   169,   170,   171,   172,   173,   174,   175,
+     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
+     186,   187,   188,   189,   190,   191,   192,   193,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    75,    76,     0,
+       0,    77,     0,    78,     0,     0,     0,     0,   194,   195,
+     196,     0,     0,   197,   198,   199,   200,   201,   202,   203,
+     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
+     214,   215,   216,   217,   218
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,    27,   239,   196,   161,   158,     0,   321,   266,   267,
-     462,     4,    28,    11,   540,    11,    55,    17,   211,   212,
-     213,   214,   215,    17,    21,    55,   192,   172,   221,   289,
-     450,   451,    29,    42,    43,    44,    45,    46,    47,    48,
-      49,    55,    51,   159,    11,    34,    11,    55,    53,     7,
-     660,   165,    78,    55,    32,    33,    55,    42,    43,    44,
-     174,    19,    47,    68,    22,    54,    24,   677,    41,    42,
-     165,   156,    55,   158,   164,    48,   102,   337,   223,   174,
-     106,    54,   165,   193,   117,   118,   112,    54,   254,    54,
-     256,   174,   118,    93,     7,     8,   165,    10,    11,    12,
-      13,    14,    15,    16,    17,   174,    19,    20,   634,    22,
-      23,    24,   165,   165,   640,   641,   142,   143,   538,   377,
-     146,   174,   174,   162,   240,   241,   152,    59,    55,    55,
-      11,    18,   162,   172,   586,   161,    17,    50,   168,   164,
-     398,   399,   400,   169,   164,   255,   339,   257,   162,   163,
-     159,   160,   161,     0,   162,   681,   682,   173,   684,   685,
-     162,    34,   170,   162,   616,   168,   165,   166,   194,   195,
-     196,   197,   170,   165,   170,   701,   702,   174,   170,   162,
-     173,    55,   165,   166,   210,   211,   212,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,   121,   165,   283,   513,
-     164,   286,   287,   288,   172,   231,   165,    20,   165,   165,
-      23,   170,   164,   406,   170,   172,   242,    19,    22,    46,
-      22,    48,    24,   481,    21,    35,   151,    37,    42,   422,
-      44,   424,   425,   426,    22,   162,   162,    22,   323,   166,
-     166,   163,   556,   165,   558,   162,   331,   332,   333,   334,
-     335,    22,    54,   410,   167,   168,     4,   163,   171,   165,
-     173,   174,    62,    63,    64,    65,    66,    67,   141,   142,
-     143,   144,     4,   146,   300,    37,   433,   150,   151,   169,
-     153,   154,   155,   156,   157,   163,   280,   165,   162,   163,
-     169,   317,   318,   319,     7,     8,   159,   160,   161,   163,
-     162,   165,     4,   163,   618,   165,    19,    20,   166,    22,
-      23,    24,   338,   339,   467,   132,   133,   132,   133,   121,
-     122,   132,   133,   114,   115,    54,   411,   412,   413,   414,
-      84,    85,   164,    22,   165,   420,   172,   163,     4,   141,
-     142,   163,   144,   145,   162,   147,   148,   149,    55,   434,
-      11,   377,    57,   172,   163,   162,   158,   162,    22,   596,
-      38,   162,   165,   162,   162,     4,   559,   162,   162,   562,
-     563,   564,   162,   162,    61,   162,    38,    22,    38,   165,
-     406,   165,   467,   165,   410,   165,   165,    38,   162,   165,
-     162,   172,   121,   122,   162,   162,   422,   423,   424,   425,
-     426,   165,   162,   168,   489,    22,   432,   433,   165,   494,
-     165,   496,   141,   142,   499,   144,   145,    17,   147,   148,
-     149,   165,   165,   165,   509,   510,   452,   512,   665,   158,
-     165,   668,   165,    17,   165,   165,     4,   165,    26,    27,
-     165,   165,   367,   368,   369,   370,   371,   372,   373,   165,
-     476,   165,     4,   165,   165,   481,   165,   382,   383,   384,
-       4,   165,   165,    22,   549,   550,   165,   552,   553,   554,
-     555,   165,   165,   165,   165,   560,   172,   165,     4,   165,
-     165,   165,   508,   568,   165,   165,   165,   163,   514,   574,
-     141,   142,   143,   144,   165,   146,   165,   172,     4,   150,
-     151,    54,   153,   154,   155,   156,   157,   162,   534,   286,
-     287,   288,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   611,   162,   453,   454,
-     455,   456,   165,   559,   163,   165,   562,   563,   564,   464,
-     165,   163,   163,    22,   172,   165,   323,   170,   163,   168,
-     163,   163,   163,    17,   331,   332,   333,   334,   335,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   595,
-     163,   170,   163,   163,   659,     4,   602,    54,   663,   664,
-       7,     8,   152,    10,    11,    12,    13,    14,    15,    16,
-      17,   617,    19,    20,   594,    22,    23,    24,   523,   524,
-     525,   526,   165,   528,   162,   162,    22,   532,   533,    17,
-     695,   696,    17,   698,   165,   700,    17,    73,    17,   704,
-     656,    93,   635,    50,   231,   710,   112,    17,   106,    90,
-     133,    57,   242,   617,   411,   412,   413,   414,   133,    -1,
-     666,   457,    -1,   420,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   576,   577,   578,   579,    -1,   656,   434,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    -1,    10,
-      11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-      -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   623,    -1,
-     625,   626,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,
-      -1,    -1,   489,    -1,    -1,    -1,    -1,   494,    -1,   496,
-      -1,    -1,   499,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   509,   510,    -1,   512,    -1,    -1,    -1,    -1,
-     167,   168,    -1,    -1,   171,    -1,   173,   174,    -1,    -1,
-       7,     8,    -1,    10,    11,    12,    13,    14,    15,    16,
-      17,    -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,
-      -1,    -1,   549,   550,    -1,   552,   553,   554,   555,    -1,
-      -1,    -1,    -1,   560,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   568,    -1,    50,    -1,    -1,    -1,   574,   141,   142,
+       0,    27,   158,   239,   196,   321,     4,   121,     0,    11,
+     461,   161,    28,    55,    11,    55,    55,    17,    55,   211,
+     212,   213,   214,   215,   172,    17,   266,   267,    11,   221,
+      21,    55,    55,   159,   192,   289,    55,   151,    29,    11,
+      34,   659,    55,    55,   164,    55,   164,     7,   156,     0,
+     158,   171,    78,     7,     8,   173,   449,   450,   676,    19,
+      54,   193,    22,    53,    24,    19,    20,   164,    22,    23,
+      24,    54,    41,    42,   171,   223,   102,   163,    68,    48,
+     106,   164,    54,   337,    20,    54,   112,    23,   164,    11,
+     173,   164,   118,    93,   164,    17,   254,   173,   256,   169,
+     173,    32,    33,   539,    42,    43,    44,    45,    46,    47,
+      48,    49,    59,    51,   240,   241,   142,   143,   163,   161,
+     146,   161,   161,   255,   161,   257,   152,   167,   165,   171,
+     169,   158,   159,   160,   585,   161,   376,   161,   161,   162,
+     164,   165,   161,   169,   537,   164,   165,   339,   161,   161,
+     162,   161,   165,   164,    18,   164,   172,   397,   398,   399,
+     169,   164,   173,    46,   615,    48,   169,   169,   194,   195,
+     196,   197,   169,    22,   172,   283,   117,   118,   286,   287,
+     288,    35,   173,    37,   210,   211,   212,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,   512,   633,    42,   164,
+      44,   163,   163,   639,   640,   231,   163,    34,   173,    42,
+      43,    44,   167,   405,    47,   323,   242,   162,    21,   164,
+     158,   159,   160,   331,   332,   333,   334,   335,   162,   421,
+     164,   423,   424,   425,   162,   162,   164,   164,    22,   555,
+     480,   557,   132,   133,   680,   681,    22,   683,   684,   162,
+      22,   164,   366,   367,   368,   369,   370,   371,   372,   409,
+     132,   133,   132,   133,   700,   701,   161,   381,   382,   383,
+       4,   114,   115,     4,   300,    62,    63,    64,    65,    66,
+      67,    37,   432,    84,    85,   161,   168,   168,   280,     4,
+     165,   317,   318,   319,   163,    22,   164,   162,   171,     4,
+     162,   617,   410,   411,   412,   413,   161,    55,    57,    11,
+     466,   419,   338,   339,   141,   142,   143,   144,   171,   146,
+     162,   161,   161,   150,   151,   433,   153,   154,   155,   156,
+     157,   161,   161,   161,    22,   161,   161,   161,   452,   453,
+     454,   455,   161,   161,   164,    38,     4,   164,   164,   463,
+     376,   164,   164,   164,   164,    38,   161,   161,   466,   595,
+      61,   161,   161,   161,   171,    22,   558,   164,   164,   561,
+     562,   563,   164,   167,   164,   164,   164,    38,   164,   405,
+     488,   164,   164,   409,   164,   493,   164,   495,    22,    54,
+     498,   164,    17,   164,   164,   421,   422,   423,   424,   425,
+     508,   509,   164,   511,   164,   431,   432,    17,   522,   523,
+     524,   525,   164,   527,   164,     4,     4,   531,   532,   164,
+     164,   164,   164,   164,   164,   451,   164,     4,   664,   164,
+      22,   667,   164,     4,   164,   164,   164,     4,   164,   164,
+     548,   549,   162,   551,   552,   553,   554,   171,   164,   475,
+     171,   559,   161,   164,   480,   161,   121,   122,    54,   567,
+     164,   575,   576,   577,   578,   573,   162,   164,   162,   164,
+     162,    22,   286,   287,   288,   164,   141,   142,   169,   144,
+     145,   507,   147,   148,   149,   171,   167,   513,     7,     8,
+     162,    10,    11,    12,    13,    14,    15,    16,    17,   162,
+      19,    20,   610,    22,    23,    24,   162,   533,   622,   323,
+     624,   625,    38,   162,    17,   169,   162,   331,   332,   333,
+     334,   335,   162,   162,    54,     4,   152,   164,   161,   161,
+      22,    50,   558,    17,   164,   561,   562,   563,    73,   655,
+      17,    19,    17,    17,    22,    93,    24,   634,   112,   231,
+     658,   106,   242,    17,   662,   663,    90,     7,     8,    57,
+      10,    11,    12,    13,    14,    15,    16,    17,   594,    19,
+      20,   133,    22,    23,    24,   601,    54,   456,   616,   133,
+      -1,    -1,    -1,    -1,    -1,    -1,   694,   695,    -1,   697,
+     616,   699,    -1,   593,    -1,   703,   410,   411,   412,   413,
+      50,   709,    -1,    -1,    -1,   419,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   141,   142,   143,   144,   433,
+     146,    -1,    -1,    -1,   150,   151,    -1,   153,   154,   155,
+     156,   157,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   665,
+      -1,    -1,    -1,   121,   122,    -1,    -1,   166,   167,    -1,
+      -1,   170,    -1,   172,   173,   655,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   141,   142,    -1,   144,   145,    -1,   147,
+     148,   149,    -1,    -1,   488,    -1,    -1,    -1,    -1,   493,
+      -1,   495,    -1,    -1,   498,    -1,    26,    27,    -1,    -1,
+      -1,    -1,    -1,    -1,   508,   509,    -1,   511,   141,   142,
      143,   144,    -1,   146,    -1,    -1,    -1,   150,   151,    -1,
-     153,   154,   155,   156,   157,    -1,    -1,    -1,    -1,     3,
-       4,     5,     6,     7,     8,     9,   167,   168,     0,    -1,
-     171,    -1,   173,   174,   611,    19,    20,    -1,    22,    23,
-      24,    25,    26,    27,    -1,    -1,    18,    19,    20,    -1,
-      22,    23,    24,    -1,    -1,    -1,    40,    41,    30,    31,
+     153,   154,   155,   156,   157,    -1,   166,   167,    -1,    -1,
+     170,    -1,   172,   173,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,   548,   549,    -1,   551,   552,   553,
+     554,    -1,    -1,    -1,    -1,   559,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   567,    -1,    -1,    -1,    -1,    -1,   573,
+     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
+     110,   111,   112,   113,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,     3,     4,     5,     6,     7,     8,     9,    -1,    -1,
+       0,    -1,    -1,    -1,    -1,    -1,   610,    19,    20,    -1,
+      22,    23,    24,    25,    26,    27,    -1,    -1,    18,    19,
+      20,    -1,    22,    23,    24,    -1,    -1,    -1,    40,    41,
+      30,    31,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    54,    -1,    -1,    -1,    -1,    59,    -1,    -1,
+      -1,    -1,    52,    -1,   658,    -1,    56,    -1,   662,   663,
+      60,    -1,    -1,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     694,   695,    -1,   697,    -1,   699,    -1,    -1,    -1,   703,
+      -1,    -1,    -1,    -1,    -1,   709,    -1,   119,   120,   121,
+     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
+      -1,   133,    -1,   135,   136,   137,    -1,   139,   140,   141,
+     142,    -1,   144,   145,    -1,   147,   148,   149,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,     5,
+       6,     7,     8,     9,    -1,   167,    -1,    -1,   170,    -1,
+     172,    -1,   174,    19,    20,    -1,    22,    23,    24,    25,
+      26,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,
+      -1,     7,     8,    59,    10,    11,    12,    13,    14,    15,
+      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    -1,    -1,
+      -1,    -1,    -1,    -1,    50,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      54,    -1,    -1,    -1,    -1,    59,    -1,    -1,    -1,    -1,
-      52,    -1,   659,    -1,    56,    -1,   663,   664,    60,    -1,
-      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-     167,   168,    -1,    -1,   171,    -1,   173,   174,   695,   696,
-      -1,   698,    -1,   700,    -1,    -1,    -1,   704,    -1,    -1,
-      -1,    -1,    -1,   710,    -1,   119,   120,   121,   122,   123,
-     124,   125,   126,   127,   128,   129,   130,   131,    -1,   133,
-      -1,   135,   136,   137,    -1,   139,   140,   141,   142,    -1,
-     144,   145,    -1,   147,   148,   149,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   158,    -1,     3,     4,     5,     6,
-       7,     8,     9,    -1,   168,    -1,    -1,   171,    -1,   173,
-      -1,   175,    19,    20,    -1,    22,    23,    24,    25,    26,
-      27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,    -1,
-       7,     8,    59,    10,    11,    12,    13,    14,    15,    16,
-      17,    -1,    19,    20,    -1,    22,    23,    24,    75,    76,
-      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
-      87,    88,    89,    90,    91,    92,    93,    -1,    -1,    -1,
-      -1,    -1,    -1,    50,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,    -1,   133,    -1,   135,
+     136,   137,    -1,   139,   140,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   119,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,    -1,   133,     0,   135,   136,
-     137,    -1,   139,   140,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    18,    19,    20,    -1,    22,
-      23,    24,    -1,    -1,    -1,   162,    -1,    30,    31,    -1,
-      -1,   168,    -1,    -1,   171,    -1,   173,    -1,   175,     3,
-       4,     5,     6,     7,     8,     9,    -1,    -1,    -1,    52,
-      -1,    -1,    -1,    56,    -1,    19,    20,    60,    22,    23,
+      -1,    -1,    -1,    -1,    -1,   161,    -1,    -1,    -1,    -1,
+      -1,   167,    -1,    -1,   170,    -1,   172,    -1,   174,     3,
+       4,     5,     6,     7,     8,     9,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    19,    20,    -1,    22,    23,
       24,    25,    26,    27,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    40,    41,    -1,    -1,
-     167,   168,    -1,    -1,   171,    -1,   173,   174,    -1,    -1,
+     166,   167,    -1,    -1,   170,    -1,   172,   173,    -1,    -1,
       -1,    55,     7,     8,    -1,    10,    11,    12,    13,    14,
       15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
       -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
@@ -2667,114 +2666,124 @@
      124,   125,   126,   127,   128,   129,   130,   131,    -1,   133,
       -1,   135,   136,   137,    -1,   139,   140,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   162,    -1,
-      -1,    -1,   166,    -1,   168,    -1,    -1,   171,    -1,   173,
-      -1,   175,     3,     4,     5,     6,     7,     8,     9,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    19,    20,
-      -1,    22,    23,    24,    25,    26,    27,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,
-      41,    -1,   167,   168,    -1,    -1,   171,    -1,   173,   174,
-      -1,    -1,    -1,    -1,    55,     7,     8,    -1,    10,    11,
-      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
-      22,    23,    24,    -1,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    -1,    -1,    -1,    -1,    -1,    50,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   119,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,    -1,   133,    -1,   135,   136,   137,    -1,   139,   140,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   162,    -1,    -1,    -1,    -1,    -1,   168,    -1,    -1,
-     171,    -1,   173,   125,   175,     3,     4,     5,     6,     7,
-       8,     9,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    19,    20,    -1,    22,    23,    24,    25,    26,    27,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    40,    41,    -1,   167,   168,    -1,    -1,   171,
-      -1,   173,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    59,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,    -1,    -1,
+      -1,   165,    -1,   167,    -1,    -1,   170,    -1,   172,    -1,
+     174,     3,     4,     5,     6,     7,     8,     9,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    19,    20,    -1,
+      22,    23,    24,    25,    26,    27,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    41,
+      -1,   166,   167,    -1,    -1,   170,    -1,   172,   173,    -1,
+      -1,    -1,    -1,    55,     7,     8,    -1,    10,    11,    12,
+      13,    14,    15,    16,    17,    -1,    19,    20,    -1,    22,
+      23,    24,    -1,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    -1,    -1,    -1,    -1,    -1,    50,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   119,   120,   121,
+     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
+      -1,   133,    -1,   135,   136,   137,    -1,   139,   140,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,    -1,   133,    -1,   135,   136,   137,
-      -1,   139,   140,     3,     4,     5,     6,    -1,    -1,     9,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,
+      -1,    -1,    -1,    -1,    -1,   167,    -1,    -1,   170,    -1,
+     172,    -1,   174,     3,     4,     5,     6,     7,     8,     9,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    19,
+      20,    -1,    22,    23,    24,    25,    26,    27,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    25,    26,    27,    -1,    -1,
-     168,    -1,    -1,   171,    -1,   173,    -1,   175,    -1,    -1,
-      40,    41,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    59,
-      10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
-      20,    -1,    22,    23,    24,    75,    76,    77,    78,    79,
+      40,    41,     0,   166,   167,    -1,    -1,   170,    -1,   172,
+     173,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    59,
+      18,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      -1,    -1,    30,    31,    -1,    75,    76,    77,    78,    79,
       80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    -1,    -1,    -1,    -1,     7,     8,
-      50,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
-      19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,   119,
+      90,    91,    92,    93,    52,    -1,    -1,    -1,    56,    -1,
+      -1,    -1,    60,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   119,
      120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
      130,   131,    -1,   133,    -1,   135,   136,   137,    -1,   139,
-     140,    50,     7,     8,    -1,    10,    11,    12,    13,    14,
-      15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   168,    -1,
-      -1,   171,    -1,   173,    39,   175,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    50,    -1,    -1,    -1,    -1,
-      -1,   141,   142,    -1,   144,     7,     8,   147,    10,    11,
+     140,     3,     4,     5,     6,    -1,    -1,     9,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    25,    26,    27,    -1,   167,    -1,    -1,
+     170,    -1,   172,    -1,   174,    -1,    -1,    -1,    40,    41,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,     7,     8,    59,    10,    11,
+      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
+      22,    23,    24,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    -1,    -1,    -1,    -1,     7,     8,    50,    10,
+      11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
+      -1,    22,    23,    24,    -1,    -1,    -1,   119,   120,   121,
+     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
+      -1,   133,    -1,   135,   136,   137,    -1,   139,   140,    50,
+      -1,     7,     8,    -1,    10,    11,    12,    13,    14,    15,
+      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    -1,
+      -1,    -1,    -1,    -1,    -1,   167,    -1,    -1,   170,    -1,
+     172,    -1,   174,    39,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    50,     7,     8,    -1,    10,    11,
+      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
+      22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,    -1,
+     172,   173,    -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,
+     141,   142,    -1,   144,     7,     8,   147,    10,    11,    12,
+      13,    14,    15,    16,    17,    -1,    19,    20,    -1,    22,
+      23,    24,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,
+      -1,   172,    -1,    -1,    -1,    -1,    39,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,     7,     8,    50,    10,    11,
       12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
-      22,    23,    24,    -1,    -1,    -1,    -1,   167,   168,    -1,
-      -1,   171,    -1,   173,    -1,    -1,    -1,    39,    -1,    -1,
+      22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     166,   167,    -1,   125,   170,    -1,   172,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    50,    10,
       11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-      -1,    22,    23,    24,    -1,    -1,    -1,    -1,   167,   168,
-      -1,   170,   171,    -1,   173,    -1,    -1,    -1,     7,     8,
-      -1,    10,    11,    12,    13,    14,    15,    16,    17,    50,
-      19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,
+      -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,    -1,
+     172,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    50,
+      10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
+      20,    -1,    22,    23,    24,     7,     8,    -1,    10,    11,
+      12,    13,    14,    15,    16,    17,    -1,    19,    20,    39,
+      22,    23,    24,   166,   167,    -1,    -1,   170,    -1,   172,
+      50,    -1,    -1,    -1,    -1,    -1,    -1,    39,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    50,    10,
+      11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
+      -1,    22,    23,    24,   166,   167,    -1,   169,   170,    -1,
+     172,     7,     8,    -1,    10,    11,    12,    13,    14,    15,
+      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    50,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   166,   167,    -1,   169,   170,
+      -1,   172,     7,     8,    50,    10,    11,    12,    13,    14,
+      15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      39,    -1,   167,   168,    -1,    -1,   171,    -1,   173,     7,
-       8,    50,    10,    11,    12,    13,    14,    15,    16,    17,
-      -1,    19,    20,    -1,    22,    23,    24,     7,     8,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   166,   167,    -1,    -1,
+     170,    -1,   172,    -1,    -1,    50,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,    -1,
+     172,     7,     8,    -1,    10,    11,    12,    13,    14,    15,
+      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,
+      -1,   172,     7,     8,    50,    10,    11,    12,    13,    14,
+      15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
+     166,   167,    -1,    -1,   170,    -1,   172,     7,     8,    -1,
       10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
-      20,    39,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    50,    -1,    -1,   167,   168,    -1,    -1,   171,
-      -1,   173,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,
+      20,    -1,    22,    23,    24,    50,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   166,   167,    -1,    -1,   170,    -1,   172,     7,     8,
       50,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
       19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   167,   168,    -1,   170,
-     171,    -1,   173,    -1,    -1,    -1,    -1,    -1,    -1,     7,
-       8,    50,    10,    11,    12,    13,    14,    15,    16,    17,
-      -1,    19,    20,    -1,    22,    23,    24,    -1,   167,   168,
-      -1,    -1,   171,    -1,   173,    -1,    -1,    -1,     7,     8,
-      -1,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
-      19,    20,    50,    22,    23,    24,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   167,
-     168,    -1,    -1,   171,    -1,   173,    -1,    -1,    -1,    -1,
-      -1,    50,    -1,    -1,    -1,    -1,    -1,   167,   168,    -1,
-      -1,   171,    -1,   173,     7,     8,    -1,    10,    11,    12,
-      13,    14,    15,    16,    17,    -1,    19,    20,    -1,    22,
-      23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   167,   168,
-      -1,    -1,   171,    -1,   173,     7,     8,    50,    10,    11,
-      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
-      22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   167,
-     168,    -1,    -1,   171,    -1,   173,     7,     8,    50,    10,
-      11,    12,    13,    14,    15,    16,    17,    36,    19,    20,
-      -1,    22,    23,    24,    -1,    -1,    -1,    -1,   167,   168,
-      -1,    -1,   171,    -1,   173,    -1,    -1,    -1,    57,    58,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   167,   168,    -1,    -1,   171,    -1,
-     173,    -1,    -1,    -1,    -1,   114,   115,   116,    -1,    -1,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
-     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
-     139,   140,    -1,    -1,    -1,   167,   168,    -1,    -1,   171,
-      -1,   173,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   167,   168,    -1,    -1,
-     171,    -1,   173
+      -1,    50,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     166,   167,    -1,    -1,   170,    -1,   172,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      36,   166,   167,    -1,    -1,   170,    -1,   172,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    57,    58,    -1,    -1,    -1,   166,   167,    -1,    -1,
+     170,    -1,   172,    69,    70,    71,    72,    73,    74,    75,
+      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
+      86,    87,    88,    89,    90,    91,    92,    93,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   166,   167,    -1,
+      -1,   170,    -1,   172,    -1,    -1,    -1,    -1,   114,   115,
+     116,    -1,    -1,   119,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
+     136,   137,   138,   139,   140
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2782,77 +2791,77 @@
 static const yytype_uint16 yystos[] =
 {
        0,    19,    20,    22,    23,    24,    30,    31,    52,    56,
-      60,   182,   185,   187,   188,   189,   223,   224,   225,   227,
-     226,    53,    68,   232,   164,    59,   164,    18,   164,    42,
-      43,    44,    45,    46,    47,    48,    49,    51,   159,   160,
-     161,   190,   191,   192,     0,   225,    46,    48,   193,   242,
-      42,    43,    44,    47,   194,   239,   241,   249,   164,   164,
-     168,   233,    22,   231,     7,     8,    10,    11,    12,    13,
-      14,    15,    16,    17,    50,   167,   168,   171,   173,   182,
-     187,   210,   211,   245,   192,   192,    35,    37,   221,   192,
-     192,    21,   250,   251,    29,   174,   240,   250,    22,    22,
-      22,   234,   162,     4,     4,     4,   173,    10,   174,   211,
-     216,    55,   162,   184,   221,   221,    42,    44,   195,    32,
-      33,   220,    62,    63,    64,    65,    66,    67,   196,   237,
-     237,     7,   185,   186,   254,   165,   170,    39,   211,   212,
-     214,   215,   169,   169,   174,   216,   165,   174,   162,   215,
-     166,   220,   220,    10,   125,   211,   213,   222,   211,   217,
-       4,   200,    28,   173,   238,   164,    36,    57,    58,    69,
+      60,   181,   184,   186,   187,   188,   222,   223,   224,   226,
+     225,    53,    68,   231,   163,    59,   163,    18,   163,    42,
+      43,    44,    45,    46,    47,    48,    49,    51,   158,   159,
+     160,   189,   190,   191,     0,   224,    46,    48,   192,   241,
+      42,    43,    44,    47,   193,   238,   240,   248,   163,   163,
+     167,   232,    22,   230,     7,     8,    10,    11,    12,    13,
+      14,    15,    16,    17,    50,   166,   167,   170,   172,   181,
+     186,   209,   210,   244,   191,   191,    35,    37,   220,   191,
+     191,    21,   249,   250,    29,   173,   239,   249,    22,    22,
+      22,   233,   161,     4,     4,     4,   172,    10,   173,   210,
+     215,    55,   161,   183,   220,   220,    42,    44,   194,    32,
+      33,   219,    62,    63,    64,    65,    66,    67,   195,   236,
+     236,     7,   184,   185,   253,   164,   169,    39,   210,   211,
+     213,   214,   168,   168,   173,   215,   164,   173,   161,   214,
+     165,   219,   219,    10,   125,   210,   212,   221,   210,   216,
+       4,   199,    28,   172,   237,   163,    36,    57,    58,    69,
       70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
       80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
       90,    91,    92,    93,   114,   115,   116,   119,   120,   121,
      122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   139,   140,   177,
-     178,   179,   252,   259,   260,   261,   262,   252,   260,    22,
-     198,   165,   163,   211,   211,   172,   174,   211,     4,   163,
-     217,   211,   162,   245,     3,     4,     5,     6,     9,    25,
+     132,   133,   134,   135,   136,   137,   138,   139,   140,   176,
+     177,   178,   251,   258,   259,   260,   261,   251,   259,    22,
+     197,   164,   162,   210,   210,   171,   173,   210,     4,   162,
+     216,   210,   161,   244,     3,     4,     5,     6,     9,    25,
       26,    27,    40,    41,    90,    91,    92,    93,   119,   133,
-     135,   136,   137,   139,   140,   168,   171,   173,   175,   177,
-     178,   179,   218,   245,   184,   141,   142,   144,   147,   199,
-     213,    57,    10,   211,   247,   248,    11,    17,    11,   196,
+     135,   136,   137,   139,   140,   167,   170,   172,   174,   176,
+     177,   178,   217,   244,   183,   141,   142,   144,   147,   198,
+     212,    57,    10,   210,   246,   247,    11,    17,    11,   195,
       94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-     180,    26,    27,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   181,   180,   181,
-     211,   211,   247,   211,   211,   255,   247,   247,   247,   247,
-     247,   211,   211,   211,   211,   211,   247,   196,   117,   118,
+     179,    26,    27,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   180,   179,   180,
+     210,   210,   246,   210,   210,   254,   246,   246,   246,   246,
+     246,   210,   210,   210,   210,   210,   246,   195,   117,   118,
       54,   121,   122,   141,   142,   144,   145,   147,   148,   149,
-     158,   197,    39,   212,   202,   170,   172,   172,   163,   202,
-     184,   184,   222,   180,   181,   180,   181,   162,   162,   162,
-     162,   162,   162,   162,   170,   217,   219,   173,   219,   174,
-     219,    22,   162,   162,   162,   228,   187,     3,     4,     5,
-       6,     9,    25,    26,    27,    40,    41,    59,   168,   171,
-     173,   175,   218,   244,   245,   246,   165,   246,   246,   246,
-     200,   211,   211,   211,   211,   165,   205,   165,   205,   246,
-     168,   165,   165,   165,   165,   165,   165,   246,   246,   246,
-     246,   246,    38,   200,   211,   247,     4,   141,   142,   143,
-     144,   146,   150,   151,   153,   154,   155,   156,   157,   201,
-     229,   230,    38,   162,   162,   162,   162,   217,   217,   217,
-     217,   217,   217,   217,   165,   170,   174,   211,   219,   172,
-     174,   217,   217,   217,   165,   208,   162,    61,   243,   170,
-     219,   173,   219,   174,   219,    22,   247,   165,   165,   213,
-     246,   246,   246,   246,    11,    54,    11,   257,   246,   168,
-     247,   211,   247,   247,   247,   165,   165,   258,   165,   165,
-     165,   211,   213,   246,   165,   208,   208,   211,   217,   217,
-     217,   217,   257,   165,   165,   165,   165,   258,   165,   217,
-     172,   174,   165,   165,    38,    34,    54,   206,   209,    39,
-     211,   235,   236,    22,   170,   174,   219,   172,   174,    17,
-      17,   246,   165,   165,   165,   165,   246,     4,   246,   165,
-     165,   246,   165,   165,   165,     4,     4,   165,   211,   246,
-     246,   246,   165,   205,   211,   163,   165,   165,   165,   165,
-     163,   217,   217,   217,   217,   163,   217,   172,   217,   217,
-     211,    22,     4,   208,   198,   165,   163,   165,   172,   174,
-     246,   246,   162,   246,   246,   246,   246,   205,   205,   247,
-     246,   165,   247,   247,   247,     4,   246,   162,   246,   217,
-     217,   217,   217,   165,   163,   165,   165,   258,   163,   163,
-     163,   182,   183,    39,   211,   202,    22,   172,   165,   168,
-      17,   211,   256,   170,   246,   258,   256,   205,   163,   163,
-     163,   163,   217,   217,   217,   163,   198,   206,   207,    17,
-      11,   170,   253,   198,   198,   163,   165,   170,   163,   163,
-     163,   163,   183,    54,   204,   246,   244,    11,   170,   121,
-     122,   246,   246,   202,    17,   211,   202,     4,   152,   203,
-     165,   244,   198,   198,    38,   198,   198,    22,    17,   165,
-      17,   246,   246,   246,    17,   246,   198,   198,   246,    73,
-      17,   246
+     196,    39,   211,   201,   169,   171,   171,   162,   201,   183,
+     183,   221,   179,   180,   179,   180,   161,   161,   161,   161,
+     161,   161,   161,   169,   216,   218,   172,   218,   173,   218,
+      22,   161,   161,   161,   227,   186,     3,     4,     5,     6,
+       9,    25,    26,    27,    40,    41,    59,   167,   170,   172,
+     174,   217,   243,   244,   245,   164,   245,   245,   245,   199,
+     210,   210,   210,   210,   164,   204,   164,   204,   245,   167,
+     164,   164,   164,   164,   164,   164,   245,   245,   245,   245,
+     245,    38,   199,   210,   246,     4,   141,   142,   143,   144,
+     146,   150,   151,   153,   154,   155,   156,   157,   200,   228,
+     229,    38,   161,   161,   161,   161,   216,   216,   216,   216,
+     216,   216,   216,   164,   169,   173,   210,   218,   171,   173,
+     216,   216,   216,   164,   207,   161,    61,   242,   169,   218,
+     172,   218,   173,   218,    22,   246,   164,   164,   212,   245,
+     245,   245,   245,    11,    54,    11,   256,   245,   167,   246,
+     210,   246,   246,   246,   164,   164,   257,   164,   164,   164,
+     210,   212,   245,   164,   207,   207,   210,   216,   216,   216,
+     216,   256,   164,   164,   164,   164,   257,   164,   216,   171,
+     173,   164,   164,    38,    34,    54,   205,   208,    39,   210,
+     234,   235,    22,   169,   173,   218,   171,   173,    17,    17,
+     245,   164,   164,   164,   164,   245,     4,   245,   164,   164,
+     245,   164,   164,   164,     4,     4,   164,   210,   245,   245,
+     245,   164,   204,   210,   162,   164,   164,   164,   164,   162,
+     216,   216,   216,   216,   162,   216,   171,   216,   216,   210,
+      22,     4,   207,   197,   164,   162,   164,   171,   173,   245,
+     245,   161,   245,   245,   245,   245,   204,   204,   246,   245,
+     164,   246,   246,   246,     4,   245,   161,   245,   216,   216,
+     216,   216,   164,   162,   164,   164,   257,   162,   162,   162,
+     181,   182,    39,   210,   201,    22,   171,   164,   167,    17,
+     210,   255,   169,   245,   257,   255,   204,   162,   162,   162,
+     162,   216,   216,   216,   162,   197,   205,   206,    17,    11,
+     169,   252,   197,   197,   162,   164,   169,   162,   162,   162,
+     162,   182,    54,   203,   245,   243,    11,   169,   121,   122,
+     245,   245,   201,    17,   210,   201,     4,   152,   202,   164,
+     243,   197,   197,    38,   197,   197,    22,    17,   164,    17,
+     245,   245,   245,    17,   245,   197,   197,   245,    73,    17,
+     245
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -4048,189 +4057,180 @@
 
   case 108:
 #line 1275 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::NoCapture; ;}
+    { (yyval.Attributes) = Attribute::ByVal;     ;}
     break;
 
   case 109:
 #line 1276 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ByVal;     ;}
+    { (yyval.Attributes) = Attribute::Nest;      ;}
     break;
 
   case 110:
 #line 1277 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::Nest;      ;}
-    break;
-
-  case 111:
-#line 1278 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Attributes) =
                           Attribute::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val));    ;}
     break;
 
-  case 112:
-#line 1282 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 111:
+#line 1281 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Attributes) = Attribute::None; ;}
     break;
 
-  case 113:
-#line 1283 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 112:
+#line 1282 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
               ;}
     break;
 
+  case 113:
+#line 1287 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::InReg;    ;}
+    break;
+
   case 114:
 #line 1288 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::InReg;    ;}
+    { (yyval.Attributes) = Attribute::ZExt;     ;}
     break;
 
   case 115:
 #line 1289 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ZExt;     ;}
+    { (yyval.Attributes) = Attribute::SExt;     ;}
     break;
 
   case 116:
 #line 1290 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::SExt;     ;}
+    { (yyval.Attributes) = Attribute::NoAlias;  ;}
     break;
 
   case 117:
-#line 1291 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::NoAlias;  ;}
+#line 1293 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::None; ;}
     break;
 
   case 118:
 #line 1294 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::None; ;}
-    break;
-
-  case 119:
-#line 1295 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
                (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
              ;}
     break;
 
+  case 119:
+#line 1300 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::NoReturn; ;}
+    break;
+
   case 120:
 #line 1301 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::NoReturn; ;}
+    { (yyval.Attributes) = Attribute::NoUnwind; ;}
     break;
 
   case 121:
 #line 1302 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::NoUnwind; ;}
+    { (yyval.Attributes) = Attribute::InReg;     ;}
     break;
 
   case 122:
 #line 1303 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::InReg;     ;}
+    { (yyval.Attributes) = Attribute::ZExt;     ;}
     break;
 
   case 123:
 #line 1304 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ZExt;     ;}
+    { (yyval.Attributes) = Attribute::SExt;     ;}
     break;
 
   case 124:
 #line 1305 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::SExt;     ;}
+    { (yyval.Attributes) = Attribute::ReadNone; ;}
     break;
 
   case 125:
 #line 1306 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ReadNone; ;}
+    { (yyval.Attributes) = Attribute::ReadOnly; ;}
     break;
 
   case 126:
 #line 1307 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ReadOnly; ;}
+    { (yyval.Attributes) = Attribute::NoInline; ;}
     break;
 
   case 127:
 #line 1308 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::NoInline; ;}
+    { (yyval.Attributes) = Attribute::AlwaysInline; ;}
     break;
 
   case 128:
 #line 1309 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::AlwaysInline; ;}
+    { (yyval.Attributes) = Attribute::OptimizeForSize; ;}
     break;
 
   case 129:
 #line 1310 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::OptimizeForSize; ;}
+    { (yyval.Attributes) = Attribute::StackProtect; ;}
     break;
 
   case 130:
 #line 1311 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::StackProtect; ;}
+    { (yyval.Attributes) = Attribute::StackProtectReq; ;}
     break;
 
   case 131:
-#line 1312 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::StackProtectReq; ;}
+#line 1314 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::None; ;}
     break;
 
   case 132:
 #line 1315 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::None; ;}
-    break;
-
-  case 133:
-#line 1316 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
               ;}
     break;
 
-  case 134:
-#line 1322 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 133:
+#line 1321 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
-  case 135:
-#line 1323 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 134:
+#line 1322 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
               ;}
     break;
 
-  case 136:
-#line 1330 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 135:
+#line 1329 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 137:
-#line 1331 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 136:
+#line 1330 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
     GEN_ERROR("Alignment must be a power of two");
-  if ((yyval.UIntVal) > 0x40000000)
-    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 138:
-#line 1339 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 137:
+#line 1336 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 139:
-#line 1340 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 138:
+#line 1337 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
     GEN_ERROR("Alignment must be a power of two");
-  if ((yyval.UIntVal) > 0x40000000)
-    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 140:
-#line 1351 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 139:
+#line 1346 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   for (unsigned i = 0, e = (yyvsp[(2) - (2)].StrVal)->length(); i != e; ++i)
     if ((*(yyvsp[(2) - (2)].StrVal))[i] == '"' || (*(yyvsp[(2) - (2)].StrVal))[i] == '\\')
@@ -4240,28 +4240,28 @@
 ;}
     break;
 
-  case 141:
-#line 1359 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 140:
+#line 1354 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
-  case 142:
-#line 1360 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 141:
+#line 1355 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
     break;
 
-  case 143:
-#line 1365 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 142:
+#line 1360 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
-  case 144:
-#line 1366 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 143:
+#line 1361 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
-  case 145:
-#line 1367 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 144:
+#line 1362 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -4269,36 +4269,34 @@
   ;}
     break;
 
-  case 146:
-#line 1372 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 145:
+#line 1367 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two");
-    if ((yyvsp[(2) - (2)].UInt64Val) > 0x40000000)
-      GEN_ERROR("Alignment too large");
     CurGV->setAlignment((yyvsp[(2) - (2)].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 154:
-#line 1390 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 153:
+#line 1383 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 155:
-#line 1394 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 154:
+#line 1387 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 156:
-#line 1398 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 155:
+#line 1391 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[(1) - (3)].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -4308,8 +4306,8 @@
   ;}
     break;
 
-  case 157:
-#line 1405 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 156:
+#line 1398 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
     const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal));
     CHECK_FOR_ERROR
@@ -4317,8 +4315,8 @@
   ;}
     break;
 
-  case 158:
-#line 1410 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 157:
+#line 1403 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                   // Type UpReference
     if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
@@ -4329,8 +4327,8 @@
   ;}
     break;
 
-  case 159:
-#line 1418 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 158:
+#line 1411 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4368,8 +4366,8 @@
   ;}
     break;
 
-  case 160:
-#line 1453 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 159:
+#line 1446 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4402,8 +4400,8 @@
   ;}
     break;
 
-  case 161:
-#line 1484 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 160:
+#line 1477 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (yyvsp[(2) - (5)].UInt64Val))));
     delete (yyvsp[(4) - (5)].TypeVal);
@@ -4411,8 +4409,8 @@
   ;}
     break;
 
-  case 162:
-#line 1489 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 161:
+#line 1482 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {          // Vector type?
      const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal)->get();
      if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val))
@@ -4425,8 +4423,8 @@
   ;}
     break;
 
-  case 163:
-#line 1499 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 162:
+#line 1492 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
@@ -4439,16 +4437,16 @@
   ;}
     break;
 
-  case 164:
-#line 1509 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 163:
+#line 1502 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 165:
-#line 1513 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 164:
+#line 1506 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
@@ -4461,16 +4459,16 @@
   ;}
     break;
 
-  case 166:
-#line 1523 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 165:
+#line 1516 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 167:
-#line 1530 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 166:
+#line 1523 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4479,8 +4477,8 @@
   ;}
     break;
 
-  case 168:
-#line 1539 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 167:
+#line 1532 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription());
@@ -4490,15 +4488,15 @@
   ;}
     break;
 
-  case 169:
-#line 1546 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 168:
+#line 1539 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
-  case 170:
-#line 1551 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 169:
+#line 1544 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs));
@@ -4506,16 +4504,16 @@
   ;}
     break;
 
-  case 171:
-#line 1556 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 170:
+#line 1549 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 173:
-#line 1564 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 172:
+#line 1557 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = Attribute::None;
@@ -4525,8 +4523,8 @@
   ;}
     break;
 
-  case 174:
-#line 1571 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 173:
+#line 1564 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = Attribute::None;
@@ -4536,16 +4534,16 @@
   ;}
     break;
 
-  case 175:
-#line 1578 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 174:
+#line 1571 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 176:
-#line 1586 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 175:
+#line 1579 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal));
@@ -4554,8 +4552,8 @@
   ;}
     break;
 
-  case 177:
-#line 1592 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 176:
+#line 1585 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal));
     delete (yyvsp[(3) - (3)].TypeVal);
@@ -4563,8 +4561,8 @@
   ;}
     break;
 
-  case 178:
-#line 1604 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 177:
+#line 1597 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4595,8 +4593,8 @@
   ;}
     break;
 
-  case 179:
-#line 1632 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 178:
+#line 1625 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4615,8 +4613,8 @@
   ;}
     break;
 
-  case 180:
-#line 1648 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 179:
+#line 1641 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4646,8 +4644,8 @@
   ;}
     break;
 
-  case 181:
-#line 1675 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 180:
+#line 1668 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4678,8 +4676,8 @@
   ;}
     break;
 
-  case 182:
-#line 1703 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 181:
+#line 1696 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (STy == 0)
@@ -4708,8 +4706,8 @@
   ;}
     break;
 
-  case 183:
-#line 1729 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 182:
+#line 1722 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4732,8 +4730,8 @@
   ;}
     break;
 
-  case 184:
-#line 1749 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 183:
+#line 1742 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (6)].TypeVal)->get());
     if (STy == 0)
@@ -4762,8 +4760,8 @@
   ;}
     break;
 
-  case 185:
-#line 1775 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 184:
+#line 1768 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription());
@@ -4786,8 +4784,8 @@
   ;}
     break;
 
-  case 186:
-#line 1795 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 185:
+#line 1788 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4802,8 +4800,8 @@
   ;}
     break;
 
-  case 187:
-#line 1807 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 186:
+#line 1800 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4813,8 +4811,8 @@
   ;}
     break;
 
-  case 188:
-#line 1814 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 187:
+#line 1807 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4883,8 +4881,8 @@
   ;}
     break;
 
-  case 189:
-#line 1880 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 188:
+#line 1873 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4897,8 +4895,8 @@
   ;}
     break;
 
-  case 190:
-#line 1890 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 189:
+#line 1883 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4911,8 +4909,8 @@
   ;}
     break;
 
-  case 191:
-#line 1900 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 190:
+#line 1893 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (IntegerType *IT = dyn_cast<IntegerType>((yyvsp[(1) - (2)].TypeVal)->get())) {
       if (!ConstantInt::isValueValidForType(IT, (yyvsp[(2) - (2)].SInt64Val)))
@@ -4926,8 +4924,8 @@
   ;}
     break;
 
-  case 192:
-#line 1911 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 191:
+#line 1904 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     if (IntegerType *IT = dyn_cast<IntegerType>((yyvsp[(1) - (2)].TypeVal)->get())) {
       if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > IT->getBitWidth())
@@ -4943,8 +4941,8 @@
   ;}
     break;
 
-  case 193:
-#line 1924 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 192:
+#line 1917 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (IntegerType *IT = dyn_cast<IntegerType>((yyvsp[(1) - (2)].TypeVal)->get())) {
       if (!ConstantInt::isValueValidForType(IT, (yyvsp[(2) - (2)].UInt64Val)))
@@ -4958,8 +4956,8 @@
   ;}
     break;
 
-  case 194:
-#line 1935 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 193:
+#line 1928 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     if (IntegerType *IT = dyn_cast<IntegerType>((yyvsp[(1) - (2)].TypeVal)->get())) {
       if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > IT->getBitWidth())
@@ -4976,8 +4974,8 @@
   ;}
     break;
 
-  case 195:
-#line 1949 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 194:
+#line 1942 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     if ((yyvsp[(1) - (2)].TypeVal)->get() != Type::Int1Ty)
       GEN_ERROR("Constant true must have type i1");
@@ -4987,8 +4985,8 @@
   ;}
     break;
 
-  case 196:
-#line 1956 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 195:
+#line 1949 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     if ((yyvsp[(1) - (2)].TypeVal)->get() != Type::Int1Ty)
       GEN_ERROR("Constant false must have type i1");
@@ -4998,8 +4996,8 @@
   ;}
     break;
 
-  case 197:
-#line 1963 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 196:
+#line 1956 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                   // Floating point constants
     if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].TypeVal)->get(), *(yyvsp[(2) - (2)].FPVal)))
       GEN_ERROR("Floating point constant invalid for type");
@@ -5018,8 +5016,8 @@
   ;}
     break;
 
-  case 198:
-#line 1981 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 197:
+#line 1974 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
@@ -5034,8 +5032,8 @@
   ;}
     break;
 
-  case 199:
-#line 1993 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 198:
+#line 1986 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
@@ -5059,8 +5057,8 @@
   ;}
     break;
 
-  case 200:
-#line 2014 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 199:
+#line 2007 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
@@ -5071,8 +5069,8 @@
   ;}
     break;
 
-  case 201:
-#line 2022 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 200:
+#line 2015 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
@@ -5081,8 +5079,8 @@
   ;}
     break;
 
-  case 202:
-#line 2028 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 201:
+#line 2021 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
@@ -5096,8 +5094,8 @@
   ;}
     break;
 
-  case 203:
-#line 2039 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 202:
+#line 2032 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
@@ -5105,8 +5103,8 @@
   ;}
     break;
 
-  case 204:
-#line 2044 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 203:
+#line 2037 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
@@ -5114,8 +5112,8 @@
   ;}
     break;
 
-  case 205:
-#line 2049 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 204:
+#line 2042 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vicmp operand types must match");
@@ -5123,8 +5121,8 @@
   ;}
     break;
 
-  case 206:
-#line 2054 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 205:
+#line 2047 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vfcmp operand types must match");
@@ -5132,8 +5130,8 @@
   ;}
     break;
 
-  case 207:
-#line 2059 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 206:
+#line 2052 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -5142,8 +5140,8 @@
   ;}
     break;
 
-  case 208:
-#line 2065 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 207:
+#line 2058 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -5152,8 +5150,8 @@
   ;}
     break;
 
-  case 209:
-#line 2071 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 208:
+#line 2064 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -5162,8 +5160,8 @@
   ;}
     break;
 
-  case 210:
-#line 2077 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 209:
+#line 2070 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (5)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("ExtractValue requires an aggregate operand");
@@ -5174,8 +5172,8 @@
   ;}
     break;
 
-  case 211:
-#line 2085 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 210:
+#line 2078 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (7)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (7)].ConstVal)->getType()))
       GEN_ERROR("InsertValue requires an aggregate operand");
@@ -5186,16 +5184,16 @@
   ;}
     break;
 
-  case 212:
-#line 2096 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 211:
+#line 2089 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 213:
-#line 2100 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 212:
+#line 2093 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
@@ -5203,28 +5201,28 @@
   ;}
     break;
 
-  case 214:
-#line 2108 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 213:
+#line 2101 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 215:
-#line 2108 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 214:
+#line 2101 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 216:
-#line 2111 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 215:
+#line 2104 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 217:
-#line 2111 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 216:
+#line 2104 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 218:
-#line 2114 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 217:
+#line 2107 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get();
     Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal));
@@ -5239,8 +5237,8 @@
    ;}
     break;
 
-  case 219:
-#line 2126 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 218:
+#line 2119 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     Constant *Val = (yyvsp[(3) - (6)].ConstVal);
     const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
@@ -5255,8 +5253,8 @@
    ;}
     break;
 
-  case 220:
-#line 2147 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 219:
+#line 2140 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5264,8 +5262,8 @@
   ;}
     break;
 
-  case 221:
-#line 2152 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 220:
+#line 2145 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5273,40 +5271,40 @@
   ;}
     break;
 
-  case 224:
-#line 2165 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 223:
+#line 2158 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
-  case 225:
-#line 2165 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 224:
+#line 2158 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 226:
-#line 2169 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 225:
+#line 2162 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
-  case 227:
-#line 2169 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 226:
+#line 2162 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 228:
-#line 2172 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 227:
+#line 2165 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 229:
-#line 2175 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 228:
+#line 2168 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription());
@@ -5333,8 +5331,8 @@
   ;}
     break;
 
-  case 230:
-#line 2199 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 229:
+#line 2192 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType));
 
@@ -5348,8 +5346,8 @@
   ;}
     break;
 
-  case 231:
-#line 2211 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 230:
+#line 2204 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     /* "Externally Visible" Linkage */
     if ((yyvsp[(5) - (6)].ConstVal) == 0)
@@ -5360,15 +5358,15 @@
   ;}
     break;
 
-  case 232:
-#line 2218 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 231:
+#line 2211 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 233:
-#line 2222 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 232:
+#line 2215 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(6) - (7)].ConstVal) == 0)
       GEN_ERROR("Global value initializer is not a constant");
@@ -5377,15 +5375,15 @@
   ;}
     break;
 
-  case 234:
-#line 2227 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 233:
+#line 2220 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 235:
-#line 2231 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 234:
+#line 2224 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (7)].TypeVal))->getDescription());
@@ -5395,16 +5393,16 @@
   ;}
     break;
 
-  case 236:
-#line 2237 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 235:
+#line 2230 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 237:
-#line 2241 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 236:
+#line 2234 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     std::string Name;
     if ((yyvsp[(1) - (5)].StrVal)) {
@@ -5447,22 +5445,22 @@
   ;}
     break;
 
-  case 238:
-#line 2281 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 237:
+#line 2274 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 239:
-#line 2284 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 238:
+#line 2277 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 240:
-#line 2290 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 239:
+#line 2283 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   if (AsmSoFar.empty())
@@ -5474,24 +5472,24 @@
 ;}
     break;
 
-  case 241:
-#line 2300 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 240:
+#line 2293 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
   ;}
     break;
 
-  case 242:
-#line 2304 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 241:
+#line 2297 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
   ;}
     break;
 
-  case 244:
-#line 2311 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 243:
+#line 2304 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal));
           delete (yyvsp[(3) - (3)].StrVal);
@@ -5499,8 +5497,8 @@
         ;}
     break;
 
-  case 245:
-#line 2316 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 244:
+#line 2309 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal));
           delete (yyvsp[(1) - (1)].StrVal);
@@ -5508,15 +5506,15 @@
         ;}
     break;
 
-  case 246:
-#line 2321 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 245:
+#line 2314 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
-  case 247:
-#line 2330 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 246:
+#line 2323 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -5529,8 +5527,8 @@
   ;}
     break;
 
-  case 248:
-#line 2340 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 247:
+#line 2333 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -5543,16 +5541,16 @@
   ;}
     break;
 
-  case 249:
-#line 2351 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 248:
+#line 2344 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 250:
-#line 2355 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 249:
+#line 2348 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
     struct ArgListEntry E;
@@ -5564,8 +5562,8 @@
   ;}
     break;
 
-  case 251:
-#line 2364 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 250:
+#line 2357 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -5577,16 +5575,16 @@
   ;}
     break;
 
-  case 252:
-#line 2373 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 251:
+#line 2366 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 253:
-#line 2379 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 252:
+#line 2372 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   std::string FunctionName(*(yyvsp[(4) - (11)].StrVal));
   delete (yyvsp[(4) - (11)].StrVal);  // Free strdup'd memory!
@@ -5736,8 +5734,8 @@
 ;}
     break;
 
-  case 256:
-#line 2529 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 255:
+#line 2522 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -5748,16 +5746,16 @@
 ;}
     break;
 
-  case 259:
-#line 2540 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 258:
+#line 2533 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 260:
-#line 2545 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 259:
+#line 2538 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage));
     CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility));
@@ -5767,40 +5765,40 @@
   ;}
     break;
 
-  case 261:
-#line 2557 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 260:
+#line 2550 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 262:
-#line 2561 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 261:
+#line 2554 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 263:
-#line 2566 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 262:
+#line 2559 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 264:
-#line 2570 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 263:
+#line 2563 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 265:
-#line 2574 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 264:
+#line 2567 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     (yyval.ValIDVal) = ValID::create(*(yyvsp[(1) - (1)].APIntVal), true);
     delete (yyvsp[(1) - (1)].APIntVal);
@@ -5808,8 +5806,8 @@
   ;}
     break;
 
-  case 266:
-#line 2579 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 265:
+#line 2572 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     (yyval.ValIDVal) = ValID::create(*(yyvsp[(1) - (1)].APIntVal), false);
     delete (yyvsp[(1) - (1)].APIntVal);
@@ -5817,56 +5815,56 @@
   ;}
     break;
 
-  case 267:
-#line 2584 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 266:
+#line 2577 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 268:
-#line 2588 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 267:
+#line 2581 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 269:
-#line 2592 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 268:
+#line 2585 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 270:
-#line 2596 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 269:
+#line 2589 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 271:
-#line 2600 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 270:
+#line 2593 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 272:
-#line 2604 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 271:
+#line 2597 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 273:
-#line 2608 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 272:
+#line 2601 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     unsigned NumElements = (yyvsp[(2) - (3)].ConstVector)->size();
@@ -5891,8 +5889,8 @@
   ;}
     break;
 
-  case 274:
-#line 2630 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 273:
+#line 2623 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     uint64_t NumElements = (yyvsp[(2) - (3)].ConstVector)->size();
@@ -5917,8 +5915,8 @@
   ;}
     break;
 
-  case 275:
-#line 2652 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 274:
+#line 2645 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Use undef instead of an array because it's inconvenient to determine
     // the element type at this point, there being no elements to examine.
@@ -5927,8 +5925,8 @@
   ;}
     break;
 
-  case 276:
-#line 2658 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 275:
+#line 2651 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     uint64_t NumElements = (yyvsp[(2) - (2)].StrVal)->length();
     const Type *ETy = Type::Int8Ty;
@@ -5944,8 +5942,8 @@
   ;}
     break;
 
-  case 277:
-#line 2671 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 276:
+#line 2664 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(2) - (3)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(2) - (3)].ConstVector)->size(); i != e; ++i)
@@ -5960,8 +5958,8 @@
   ;}
     break;
 
-  case 278:
-#line 2683 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 277:
+#line 2676 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>());
     (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, std::vector<Constant*>()));
@@ -5969,8 +5967,8 @@
   ;}
     break;
 
-  case 279:
-#line 2688 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 278:
+#line 2681 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(3) - (5)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(3) - (5)].ConstVector)->size(); i != e; ++i)
@@ -5985,8 +5983,8 @@
   ;}
     break;
 
-  case 280:
-#line 2700 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 279:
+#line 2693 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>(),
                                             /*isPacked=*/true);
@@ -5995,16 +5993,16 @@
   ;}
     break;
 
-  case 281:
-#line 2706 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 280:
+#line 2699 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 282:
-#line 2710 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 281:
+#line 2703 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createInlineAsm(*(yyvsp[(3) - (5)].StrVal), *(yyvsp[(5) - (5)].StrVal), (yyvsp[(2) - (5)].BoolVal));
     delete (yyvsp[(3) - (5)].StrVal);
@@ -6013,24 +6011,24 @@
   ;}
     break;
 
-  case 283:
-#line 2720 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 282:
+#line 2713 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 284:
-#line 2724 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 283:
+#line 2717 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 285:
-#line 2728 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 284:
+#line 2721 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -6038,8 +6036,8 @@
   ;}
     break;
 
-  case 286:
-#line 2733 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 285:
+#line 2726 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -6047,8 +6045,8 @@
   ;}
     break;
 
-  case 289:
-#line 2746 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 288:
+#line 2739 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -6058,8 +6056,8 @@
   ;}
     break;
 
-  case 290:
-#line 2755 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 289:
+#line 2748 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = new std::vector<Value *>();
     (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal));
@@ -6067,32 +6065,32 @@
   ;}
     break;
 
-  case 291:
-#line 2760 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 290:
+#line 2753 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 292:
-#line 2765 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 291:
+#line 2758 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 293:
-#line 2769 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 292:
+#line 2762 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 294:
-#line 2778 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 293:
+#line 2771 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal));
     CHECK_FOR_ERROR
@@ -6103,8 +6101,8 @@
   ;}
     break;
 
-  case 295:
-#line 2787 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 294:
+#line 2780 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   CHECK_FOR_ERROR
   int ValNum = InsertValue((yyvsp[(3) - (3)].TermInstVal));
@@ -6118,8 +6116,8 @@
 ;}
     break;
 
-  case 296:
-#line 2800 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 295:
+#line 2793 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[(2) - (2)].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -6131,16 +6129,16 @@
   ;}
     break;
 
-  case 297:
-#line 2809 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 296:
+#line 2802 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 298:
-#line 2813 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 297:
+#line 2806 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -6149,8 +6147,8 @@
   ;}
     break;
 
-  case 299:
-#line 2821 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 298:
+#line 2814 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Return with a result...
     ValueList &VL = *(yyvsp[(2) - (2)].ValueList);
     assert(!VL.empty() && "Invalid ret operands!");
@@ -6173,16 +6171,16 @@
   ;}
     break;
 
-  case 300:
-#line 2841 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 299:
+#line 2834 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
     (yyval.TermInstVal) = ReturnInst::Create();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 301:
-#line 2845 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 300:
+#line 2838 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6190,8 +6188,8 @@
   ;}
     break;
 
-  case 302:
-#line 2850 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 301:
+#line 2843 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (cast<IntegerType>((yyvsp[(2) - (9)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Branch condition must have type i1");
@@ -6205,8 +6203,8 @@
   ;}
     break;
 
-  case 303:
-#line 2861 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 302:
+#line 2854 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6228,8 +6226,8 @@
   ;}
     break;
 
-  case 304:
-#line 2880 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 303:
+#line 2873 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6241,8 +6239,8 @@
   ;}
     break;
 
-  case 305:
-#line 2890 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 304:
+#line 2883 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6348,24 +6346,24 @@
   ;}
     break;
 
-  case 306:
-#line 2993 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 305:
+#line 2986 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 307:
-#line 2997 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 306:
+#line 2990 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 308:
-#line 3004 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 307:
+#line 2997 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal)));
@@ -6379,8 +6377,8 @@
   ;}
     break;
 
-  case 309:
-#line 3015 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 308:
+#line 3008 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal)));
@@ -6395,8 +6393,8 @@
   ;}
     break;
 
-  case 310:
-#line 3028 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 309:
+#line 3021 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
     setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal));
@@ -6407,8 +6405,8 @@
   ;}
     break;
 
-  case 311:
-#line 3037 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 310:
+#line 3030 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
     int ValNum = InsertValue((yyvsp[(2) - (2)].InstVal));
@@ -6422,8 +6420,8 @@
   ;}
     break;
 
-  case 312:
-#line 3050 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 311:
+#line 3043 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription());
@@ -6437,8 +6435,8 @@
   ;}
     break;
 
-  case 313:
-#line 3061 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 312:
+#line 3054 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList);
     Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList)->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal));
@@ -6449,8 +6447,8 @@
   ;}
     break;
 
-  case 314:
-#line 3071 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 313:
+#line 3064 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -6464,8 +6462,8 @@
   ;}
     break;
 
-  case 315:
-#line 3082 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 314:
+#line 3075 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     // Labels are only valid in ASMs
@@ -6476,8 +6474,8 @@
   ;}
     break;
 
-  case 316:
-#line 3090 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 315:
+#line 3083 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -6490,8 +6488,8 @@
   ;}
     break;
 
-  case 317:
-#line 3100 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 316:
+#line 3093 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList);
@@ -6501,18 +6499,18 @@
   ;}
     break;
 
-  case 318:
-#line 3107 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 317:
+#line 3100 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamList) = new ParamList(); ;}
     break;
 
-  case 319:
-#line 3110 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 318:
+#line 3103 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
-  case 320:
-#line 3111 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 319:
+#line 3104 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
     (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
@@ -6520,8 +6518,8 @@
   ;}
     break;
 
-  case 321:
-#line 3119 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 320:
+#line 3112 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = new std::vector<unsigned>();
     if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
@@ -6530,8 +6528,8 @@
   ;}
     break;
 
-  case 322:
-#line 3125 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 321:
+#line 3118 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = (yyvsp[(1) - (3)].ConstantList);
     if ((unsigned)(yyvsp[(3) - (3)].UInt64Val) != (yyvsp[(3) - (3)].UInt64Val))
@@ -6541,24 +6539,24 @@
   ;}
     break;
 
-  case 323:
-#line 3134 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 322:
+#line 3127 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 324:
-#line 3138 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 323:
+#line 3131 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 325:
-#line 3143 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 324:
+#line 3136 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6577,8 +6575,8 @@
   ;}
     break;
 
-  case 326:
-#line 3159 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 325:
+#line 3152 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6598,8 +6596,8 @@
   ;}
     break;
 
-  case 327:
-#line 3176 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 326:
+#line 3169 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6614,8 +6612,8 @@
   ;}
     break;
 
-  case 328:
-#line 3188 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 327:
+#line 3181 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6630,8 +6628,8 @@
   ;}
     break;
 
-  case 329:
-#line 3200 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 328:
+#line 3193 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6648,8 +6646,8 @@
   ;}
     break;
 
-  case 330:
-#line 3214 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 329:
+#line 3207 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6666,8 +6664,8 @@
   ;}
     break;
 
-  case 331:
-#line 3228 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 330:
+#line 3221 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6682,8 +6680,8 @@
   ;}
     break;
 
-  case 332:
-#line 3240 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 331:
+#line 3233 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (isa<VectorType>((yyvsp[(2) - (6)].ValueVal)->getType())) {
       // vector select
@@ -6707,8 +6705,8 @@
   ;}
     break;
 
-  case 333:
-#line 3261 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 332:
+#line 3254 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6718,8 +6716,8 @@
   ;}
     break;
 
-  case 334:
-#line 3268 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 333:
+#line 3261 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -6728,8 +6726,8 @@
   ;}
     break;
 
-  case 335:
-#line 3274 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 334:
+#line 3267 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -6738,8 +6736,8 @@
   ;}
     break;
 
-  case 336:
-#line 3280 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 335:
+#line 3273 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -6748,8 +6746,8 @@
   ;}
     break;
 
-  case 337:
-#line 3286 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 336:
+#line 3279 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -6767,8 +6765,8 @@
   ;}
     break;
 
-  case 338:
-#line 3302 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 337:
+#line 3295 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6880,32 +6878,32 @@
   ;}
     break;
 
-  case 339:
-#line 3411 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 338:
+#line 3404 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 340:
-#line 3416 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 339:
+#line 3409 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 341:
-#line 3420 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 340:
+#line 3413 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 342:
-#line 3427 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 341:
+#line 3420 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6915,8 +6913,8 @@
   ;}
     break;
 
-  case 343:
-#line 3434 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 342:
+#line 3427 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6929,8 +6927,8 @@
   ;}
     break;
 
-  case 344:
-#line 3444 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 343:
+#line 3437 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6940,8 +6938,8 @@
   ;}
     break;
 
-  case 345:
-#line 3451 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 344:
+#line 3444 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6954,8 +6952,8 @@
   ;}
     break;
 
-  case 346:
-#line 3461 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 345:
+#line 3454 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(2) - (2)].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " +
@@ -6965,8 +6963,8 @@
   ;}
     break;
 
-  case 347:
-#line 3469 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 346:
+#line 3462 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -6983,8 +6981,8 @@
   ;}
     break;
 
-  case 348:
-#line 3483 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 347:
+#line 3476 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription());
@@ -7004,8 +7002,8 @@
   ;}
     break;
 
-  case 349:
-#line 3500 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 348:
+#line 3493 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -7022,8 +7020,8 @@
   ;}
     break;
 
-  case 350:
-#line 3514 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 349:
+#line 3507 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -7041,8 +7039,8 @@
   ;}
     break;
 
-  case 351:
-#line 3529 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 350:
+#line 3522 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -7060,8 +7058,8 @@
   ;}
     break;
 
-  case 352:
-#line 3544 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 351:
+#line 3537 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (7)].TypeVal))->getDescription());
@@ -7083,7 +7081,7 @@
 
 
 /* Line 1267 of yacc.c.  */
-#line 7087 "llvmAsmParser.tab.c"
+#line 7085 "llvmAsmParser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -7297,7 +7295,7 @@
 }
 
 
-#line 3563 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+#line 3556 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs?rev=61150&r1=61149&r2=61150&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs Wed Dec 17 14:59:57 2008
@@ -184,8 +184,8 @@
      SRET = 400,
      NOUNWIND = 401,
      NOALIAS = 402,
-     NOCAPTURE = 403,
-     BYVAL = 404,
+     BYVAL = 403,
+     NEST = 404,
      READNONE = 405,
      READONLY = 406,
      GC = 407,
@@ -194,10 +194,9 @@
      ALWAYSINLINE = 410,
      SSP = 411,
      SSPREQ = 412,
-     NEST = 413,
-     DEFAULT = 414,
-     HIDDEN = 415,
-     PROTECTED = 416
+     DEFAULT = 413,
+     HIDDEN = 414,
+     PROTECTED = 415
    };
 #endif
 /* Tokens.  */
@@ -346,8 +345,8 @@
 #define SRET 400
 #define NOUNWIND 401
 #define NOALIAS 402
-#define NOCAPTURE 403
-#define BYVAL 404
+#define BYVAL 403
+#define NEST 404
 #define READNONE 405
 #define READONLY 406
 #define GC 407
@@ -356,17 +355,16 @@
 #define ALWAYSINLINE 410
 #define SSP 411
 #define SSPREQ 412
-#define NEST 413
-#define DEFAULT 414
-#define HIDDEN 415
-#define PROTECTED 416
+#define DEFAULT 413
+#define HIDDEN 414
+#define PROTECTED 415
 
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 986 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+#line 986 "/Volumes/Gir/devel/llvm/llvm.src/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -414,8 +412,8 @@
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
 }
-/* Line 1489 of yacc.c.  */
-#line 419 "llvmAsmParser.tab.h"
+/* Line 1529 of yacc.c.  */
+#line 417 "llvmAsmParser.tab.h"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs?rev=61150&r1=61149&r2=61150&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Wed Dec 17 14:59:57 2008
@@ -1136,8 +1136,8 @@
 %token <OtherOpVal> EXTRACTVALUE INSERTVALUE
 
 // Function Attributes
-%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS NOCAPTURE BYVAL
-%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ NEST
+%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST
+%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ
 
 // Visibility Styles
 %token DEFAULT HIDDEN PROTECTED
@@ -1265,16 +1265,15 @@
                   CHECK_FOR_ERROR
                  };
 
-Attribute     : ZEROEXT   { $$ = Attribute::ZExt;      }
-              | ZEXT      { $$ = Attribute::ZExt;      }
-              | SIGNEXT   { $$ = Attribute::SExt;      }
-              | SEXT      { $$ = Attribute::SExt;      }
-              | INREG     { $$ = Attribute::InReg;     }
-              | SRET      { $$ = Attribute::StructRet; }
-              | NOALIAS   { $$ = Attribute::NoAlias;   }
-              | NOCAPTURE { $$ = Attribute::NoCapture; }
-              | BYVAL     { $$ = Attribute::ByVal;     }
-              | NEST      { $$ = Attribute::Nest;      }
+Attribute     : ZEROEXT { $$ = Attribute::ZExt;      }
+              | ZEXT    { $$ = Attribute::ZExt;      }
+              | SIGNEXT { $$ = Attribute::SExt;      }
+              | SEXT    { $$ = Attribute::SExt;      }
+              | INREG   { $$ = Attribute::InReg;     }
+              | SRET    { $$ = Attribute::StructRet; }
+              | NOALIAS { $$ = Attribute::NoAlias;   }
+              | BYVAL   { $$ = Attribute::ByVal;     }
+              | NEST    { $$ = Attribute::Nest;      }
               | ALIGN EUINT64VAL { $$ =
                           Attribute::constructAlignmentFromInt($2);    }
               ;
@@ -1285,10 +1284,9 @@
               }
               ;
 
-RetAttr       : INREG    { $$ = Attribute::InReg;    }
+RetAttr       : INREG    { $$ = Attribute::InReg;     }
               | ZEROEXT  { $$ = Attribute::ZExt;     }
               | SIGNEXT  { $$ = Attribute::SExt;     }
-              | NOALIAS  { $$ = Attribute::NoAlias;  }
               ;
 
 OptRetAttrs  : /* empty */ { $$ = Attribute::None; }
@@ -1332,8 +1330,6 @@
   $$ = $2;
   if ($$ != 0 && !isPowerOf2_32($$))
     GEN_ERROR("Alignment must be a power of two");
-  if ($$ > 0x40000000)
-    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 };
 OptCAlign : /*empty*/            { $$ = 0; } |
@@ -1341,8 +1337,6 @@
   $$ = $3;
   if ($$ != 0 && !isPowerOf2_32($$))
     GEN_ERROR("Alignment must be a power of two");
-  if ($$ > 0x40000000)
-    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 };
 
@@ -1372,8 +1366,6 @@
   | ALIGN EUINT64VAL {
     if ($2 != 0 && !isPowerOf2_32($2))
       GEN_ERROR("Alignment must be a power of two");
-    if ($2 > 0x40000000)
-      GEN_ERROR("Alignment too large");
     CurGV->setAlignment($2);
     CHECK_FOR_ERROR
   };




From sabre at nondot.org  Wed Dec 17 15:39:51 2008
From: sabre at nondot.org (Chris Lattner)
Date: Wed, 17 Dec 2008 21:39:51 -0000
Subject: [llvm-commits] [llvm] r61153 - in /llvm/trunk:
	include/llvm-c/Core.h lib/VMCore/Core.cpp
Message-ID: <200812172139.mBHLdqMC017831@zion.cs.uiuc.edu>

Author: lattner
Date: Wed Dec 17 15:39:50 2008
New Revision: 61153

URL: http://llvm.org/viewvc/llvm-project?rev=61153&view=rev
Log:
This adds some missing functions to the C binding:
- ability to insert previously created instructions using a builder
- creation of aliases
- creation of inline asm constants

Patch by Zoltan Varga!


Modified:
    llvm/trunk/include/llvm-c/Core.h
    llvm/trunk/lib/VMCore/Core.cpp

Modified: llvm/trunk/include/llvm-c/Core.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/Core.h?rev=61153&r1=61152&r2=61153&view=diff

==============================================================================
--- llvm/trunk/include/llvm-c/Core.h (original)
+++ llvm/trunk/include/llvm-c/Core.h Wed Dec 17 15:39:50 2008
@@ -376,6 +376,9 @@
 LLVMValueRef LLVMConstInsertValue(LLVMValueRef AggConstant,
                                   LLVMValueRef ElementValueConstant,
                                   unsigned *IdxList, unsigned NumIdx);
+LLVMValueRef LLVMConstInlineAsm(LLVMTypeRef Ty, 
+                                const char *AsmString, const char *Constraints,
+                                int HasSideEffects);
 
 /* Operations on global variables, functions, and aliases (globals) */
 LLVMModuleRef LLVMGetGlobalParent(LLVMValueRef Global);
@@ -404,6 +407,10 @@
 int LLVMIsGlobalConstant(LLVMValueRef GlobalVar);
 void LLVMSetGlobalConstant(LLVMValueRef GlobalVar, int IsConstant);
 
+/* Operations on aliases */
+LLVMValueRef LLVMAddAlias(LLVMModuleRef M, LLVMTypeRef Ty, LLVMValueRef Aliasee,
+                          const char *Name);
+
 /* Operations on functions */
 LLVMValueRef LLVMAddFunction(LLVMModuleRef M, const char *Name,
                              LLVMTypeRef FunctionTy);
@@ -488,6 +495,8 @@
 void LLVMPositionBuilderBefore(LLVMBuilderRef Builder, LLVMValueRef Instr);
 void LLVMPositionBuilderAtEnd(LLVMBuilderRef Builder, LLVMBasicBlockRef Block);
 LLVMBasicBlockRef LLVMGetInsertBlock(LLVMBuilderRef Builder);
+void LLVMClearInsertionPosition(LLVMBuilderRef Builder);
+void LLVMInsertIntoBuilder(LLVMBuilderRef Builder, LLVMValueRef Instr);
 void LLVMDisposeBuilder(LLVMBuilderRef Builder);
 
 /* Terminators */

Modified: llvm/trunk/lib/VMCore/Core.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Core.cpp?rev=61153&r1=61152&r2=61153&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Core.cpp (original)
+++ llvm/trunk/lib/VMCore/Core.cpp Wed Dec 17 15:39:50 2008
@@ -17,8 +17,10 @@
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
 #include "llvm/GlobalVariable.h"
+#include "llvm/GlobalAlias.h"
 #include "llvm/TypeSymbolTable.h"
 #include "llvm/ModuleProvider.h"
+#include "llvm/InlineAsm.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/CallSite.h"
 #include <cassert>
@@ -555,6 +557,12 @@
                                            IdxList, NumIdx));
 }
 
+LLVMValueRef LLVMConstInlineAsm(LLVMTypeRef Ty, const char *AsmString, 
+                                const char *Constraints, int HasSideEffects) {
+  return wrap(InlineAsm::get(dyn_cast<FunctionType>(unwrap(Ty)), AsmString, 
+                             Constraints, HasSideEffects));
+}
+
 /*--.. Operations on global variables, functions, and aliases (globals) ....--*/
 
 LLVMModuleRef LLVMGetGlobalParent(LLVMValueRef Global) {
@@ -673,6 +681,14 @@
   unwrap<GlobalVariable>(GlobalVar)->setConstant(IsConstant != 0);
 }
 
+/*--.. Operations on aliases ......................................--*/
+
+LLVMValueRef LLVMAddAlias(LLVMModuleRef M, LLVMTypeRef Ty, LLVMValueRef Aliasee,
+                          const char *Name) {
+  return wrap(new GlobalAlias(unwrap(Ty), GlobalValue::ExternalLinkage, Name,
+                              unwrap<Constant>(Aliasee), unwrap (M)));
+}
+
 /*--.. Operations on functions .............................................--*/
 
 LLVMValueRef LLVMAddFunction(LLVMModuleRef M, const char *Name,
@@ -1038,6 +1054,14 @@
    return wrap(unwrap(Builder)->GetInsertBlock());
 }
 
+void LLVMClearInsertionPosition(LLVMBuilderRef Builder) {
+  unwrap(Builder)->ClearInsertionPoint ();
+}
+
+void LLVMInsertIntoBuilder(LLVMBuilderRef Builder, LLVMValueRef Instr) {
+  unwrap(Builder)->Insert(unwrap<Instruction>(Instr));
+}
+
 void LLVMDisposeBuilder(LLVMBuilderRef Builder) {
   delete unwrap(Builder);
 }




From kremenek at apple.com  Wed Dec 17 15:50:56 2008
From: kremenek at apple.com (Ted Kremenek)
Date: Wed, 17 Dec 2008 21:50:56 -0000
Subject: [llvm-commits] [llvm] r61156 - /llvm/tags/checker/checker-135/
Message-ID: <200812172150.mBHLouiR018240@zion.cs.uiuc.edu>

Author: kremenek
Date: Wed Dec 17 15:50:55 2008
New Revision: 61156

URL: http://llvm.org/viewvc/llvm-project?rev=61156&view=rev
Log:
Tagging checker-135.

Added:
    llvm/tags/checker/checker-135/
      - copied from r61155, llvm/trunk/



From resistor at mac.com  Wed Dec 17 16:07:01 2008
From: resistor at mac.com (Owen Anderson)
Date: Wed, 17 Dec 2008 22:07:01 -0000
Subject: [llvm-commits] [llvm] r61158 -
	/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp
Message-ID: <200812172207.mBHM71b6018814@zion.cs.uiuc.edu>

Author: resistor
Date: Wed Dec 17 16:06:59 2008
New Revision: 61158

URL: http://llvm.org/viewvc/llvm-project?rev=61158&view=rev
Log:
Fix miscompilations caused by renumbering, and enable it as part of prealloc splitting.

Modified:
    llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp

Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=61158&r1=61157&r2=61158&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original)
+++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Wed Dec 17 16:06:59 2008
@@ -41,6 +41,7 @@
 STATISTIC(NumSplits, "Number of intervals split");
 STATISTIC(NumRemats, "Number of intervals split by rematerialization");
 STATISTIC(NumFolds, "Number of intervals split with spill folding");
+STATISTIC(NumRenumbers, "Number of intervals renumbered into new registers");
 
 namespace {
   class VISIBILITY_HIDDEN PreAllocSplitting : public MachineFunctionPass {
@@ -137,7 +138,7 @@
 
     void UpdateSpillSlotInterval(VNInfo*, unsigned, unsigned);
 
-    void UpdateRegisterInterval(VNInfo*, unsigned, unsigned);
+    VNInfo* UpdateRegisterInterval(VNInfo*, unsigned, unsigned);
 
     bool ShrinkWrapToLastUse(MachineBasicBlock*, VNInfo*,
                              SmallVector<MachineOperand*, 4>&,
@@ -409,7 +410,7 @@
 /// UpdateRegisterInterval - Given the specified val# of the current live
 /// interval is being split, and the spill and restore indices, update the live
 /// interval accordingly.
-void
+VNInfo*
 PreAllocSplitting::UpdateRegisterInterval(VNInfo *ValNo, unsigned SpillIndex,
                                           unsigned RestoreIndex) {
   assert(LIs->getMBBFromIndex(RestoreIndex) == BarrierMBB &&
@@ -512,6 +513,8 @@
     unsigned End   = After[i].second;
     CurrLI->addRange(LiveRange(Start, End, AValNo));
   }
+  
+  return AValNo;
 }
 
 /// ShrinkWrapToLastUse - There are uses of the current live interval in the
@@ -700,17 +703,14 @@
   ShrinkWrapLiveInterval(ValNo, BarrierMBB, NULL, DefMI->getParent(), Visited,
                          Uses, UseMIs, UseMBBs);
 
-#if 0
-  if (!ValNo->hasPHIKill)
-    RenumberValno();
-#endif
-  // FIXME: If ValNo->hasPHIKill is false, then renumber the val# by
-  // the restore.
-
   // Remove live range from barrier to the restore. FIXME: Find a better
   // point to re-start the live interval.
-  UpdateRegisterInterval(ValNo, LIs->getUseIndex(BarrierIdx)+1,
-                         LIs->getDefIndex(RestoreIdx));
+  VNInfo* AfterValNo = UpdateRegisterInterval(ValNo,
+                                              LIs->getUseIndex(BarrierIdx)+1,
+                                              LIs->getDefIndex(RestoreIdx));
+  // Attempt to renumber the new valno into a new vreg.
+  if (!AfterValNo->hasPHIKill)
+    RenumberValno(AfterValNo);
 }
 
 /// RenumberValno - Split the given valno out into a new vreg, allowing it to
@@ -722,15 +722,41 @@
   // Create the new vreg
   unsigned NewVReg = MRI->createVirtualRegister(MRI->getRegClass(CurrLI->reg));
   
-  // Copy over the valno and ranges
+  // Create the new live interval
   LiveInterval& NewLI = LIs->getOrCreateInterval(NewVReg);
-  VNInfo* NewVN = NewLI.getNextValue(VN->def, VN->copy, 
-                                     LIs->getVNInfoAllocator());
-  NewLI.copyValNumInfo(NewVN, VN);
-  NewLI.MergeValueInAsValue(*CurrLI, VN, NewVN);
+  SmallVector<VNInfo*, 4> VNsToCopy;
+  VNsToCopy.push_back(VN);
+
+  // Walk through and copy the valno we care about, and any other valnos
+  // that are two-address redefinitions of the one we care about.  These
+  // will need to be rewritten as well.
+  while (!VNsToCopy.empty()) {
+    VNInfo* OldVN = VNsToCopy.back();
+    VNsToCopy.pop_back();
+    
+    // Copy the valno over
+    VNInfo* NewVN = NewLI.getNextValue(OldVN->def, OldVN->copy, 
+                                       LIs->getVNInfoAllocator());
+    NewLI.copyValNumInfo(NewVN, OldVN);
+    NewLI.MergeValueInAsValue(*CurrLI, OldVN, NewVN);
+
+    // Locate two-address redefinitions
+    for (SmallVector<unsigned, 4>::iterator KI = NewVN->kills.begin(),
+         KE = NewVN->kills.end(); KI != KE; ++KI) {
+      MachineInstr* MI = LIs->getInstructionFromIndex(*KI);
+      unsigned DefIdx = MI->findRegisterDefOperandIdx(CurrLI->reg);
+      if (DefIdx == ~0U) continue;
+      if (MI->isRegReDefinedByTwoAddr(DefIdx)) {
+        VNInfo* NextVN =
+                     CurrLI->findDefinedVNInfo(LiveIntervals::getDefIndex(*KI));
+        VNsToCopy.push_back(NextVN);
+      }
+    }
+
+    // Remove the valno from the old interval
+    CurrLI->removeValNo(OldVN);
+  }
   
-  // Remove the valno from the old interval
-  CurrLI->removeValNo(VN);
   
   // Rewrite defs and uses.  This is done in two stages to avoid invalidating
   // the reg_iterator.
@@ -753,6 +779,8 @@
     MachineOperand& MO = Inst->getOperand(OpIdx);
     MO.setReg(NewVReg);
   }
+  
+  NumRenumbers++;
 }
 
 bool PreAllocSplitting::Rematerialize(unsigned vreg, VNInfo* ValNo,
@@ -1097,8 +1125,6 @@
   // Make sure blocks are numbered in order.
   MF.RenumberBlocks();
 
-#if 1
-  // FIXME: Go top down.
   MachineBasicBlock *Entry = MF.begin();
   SmallPtrSet<MachineBasicBlock*,16> Visited;
 
@@ -1117,22 +1143,6 @@
       MadeChange |= SplitRegLiveIntervals(BarrierRCs);
     }
   }
-#else
-  for (MachineFunction::reverse_iterator I = MF.rbegin(), E = MF.rend();
-       I != E; ++I) {
-    BarrierMBB = &*I;
-    for (MachineBasicBlock::reverse_iterator II = BarrierMBB->rbegin(),
-           EE = BarrierMBB->rend(); II != EE; ++II) {
-      Barrier = &*II;
-      const TargetRegisterClass **BarrierRCs =
-        Barrier->getDesc().getRegClassBarriers();
-      if (!BarrierRCs)
-        continue;
-      BarrierIdx = LIs->getInstructionIndex(Barrier);
-      MadeChange |= SplitRegLiveIntervals(BarrierRCs);
-    }
-  }
-#endif
 
   return MadeChange;
 }




From resistor at mac.com  Wed Dec 17 16:17:28 2008
From: resistor at mac.com (Owen Anderson)
Date: Wed, 17 Dec 2008 22:17:28 -0000
Subject: [llvm-commits] [llvm] r61159 -
	/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp
Message-ID: <200812172217.mBHMHUt4019254@zion.cs.uiuc.edu>

Author: resistor
Date: Wed Dec 17 16:17:27 2008
New Revision: 61159

URL: http://llvm.org/viewvc/llvm-project?rev=61159&view=rev
Log:
Revert r61158 for now, as it caused some test failures.

Modified:
    llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp

Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=61159&r1=61158&r2=61159&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original)
+++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Wed Dec 17 16:17:27 2008
@@ -41,7 +41,6 @@
 STATISTIC(NumSplits, "Number of intervals split");
 STATISTIC(NumRemats, "Number of intervals split by rematerialization");
 STATISTIC(NumFolds, "Number of intervals split with spill folding");
-STATISTIC(NumRenumbers, "Number of intervals renumbered into new registers");
 
 namespace {
   class VISIBILITY_HIDDEN PreAllocSplitting : public MachineFunctionPass {
@@ -138,7 +137,7 @@
 
     void UpdateSpillSlotInterval(VNInfo*, unsigned, unsigned);
 
-    VNInfo* UpdateRegisterInterval(VNInfo*, unsigned, unsigned);
+    void UpdateRegisterInterval(VNInfo*, unsigned, unsigned);
 
     bool ShrinkWrapToLastUse(MachineBasicBlock*, VNInfo*,
                              SmallVector<MachineOperand*, 4>&,
@@ -410,7 +409,7 @@
 /// UpdateRegisterInterval - Given the specified val# of the current live
 /// interval is being split, and the spill and restore indices, update the live
 /// interval accordingly.
-VNInfo*
+void
 PreAllocSplitting::UpdateRegisterInterval(VNInfo *ValNo, unsigned SpillIndex,
                                           unsigned RestoreIndex) {
   assert(LIs->getMBBFromIndex(RestoreIndex) == BarrierMBB &&
@@ -513,8 +512,6 @@
     unsigned End   = After[i].second;
     CurrLI->addRange(LiveRange(Start, End, AValNo));
   }
-  
-  return AValNo;
 }
 
 /// ShrinkWrapToLastUse - There are uses of the current live interval in the
@@ -703,14 +700,17 @@
   ShrinkWrapLiveInterval(ValNo, BarrierMBB, NULL, DefMI->getParent(), Visited,
                          Uses, UseMIs, UseMBBs);
 
+#if 0
+  if (!ValNo->hasPHIKill)
+    RenumberValno();
+#endif
+  // FIXME: If ValNo->hasPHIKill is false, then renumber the val# by
+  // the restore.
+
   // Remove live range from barrier to the restore. FIXME: Find a better
   // point to re-start the live interval.
-  VNInfo* AfterValNo = UpdateRegisterInterval(ValNo,
-                                              LIs->getUseIndex(BarrierIdx)+1,
-                                              LIs->getDefIndex(RestoreIdx));
-  // Attempt to renumber the new valno into a new vreg.
-  if (!AfterValNo->hasPHIKill)
-    RenumberValno(AfterValNo);
+  UpdateRegisterInterval(ValNo, LIs->getUseIndex(BarrierIdx)+1,
+                         LIs->getDefIndex(RestoreIdx));
 }
 
 /// RenumberValno - Split the given valno out into a new vreg, allowing it to
@@ -722,41 +722,15 @@
   // Create the new vreg
   unsigned NewVReg = MRI->createVirtualRegister(MRI->getRegClass(CurrLI->reg));
   
-  // Create the new live interval
+  // Copy over the valno and ranges
   LiveInterval& NewLI = LIs->getOrCreateInterval(NewVReg);
-  SmallVector<VNInfo*, 4> VNsToCopy;
-  VNsToCopy.push_back(VN);
-
-  // Walk through and copy the valno we care about, and any other valnos
-  // that are two-address redefinitions of the one we care about.  These
-  // will need to be rewritten as well.
-  while (!VNsToCopy.empty()) {
-    VNInfo* OldVN = VNsToCopy.back();
-    VNsToCopy.pop_back();
-    
-    // Copy the valno over
-    VNInfo* NewVN = NewLI.getNextValue(OldVN->def, OldVN->copy, 
-                                       LIs->getVNInfoAllocator());
-    NewLI.copyValNumInfo(NewVN, OldVN);
-    NewLI.MergeValueInAsValue(*CurrLI, OldVN, NewVN);
-
-    // Locate two-address redefinitions
-    for (SmallVector<unsigned, 4>::iterator KI = NewVN->kills.begin(),
-         KE = NewVN->kills.end(); KI != KE; ++KI) {
-      MachineInstr* MI = LIs->getInstructionFromIndex(*KI);
-      unsigned DefIdx = MI->findRegisterDefOperandIdx(CurrLI->reg);
-      if (DefIdx == ~0U) continue;
-      if (MI->isRegReDefinedByTwoAddr(DefIdx)) {
-        VNInfo* NextVN =
-                     CurrLI->findDefinedVNInfo(LiveIntervals::getDefIndex(*KI));
-        VNsToCopy.push_back(NextVN);
-      }
-    }
-
-    // Remove the valno from the old interval
-    CurrLI->removeValNo(OldVN);
-  }
+  VNInfo* NewVN = NewLI.getNextValue(VN->def, VN->copy, 
+                                     LIs->getVNInfoAllocator());
+  NewLI.copyValNumInfo(NewVN, VN);
+  NewLI.MergeValueInAsValue(*CurrLI, VN, NewVN);
   
+  // Remove the valno from the old interval
+  CurrLI->removeValNo(VN);
   
   // Rewrite defs and uses.  This is done in two stages to avoid invalidating
   // the reg_iterator.
@@ -779,8 +753,6 @@
     MachineOperand& MO = Inst->getOperand(OpIdx);
     MO.setReg(NewVReg);
   }
-  
-  NumRenumbers++;
 }
 
 bool PreAllocSplitting::Rematerialize(unsigned vreg, VNInfo* ValNo,
@@ -1125,6 +1097,8 @@
   // Make sure blocks are numbered in order.
   MF.RenumberBlocks();
 
+#if 1
+  // FIXME: Go top down.
   MachineBasicBlock *Entry = MF.begin();
   SmallPtrSet<MachineBasicBlock*,16> Visited;
 
@@ -1143,6 +1117,22 @@
       MadeChange |= SplitRegLiveIntervals(BarrierRCs);
     }
   }
+#else
+  for (MachineFunction::reverse_iterator I = MF.rbegin(), E = MF.rend();
+       I != E; ++I) {
+    BarrierMBB = &*I;
+    for (MachineBasicBlock::reverse_iterator II = BarrierMBB->rbegin(),
+           EE = BarrierMBB->rend(); II != EE; ++II) {
+      Barrier = &*II;
+      const TargetRegisterClass **BarrierRCs =
+        Barrier->getDesc().getRegClassBarriers();
+      if (!BarrierRCs)
+        continue;
+      BarrierIdx = LIs->getInstructionIndex(Barrier);
+      MadeChange |= SplitRegLiveIntervals(BarrierRCs);
+    }
+  }
+#endif
 
   return MadeChange;
 }




From dpatel at apple.com  Wed Dec 17 16:39:30 2008
From: dpatel at apple.com (Devang Patel)
Date: Wed, 17 Dec 2008 22:39:30 -0000
Subject: [llvm-commits] [llvm] r61164 - in /llvm/trunk:
 include/llvm/Analysis/DebugInfo.h include/llvm/CodeGen/MachineModuleInfo.h
 lib/Analysis/DebugInfo.cpp
Message-ID: <200812172239.mBHMdUc7020218@zion.cs.uiuc.edu>

Author: dpatel
Date: Wed Dec 17 16:39:29 2008
New Revision: 61164

URL: http://llvm.org/viewvc/llvm-project?rev=61164&view=rev
Log:

Today the front-ends (llvm-gcc and clang) generate multiple llvm.dbg.compile_units to identify source file for various debug entities. Each llvm.dbg.compile_unit matches one file on the disk. However, the backend only supports one DW_TAG_compile_unit per .o file. The backend selects first compile_unit from the vector to construct DW_TAG_compile_unit entry, which is not correct in all cases.

First step to resolve this is, record file name and directory directly in debug info for various debug entities. 


Modified:
    llvm/trunk/include/llvm/Analysis/DebugInfo.h
    llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h
    llvm/trunk/lib/Analysis/DebugInfo.cpp

Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DebugInfo.h?rev=61164&r1=61163&r2=61164&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Analysis/DebugInfo.h (original)
+++ llvm/trunk/include/llvm/Analysis/DebugInfo.h Wed Dec 17 16:39:29 2008
@@ -33,7 +33,8 @@
   class DIDescriptor {
   public:
     enum {
-      Version6    = 6 << 16,     // Current version of debug information.
+      Version7    = 7 << 16,     // Current version of debug information.
+      Version6    = 6 << 16,     // Constant for version 6.
       Version5    = 5 << 16,     // Constant for version 5.
       Version4    = 4 << 16,     // Constant for version 4.
       VersionMask = 0xffff0000   // Mask for version number.
@@ -156,6 +157,8 @@
     explicit DIBasicType(GlobalVariable *GV);
     
     unsigned getEncoding() const { return getUnsignedField(9); }
+    std::string getFileName() const { return getStringField(10); }
+    std::string getDirectory() const { return getStringField(11); }
   };
   
   /// DIDerivedType - A simple derived type, like a const qualified type,
@@ -168,7 +171,9 @@
     explicit DIDerivedType(GlobalVariable *GV);
     
     DIType getTypeDerivedFrom() const { return getFieldAs<DIType>(9); }
-    
+    std::string getFileName() const { return getStringField(10); }
+    std::string getDirectory() const { return getStringField(11); }
+
     /// isDerivedType - Return true if the specified tag is legal for
     /// DIDerivedType.
     static bool isDerivedType(unsigned TAG);
@@ -183,6 +188,8 @@
     explicit DICompositeType(GlobalVariable *GV);
     
     DIArray getTypeArray() const { return getFieldAs<DIArray>(10); }
+    std::string getFileName() const { return getStringField(11); }
+    std::string getDirectory() const { return getStringField(12); }
     
     /// isCompositeType - Return true if the specified tag is legal for
     /// DICompositeType.
@@ -216,7 +223,8 @@
   class DISubprogram : public DIGlobal {
   public:
     explicit DISubprogram(GlobalVariable *GV = 0);
-
+    std::string getFilename() const { return getStringField(11); }
+    std::string getDirectory() const { return getStringField(12); }
   };
   
   /// DIGlobalVariable - This is a wrapper for a global variable.
@@ -225,6 +233,8 @@
     explicit DIGlobalVariable(GlobalVariable *GV = 0);
     
     GlobalVariable *getGlobal() const { return getGlobalVariableField(11); }
+    std::string getFilename() const { return getStringField(12); }
+    std::string getDirectory() const { return getStringField(13); }
   };
   
   
@@ -240,6 +250,8 @@
     DICompileUnit getCompileUnit() const{ return getFieldAs<DICompileUnit>(3); }
     unsigned getLineNumber() const      { return getUnsignedField(4); }
     DIType getType() const              { return getFieldAs<DIType>(5); }
+    std::string getFilename() const { return getStringField(6); }
+    std::string getDirectory() const { return getStringField(7); }
     
     /// isVariable - Return true if the specified tag is legal for DIVariable.
     static bool isVariable(unsigned Tag);
@@ -310,7 +322,9 @@
                                 DICompileUnit CompileUnit, unsigned LineNumber,
                                 uint64_t SizeInBits, uint64_t AlignInBits,
                                 uint64_t OffsetInBits, unsigned Flags,
-                                unsigned Encoding);
+                                unsigned Encoding,
+                                const std::string *FileName = 0,
+                                const std::string *Directory = 0);
  
     /// CreateDerivedType - Create a derived type like const qualified type,
     /// pointer, typedef, etc.
@@ -320,7 +334,9 @@
                                     unsigned LineNumber,
                                     uint64_t SizeInBits, uint64_t AlignInBits,
                                     uint64_t OffsetInBits, unsigned Flags,
-                                    DIType DerivedFrom);
+                                    DIType DerivedFrom,
+                                    const std::string *FileName = 0,
+                                    const std::string *Directory = 0);
 
     /// CreateCompositeType - Create a composite type like array, struct, etc.
     DICompositeType CreateCompositeType(unsigned Tag, DIDescriptor Context,
@@ -331,7 +347,9 @@
                                         uint64_t AlignInBits,
                                         uint64_t OffsetInBits, unsigned Flags,
                                         DIType DerivedFrom,
-                                        DIArray Elements);
+                                        DIArray Elements,
+                                        const std::string *FileName = 0,
+                                        const std::string *Directory = 0);
     
     /// CreateSubprogram - Create a new descriptor for the specified subprogram.
     /// See comments in DISubprogram for descriptions of these fields.
@@ -340,7 +358,9 @@
                                   const std::string &LinkageName,
                                   DICompileUnit CompileUnit, unsigned LineNo,
                                   DIType Type, bool isLocalToUnit,
-                                  bool isDefinition);
+                                  bool isDefinition,
+                                  const std::string *FileName = 0,
+                                  const std::string *Directory = 0);
 
     /// CreateGlobalVariable - Create a new descriptor for the specified global.
     DIGlobalVariable
@@ -349,14 +369,18 @@
                          const std::string &LinkageName, 
                          DICompileUnit CompileUnit,
                          unsigned LineNo, DIType Type, bool isLocalToUnit,
-                         bool isDefinition, llvm::GlobalVariable *GV);
+                         bool isDefinition, llvm::GlobalVariable *GV,
+                         const std::string *FileName = 0,
+                         const std::string *Directory = 0);
     
     
     /// CreateVariable - Create a new descriptor for the specified variable.
     DIVariable CreateVariable(unsigned Tag, DIDescriptor Context,
                               const std::string &Name,
                               DICompileUnit CompileUnit, unsigned LineNo,
-                              DIType Type);
+                              DIType Type,
+                              const std::string *FileName = 0,
+                              const std::string *Directory = 0);
     
     /// CreateBlock - This creates a descriptor for a lexical block with the
     /// specified parent context.

Modified: llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h?rev=61164&r1=61163&r2=61164&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h Wed Dec 17 16:39:29 2008
@@ -59,7 +59,8 @@
 // Debug info constants.
 
 enum {
-  LLVMDebugVersion = (6 << 16),         // Current version of debug information.
+  LLVMDebugVersion = (7 << 16),         // Current version of debug information.
+  LLVMDebugVersion6 = (6 << 16),        // Constant for version 6.
   LLVMDebugVersion5 = (5 << 16),        // Constant for version 5.
   LLVMDebugVersion4 = (4 << 16),        // Constant for version 4.
   LLVMDebugVersionMask = 0xffff0000     // Mask for version number.

Modified: llvm/trunk/lib/Analysis/DebugInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DebugInfo.cpp?rev=61164&r1=61163&r2=61164&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/DebugInfo.cpp (original)
+++ llvm/trunk/lib/Analysis/DebugInfo.cpp Wed Dec 17 16:39:29 2008
@@ -195,7 +195,7 @@
 Constant *DIFactory::GetTagConstant(unsigned TAG) {
   assert((TAG & DIDescriptor::VersionMask) == 0 &&
          "Tag too large for debug encoding!");
-  return ConstantInt::get(Type::Int32Ty, TAG | DIDescriptor::Version6);
+  return ConstantInt::get(Type::Int32Ty, TAG | DIDescriptor::Version7);
 }
 
 Constant *DIFactory::GetStringConstant(const std::string &String) {
@@ -389,7 +389,9 @@
                                        uint64_t SizeInBits,
                                        uint64_t AlignInBits,
                                        uint64_t OffsetInBits, unsigned Flags,
-                                       unsigned Encoding) {
+                                       unsigned Encoding,
+                                       const std::string *FileName,
+                                       const std::string *Directory) {
   Constant *Elts[] = {
     GetTagConstant(dwarf::DW_TAG_base_type),
     getCastToEmpty(Context),
@@ -400,7 +402,9 @@
     ConstantInt::get(Type::Int64Ty, AlignInBits),
     ConstantInt::get(Type::Int64Ty, OffsetInBits),
     ConstantInt::get(Type::Int32Ty, Flags),
-    ConstantInt::get(Type::Int32Ty, Encoding)
+    ConstantInt::get(Type::Int32Ty, Encoding),
+    GetStringConstant(FileName ? FileName->c_str() : ""),
+    GetStringConstant(Directory ? Directory->c_str() : "")
   };
   
   Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
@@ -424,7 +428,9 @@
                                            uint64_t AlignInBits,
                                            uint64_t OffsetInBits,
                                            unsigned Flags,
-                                           DIType DerivedFrom) {
+                                           DIType DerivedFrom,
+                                           const std::string *FileName,
+                                           const std::string *Directory) {
   Constant *Elts[] = {
     GetTagConstant(Tag),
     getCastToEmpty(Context),
@@ -435,7 +441,9 @@
     ConstantInt::get(Type::Int64Ty, AlignInBits),
     ConstantInt::get(Type::Int64Ty, OffsetInBits),
     ConstantInt::get(Type::Int32Ty, Flags),
-    getCastToEmpty(DerivedFrom)
+    getCastToEmpty(DerivedFrom),
+    GetStringConstant(FileName ? FileName->c_str() : ""),
+    GetStringConstant(Directory ? Directory->c_str() : "")
   };
   
   Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
@@ -459,7 +467,10 @@
                                                uint64_t OffsetInBits,
                                                unsigned Flags,
                                                DIType DerivedFrom,
-                                               DIArray Elements) {
+                                               DIArray Elements,
+                                               const std::string *FileName,
+                                               const std::string *Directory) {
+
   Constant *Elts[] = {
     GetTagConstant(Tag),
     getCastToEmpty(Context),
@@ -471,7 +482,9 @@
     ConstantInt::get(Type::Int64Ty, OffsetInBits),
     ConstantInt::get(Type::Int32Ty, Flags),
     getCastToEmpty(DerivedFrom),
-    getCastToEmpty(Elements)
+    getCastToEmpty(Elements),
+    GetStringConstant(FileName ? FileName->c_str() : ""),
+    GetStringConstant(Directory ? Directory->c_str() : "")
   };
   
   Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
@@ -495,7 +508,10 @@
                                          DICompileUnit CompileUnit,
                                          unsigned LineNo, DIType Type,
                                          bool isLocalToUnit,
-                                         bool isDefinition) {
+                                         bool isDefinition,
+                                         const std::string *FileName,
+                                         const std::string *Directory) {
+
   Constant *Elts[] = {
     GetTagConstant(dwarf::DW_TAG_subprogram),
     getCastToEmpty(GetOrCreateSubprogramAnchor()),
@@ -507,7 +523,9 @@
     ConstantInt::get(Type::Int32Ty, LineNo),
     getCastToEmpty(Type),
     ConstantInt::get(Type::Int1Ty, isLocalToUnit),
-    ConstantInt::get(Type::Int1Ty, isDefinition)
+    ConstantInt::get(Type::Int1Ty, isDefinition),
+    GetStringConstant(FileName ? FileName->c_str() : ""),
+    GetStringConstant(Directory ? Directory->c_str() : "")
   };
   
   Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
@@ -527,8 +545,9 @@
                                 const std::string &LinkageName,
                                 DICompileUnit CompileUnit,
                                 unsigned LineNo, DIType Type,bool isLocalToUnit,
-                                bool isDefinition, llvm::GlobalVariable *Val) {
-  
+                                bool isDefinition, llvm::GlobalVariable *Val,
+                                const std::string *FileName,
+                                const std::string *Directory) {
   Constant *Elts[] = {
     GetTagConstant(dwarf::DW_TAG_variable),
     getCastToEmpty(GetOrCreateGlobalVariableAnchor()),
@@ -541,7 +560,9 @@
     getCastToEmpty(Type),
     ConstantInt::get(Type::Int1Ty, isLocalToUnit),
     ConstantInt::get(Type::Int1Ty, isDefinition),
-    ConstantExpr::getBitCast(Val, EmptyStructPtr)
+    ConstantExpr::getBitCast(Val, EmptyStructPtr),
+    GetStringConstant(FileName ? FileName->c_str() : ""),
+    GetStringConstant(Directory ? Directory->c_str() : "")
   };
   
   Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
@@ -559,7 +580,10 @@
 DIVariable DIFactory::CreateVariable(unsigned Tag, DIDescriptor Context,
                                      const std::string &Name,
                                      DICompileUnit CompileUnit, unsigned LineNo,
-                                     DIType Type) {
+                                     DIType Type,
+                                     const std::string *FileName,
+                                     const std::string *Directory) {
+
   
   Constant *Elts[] = {
     GetTagConstant(Tag),
@@ -568,6 +592,8 @@
     getCastToEmpty(CompileUnit),
     ConstantInt::get(Type::Int32Ty, LineNo),
     getCastToEmpty(Type),
+    GetStringConstant(FileName ? FileName->c_str() : ""),
+    GetStringConstant(Directory ? Directory->c_str() : "")
   };
   
   Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));




From dpatel at apple.com  Wed Dec 17 16:53:10 2008
From: dpatel at apple.com (Devang Patel)
Date: Wed, 17 Dec 2008 22:53:10 -0000
Subject: [llvm-commits] [llvm] r61166 - in /llvm/trunk/test/DebugInfo:
 dataOnly.ll deaddebuglabel.ll forwardDecl.ll printdbginfo.ll
Message-ID: <200812172253.mBHMrBtw020704@zion.cs.uiuc.edu>

Author: dpatel
Date: Wed Dec 17 16:53:09 2008
New Revision: 61166

URL: http://llvm.org/viewvc/llvm-project?rev=61166&view=rev
Log:
Xfail these tests for now.

Modified:
    llvm/trunk/test/DebugInfo/dataOnly.ll
    llvm/trunk/test/DebugInfo/deaddebuglabel.ll
    llvm/trunk/test/DebugInfo/forwardDecl.ll
    llvm/trunk/test/DebugInfo/printdbginfo.ll

Modified: llvm/trunk/test/DebugInfo/dataOnly.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/dataOnly.ll?rev=61166&r1=61165&r2=61166&view=diff

==============================================================================
--- llvm/trunk/test/DebugInfo/dataOnly.ll (original)
+++ llvm/trunk/test/DebugInfo/dataOnly.ll Wed Dec 17 16:53:09 2008
@@ -1,5 +1,6 @@
 ; RUN: llvm-as < %s | llc | grep DWARF
 ; ModuleID = 'foo.c'
+; XFAIL: *
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
 target triple = "i386-apple-darwin8"
 	%llvm.dbg.anchor.type = type { i32, i32 }

Modified: llvm/trunk/test/DebugInfo/deaddebuglabel.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/deaddebuglabel.ll?rev=61166&r1=61165&r2=61166&view=diff

==============================================================================
--- llvm/trunk/test/DebugInfo/deaddebuglabel.ll (original)
+++ llvm/trunk/test/DebugInfo/deaddebuglabel.ll Wed Dec 17 16:53:09 2008
@@ -1,5 +1,6 @@
 ; PR2614
 ; RUN: llvm-as < %s | llc | grep "label" | count 8
+; XFAIL: *
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-f80:32:32-v64:64:64-v128:128:128-a0:0:64"
 target triple = "i686-pc-linux-gnu"

Modified: llvm/trunk/test/DebugInfo/forwardDecl.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/forwardDecl.ll?rev=61166&r1=61165&r2=61166&view=diff

==============================================================================
--- llvm/trunk/test/DebugInfo/forwardDecl.ll (original)
+++ llvm/trunk/test/DebugInfo/forwardDecl.ll Wed Dec 17 16:53:09 2008
@@ -1,4 +1,5 @@
 ; RUN: llvm-as < %s | llc | %prcontext ST 1 | grep 0x1 | count 1
+; XFAIL: *
 
 target triple = "i386-apple-darwin9.6"
 	%llvm.dbg.anchor.type = type { i32, i32 }

Modified: llvm/trunk/test/DebugInfo/printdbginfo.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/printdbginfo.ll?rev=61166&r1=61165&r2=61166&view=diff

==============================================================================
--- llvm/trunk/test/DebugInfo/printdbginfo.ll (original)
+++ llvm/trunk/test/DebugInfo/printdbginfo.ll Wed Dec 17 16:53:09 2008
@@ -2,6 +2,7 @@
 ; RUN: %prcontext {function name: Bar::bar return type: int at line 12} 1 < %t1 | grep {(tst.cpp:14)}
 ; RUN: %prcontext {%%tmp1} 1 < %t1 | grep -E {variable tmp.+at line 23}
 ; RUN: %prcontext {; tst.cpp:24} 2 < %t1 | grep {%%6}
+; XFAIL: *
 	%llvm.dbg.anchor.type = type { i32, i32 }
 	%llvm.dbg.basictype.type = type { i32, { }*, i8*, { }*, i32, i64, i64, i64, i32, i32 }
 	%llvm.dbg.compile_unit.type = type { i32, { }*, i32, i8*, i8*, i8* }




From dpatel at apple.com  Wed Dec 17 16:54:55 2008
From: dpatel at apple.com (Devang Patel)
Date: Wed, 17 Dec 2008 22:54:55 -0000
Subject: [llvm-commits] [llvm] r61167 -
	/llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp
Message-ID: <200812172254.mBHMstbw020762@zion.cs.uiuc.edu>

Author: dpatel
Date: Wed Dec 17 16:54:54 2008
New Revision: 61167

URL: http://llvm.org/viewvc/llvm-project?rev=61167&view=rev
Log:

XFAIL for now.

Modified:
    llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp

Modified: llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC%2B%2B/2006-11-06-StackTrace.cpp?rev=61167&r1=61166&r2=61167&view=diff

==============================================================================
--- llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp (original)
+++ llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp Wed Dec 17 16:54:54 2008
@@ -11,6 +11,7 @@
 
 // Only works on ppc, x86 and x86_64.  Should generalize?
 // XFAIL: alpha|ia64|arm
+// XFAIL: *
 
 #include <stdlib.h>
 




From isanbard at gmail.com  Wed Dec 17 17:31:21 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Dec 2008 23:31:21 -0000
Subject: [llvm-commits] [llvm] r61169 -
	/llvm/trunk/lib/Transforms/Scalar/GVN.cpp
Message-ID: <200812172331.mBHNVMbW022058@zion.cs.uiuc.edu>

Author: void
Date: Wed Dec 17 17:31:20 2008
New Revision: 61169

URL: http://llvm.org/viewvc/llvm-project?rev=61169&view=rev
Log:
Temporarily revert r61027. It was causing a bootstrap failure in "release" mode
with everyone's favorite error messages:

Comparing stages 2 and 3
warning: ./cc1-checksum.o differs
warning: ./cc1plus-checksum.o differs
Bootstrap comparison failure!
./c-decl.o differs
./cp/decl.o differs
./df-core.o differs
./gcc.o differs
./i386.o differs
./stor-layout.o differs
./tree-pretty-print.o differs
./tree.o differs
make[2]: *** [compare] Error 1
make[1]: *** [stage3-bubble] Error 2

See PR3227.

Modified:
    llvm/trunk/lib/Transforms/Scalar/GVN.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/GVN.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/GVN.cpp?rev=61169&r1=61168&r2=61169&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/GVN.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/GVN.cpp Wed Dec 17 17:31:20 2008
@@ -48,7 +48,7 @@
 
 static cl::opt<bool> EnablePRE("enable-pre",
                                cl::init(true), cl::Hidden);
-cl::opt<bool> EnableLoadPRE("enable-load-pre", cl::init(true));
+cl::opt<bool> EnableLoadPRE("enable-load-pre"/*, cl::init(true)*/);
 
 //===----------------------------------------------------------------------===//
 //                         ValueTable Class
@@ -957,11 +957,6 @@
   if (Deps.size() > 100)
     return false;
   
-  // If we had a phi translation failure, we'll have a single entry which is a
-  // clobber in the current block.  Reject this early.
-  if (Deps.size() == 1 && Deps[0].second.isClobber())
-    return false;
-  
   // Filter out useless results (non-locals, etc).  Keep track of the blocks
   // where we have a value available in repl, also keep track of whether we see
   // dependencies that produce an unknown value for the load (such as a call




From isanbard at gmail.com  Wed Dec 17 18:27:16 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Thu, 18 Dec 2008 00:27:16 -0000
Subject: [llvm-commits] [llvm] r61174 -
	/llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp
Message-ID: <200812180027.mBI0RGLV023909@zion.cs.uiuc.edu>

Author: void
Date: Wed Dec 17 18:27:15 2008
New Revision: 61174

URL: http://llvm.org/viewvc/llvm-project?rev=61174&view=rev
Log:
Do not XFAIL.

Modified:
    llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp

Modified: llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC%2B%2B/2006-11-06-StackTrace.cpp?rev=61174&r1=61173&r2=61174&view=diff

==============================================================================
--- llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp (original)
+++ llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp Wed Dec 17 18:27:15 2008
@@ -11,7 +11,6 @@
 
 // Only works on ppc, x86 and x86_64.  Should generalize?
 // XFAIL: alpha|ia64|arm
-// XFAIL: *
 
 #include <stdlib.h>
 




From sabre at nondot.org  Wed Dec 17 18:33:12 2008
From: sabre at nondot.org (Chris Lattner)
Date: Thu, 18 Dec 2008 00:33:12 -0000
Subject: [llvm-commits] [llvm] r61175 -
	/llvm/trunk/lib/Transforms/Utils/InstructionNamer.cpp
Message-ID: <200812180033.mBI0XC6l024090@zion.cs.uiuc.edu>

Author: lattner
Date: Wed Dec 17 18:33:11 2008
New Revision: 61175

URL: http://llvm.org/viewvc/llvm-project?rev=61175&view=rev
Log:
make instnamer name unnamed blocks as well as instructions and args.

Modified:
    llvm/trunk/lib/Transforms/Utils/InstructionNamer.cpp

Modified: llvm/trunk/lib/Transforms/Utils/InstructionNamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InstructionNamer.cpp?rev=61175&r1=61174&r2=61175&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Utils/InstructionNamer.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/InstructionNamer.cpp Wed Dec 17 18:33:11 2008
@@ -35,10 +35,14 @@
         if (!AI->hasName() && AI->getType() != Type::VoidTy)
           AI->setName("tmp");
 
-       for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB)
+      for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB) {
+        if (!BB->hasName())
+          BB->setName("BB");
+        
         for (BasicBlock::iterator I = BB->begin(), E = BB->end(); I != E; ++I)
           if (!I->hasName() && I->getType() != Type::VoidTy)
             I->setName("tmp");
+      }
       return true;
     }
   };




From isanbard at gmail.com  Wed Dec 17 18:35:22 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Thu, 18 Dec 2008 00:35:22 -0000
Subject: [llvm-commits] [llvm] r61176 -
	/llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp
Message-ID: <200812180035.mBI0ZMZ8024152@zion.cs.uiuc.edu>

Author: void
Date: Wed Dec 17 18:35:21 2008
New Revision: 61176

URL: http://llvm.org/viewvc/llvm-project?rev=61176&view=rev
Log:
XFAIL on Linux.

Modified:
    llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp

Modified: llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC%2B%2B/2006-11-06-StackTrace.cpp?rev=61176&r1=61175&r2=61176&view=diff

==============================================================================
--- llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp (original)
+++ llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp Wed Dec 17 18:35:21 2008
@@ -10,7 +10,7 @@
 // RUN:   grep {#7  0x.* in main.*(argc=\[12\],.*argv=.*)}
 
 // Only works on ppc, x86 and x86_64.  Should generalize?
-// XFAIL: alpha|ia64|arm
+// XFAIL: alpha|ia64|arm|linux
 
 #include <stdlib.h>
 




From anton at korobeynikov.info  Wed Dec 17 18:40:23 2008
From: anton at korobeynikov.info (Anton Korobeynikov)
Date: Thu, 18 Dec 2008 03:40:23 +0300
Subject: [llvm-commits] [llvm] r61176 -
	/llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp
In-Reply-To: <200812180035.mBI0ZMZ8024152@zion.cs.uiuc.edu>
References: <200812180035.mBI0ZMZ8024152@zion.cs.uiuc.edu>
Message-ID: <b087fca00812171640j260e141bo2902aee3753db11b@mail.gmail.com>

Hi, Bill

> Log:
> XFAIL on Linux.
This testcase definitely worked on linux. What's happened? XFAIL'ing
it seems to be not good idea....

-- 
With best regards, Anton Korobeynikov
Faculty of Mathematics and Mechanics, Saint Petersburg State University


From sabre at nondot.org  Wed Dec 17 18:51:32 2008
From: sabre at nondot.org (Chris Lattner)
Date: Thu, 18 Dec 2008 00:51:32 -0000
Subject: [llvm-commits] [llvm] r61177 -
	/llvm/trunk/lib/Transforms/Scalar/GVN.cpp
Message-ID: <200812180051.mBI0pXE1024718@zion.cs.uiuc.edu>

Author: lattner
Date: Wed Dec 17 18:51:32 2008
New Revision: 61177

URL: http://llvm.org/viewvc/llvm-project?rev=61177&view=rev
Log:
reapply this hunk from Bill's reversion in r61169, it is conservative
and safe and orthogonal from turning off load pre.

Modified:
    llvm/trunk/lib/Transforms/Scalar/GVN.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/GVN.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/GVN.cpp?rev=61177&r1=61176&r2=61177&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/GVN.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/GVN.cpp Wed Dec 17 18:51:32 2008
@@ -956,6 +956,11 @@
   // it will be too expensive.
   if (Deps.size() > 100)
     return false;
+
+  // If we had a phi translation failure, we'll have a single entry which is a
+  // clobber in the current block.  Reject this early.
+  if (Deps.size() == 1 && Deps[0].second.isClobber())
+    return false;
   
   // Filter out useless results (non-locals, etc).  Keep track of the blocks
   // where we have a value available in repl, also keep track of whether we see




From dalej at apple.com  Wed Dec 17 18:57:23 2008
From: dalej at apple.com (Dale Johannesen)
Date: Thu, 18 Dec 2008 00:57:23 -0000
Subject: [llvm-commits] [llvm] r61178 -
	/llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp
Message-ID: <200812180057.mBI0vNRf024955@zion.cs.uiuc.edu>

Author: johannes
Date: Wed Dec 17 18:57:22 2008
New Revision: 61178

URL: http://llvm.org/viewvc/llvm-project?rev=61178&view=rev
Log:
Fix the time regression I introduced in 464.h264ref with
my last patch to this file.

The issue there was that all uses of an IV inside a loop
are actually references to Base[IV*2], and there was one
use outside that was the same but LSR didn't see the base
or the scaling because it didn't recurse into uses outside
the loop; thus, it used base+IV*scale mode inside the loop
instead of pulling base out of the loop.  This was extra bad
because register pressure later forced both base and IV into
memory.  Doing that recursion, at least enough
to figure out addressing modes, is a good idea in general;
the change in AddUsersIfInteresting does this.  However,
there were side effects....

It is also possible for recursing outside the loop to
introduce another IV where there was only 1 before (if
the refs inside are not scaled and the ref outside is).
I don't think this is a common case, but it's in the testsuite.
It is right to be very aggressive about getting rid of
such introduced IVs (CheckForIVReuse and the handling of
nonzero RewriteFactor in StrengthReduceStridedIVUsers).
In the testcase in question the new IV produced this way
has both a nonconstant stride and a nonzero base, neither
of which was handled before.  (This patch does not handle 
all the cases where this can happen.)  And when inserting 
new code that feeds into a PHI, it's right to put such 
code at the original location rather than in the PHI's 
immediate predecessor(s) when the original location is outside 
the loop (a case that couldn't happen before)
(RewriteInstructionToUseNewBase); better to avoid making
multiple copies of it in this case.

Everything above is exercised in
CodeGen/X86/lsr-negative-stride.ll (and ifcvt4 in ARM which is
the same IR).


Modified:
    llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp?rev=61178&r1=61177&r2=61178&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp Wed Dec 17 18:57:22 2008
@@ -508,14 +508,22 @@
     if (isa<PHINode>(User) && Processed.count(User))
       continue;
 
-    // If this is an instruction defined in a nested loop, or outside this loop,
-    // don't recurse into it.
+    // Descend recursively, but not into PHI nodes outside the current loop.
+    // It's important to see the entire expression outside the loop to get
+    // choices that depend on addressing mode use right, although we won't
+    // consider references ouside the loop in all cases.
+    // If User is already in Processed, we don't want to recurse into it again,
+    // but do want to record a second reference in the same instruction.
     bool AddUserToIVUsers = false;
     if (LI->getLoopFor(User->getParent()) != L) {
-      DOUT << "FOUND USER in other loop: " << *User
-           << "   OF SCEV: " << *ISE << "\n";
-      AddUserToIVUsers = true;
-    } else if (!AddUsersIfInteresting(User, L, Processed)) {
+      if (isa<PHINode>(User) || Processed.count(User) ||
+          !AddUsersIfInteresting(User, L, Processed)) {
+        DOUT << "FOUND USER in other loop: " << *User
+             << "   OF SCEV: " << *ISE << "\n";
+        AddUserToIVUsers = true;
+      }
+    } else if (Processed.count(User) || 
+               !AddUsersIfInteresting(User, L, Processed)) {
       DOUT << "FOUND USER: " << *User
            << "   OF SCEV: " << *ISE << "\n";
       AddUserToIVUsers = true;
@@ -704,34 +712,45 @@
   PHINode *PN = cast<PHINode>(Inst);
   for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) {
     if (PN->getIncomingValue(i) == OperandValToReplace) {
-      // If this is a critical edge, split the edge so that we do not insert the
-      // code on all predecessor/successor paths.  We do this unless this is the
-      // canonical backedge for this loop, as this can make some inserted code
-      // be in an illegal position.
-      BasicBlock *PHIPred = PN->getIncomingBlock(i);
-      if (e != 1 && PHIPred->getTerminator()->getNumSuccessors() > 1 &&
-          (PN->getParent() != L->getHeader() || !L->contains(PHIPred))) {
-        
-        // First step, split the critical edge.
-        SplitCriticalEdge(PHIPred, PN->getParent(), P, false);
-            
-        // Next step: move the basic block.  In particular, if the PHI node
-        // is outside of the loop, and PredTI is in the loop, we want to
-        // move the block to be immediately before the PHI block, not
-        // immediately after PredTI.
-        if (L->contains(PHIPred) && !L->contains(PN->getParent())) {
-          BasicBlock *NewBB = PN->getIncomingBlock(i);
-          NewBB->moveBefore(PN->getParent());
+      // If the original expression is outside the loop, put the replacement
+      // code in the same place as the original expression,
+      // which need not be an immediate predecessor of this PHI.  This way we 
+      // need only one copy of it even if it is referenced multiple times in
+      // the PHI.  We don't do this when the original expression is inside the
+      // loop because multiple copies sometimes do useful sinking of code in that
+      // case(?).
+      Instruction *OldLoc = dyn_cast<Instruction>(OperandValToReplace);
+      if (L->contains(OldLoc->getParent())) {
+        // If this is a critical edge, split the edge so that we do not insert the
+        // code on all predecessor/successor paths.  We do this unless this is the
+        // canonical backedge for this loop, as this can make some inserted code
+        // be in an illegal position.
+        BasicBlock *PHIPred = PN->getIncomingBlock(i);
+        if (e != 1 && PHIPred->getTerminator()->getNumSuccessors() > 1 &&
+            (PN->getParent() != L->getHeader() || !L->contains(PHIPred))) {
+
+          // First step, split the critical edge.
+          SplitCriticalEdge(PHIPred, PN->getParent(), P, false);
+
+          // Next step: move the basic block.  In particular, if the PHI node
+          // is outside of the loop, and PredTI is in the loop, we want to
+          // move the block to be immediately before the PHI block, not
+          // immediately after PredTI.
+          if (L->contains(PHIPred) && !L->contains(PN->getParent())) {
+            BasicBlock *NewBB = PN->getIncomingBlock(i);
+            NewBB->moveBefore(PN->getParent());
+          }
+
+          // Splitting the edge can reduce the number of PHI entries we have.
+          e = PN->getNumIncomingValues();
         }
-        
-        // Splitting the edge can reduce the number of PHI entries we have.
-        e = PN->getNumIncomingValues();
       }
-
       Value *&Code = InsertedCode[PN->getIncomingBlock(i)];
       if (!Code) {
         // Insert the code into the end of the predecessor block.
-        Instruction *InsertPt = PN->getIncomingBlock(i)->getTerminator();
+        Instruction *InsertPt = (L->contains(OldLoc->getParent())) ?
+                                PN->getIncomingBlock(i)->getTerminator() :
+                                OldLoc->getParent()->getTerminator();
         Code = InsertCodeForBaseAtPosition(NewBase, Rewriter, InsertPt, L);
 
         // Adjust the type back to match the PHI. Note that we can't use
@@ -1168,6 +1187,10 @@
 /// mode scale component and optional base reg. This allows the users of
 /// this stride to be rewritten as prev iv * factor. It returns 0 if no
 /// reuse is possible.  Factors can be negative on same targets, e.g. ARM.
+///
+/// If all uses are outside the loop, we don't require that all multiplies
+/// be folded into the addressing mode; a multiply (executed once) outside
+/// the loop is better than another IV within.  Well, usually.
 int64_t LoopStrengthReduce::CheckForIVReuse(bool HasBaseReg,
                                 bool AllUsesAreAddresses,
                                 bool AllUsesAreOutsideLoop,
@@ -1205,6 +1228,30 @@
             return Scale;
           }
     }
+  } else if (AllUsesAreOutsideLoop) {
+    // Accept nonconstant strides here; it is really really right to substitute
+    // an existing IV if we can.
+    // Special case, old IV is -1*x and this one is x.  Can treat this one as
+    // -1*old.
+    for (unsigned NewStride = 0, e = StrideOrder.size(); NewStride != e;
+         ++NewStride) {
+      std::map<SCEVHandle, IVsOfOneStride>::iterator SI = 
+                IVsByStride.find(StrideOrder[NewStride]);
+      if (SI == IVsByStride.end()) 
+        continue;
+      if (SCEVMulExpr *ME = dyn_cast<SCEVMulExpr>(SI->first))
+        if (SCEVConstant *SC = dyn_cast<SCEVConstant>(ME->getOperand(0)))
+          if (Stride == ME->getOperand(1) &&
+              SC->getValue()->getSExtValue() == -1LL)
+            for (std::vector<IVExpr>::iterator II = SI->second.IVs.begin(),
+                   IE = SI->second.IVs.end(); II != IE; ++II)
+              // Accept nonzero base here.
+              // Only reuse previous IV if it would not require a type conversion.
+              if (!RequiresTypeConversion(II->Base->getType(), Ty)) {
+                IV = *II;
+                return -1;
+              }
+    }
   }
   return 0;
 }
@@ -1549,6 +1596,18 @@
             !cast<ConstantInt>(CommonBaseV)->isZero())
           RewriteExpr = SE->getAddExpr(RewriteExpr,
                                        SE->getUnknown(CommonBaseV));
+        // If we're reusing an IV with a nonzero base (currently this happens
+        // only when all reuses are outside the loop) subtract out that base here
+        // This is the reverse of the above; the base HAS been used to initialize
+        // the PHI node but we don't want it here.
+        // (If the RewriteFactor is negative, we're effectively negating the
+        // old IV in this use, so we add the base instead of subtract.)
+        if (!ReuseIV.Base->isZero()) {
+          if (RewriteFactor < 0)
+            RewriteExpr = SE->getAddExpr(RewriteExpr, ReuseIV.Base);
+          else
+            RewriteExpr = SE->getMinusSCEV(RewriteExpr, ReuseIV.Base);
+        }
       }
 
       // Now that we know what we need to do, insert code before User for the




From gohman at apple.com  Wed Dec 17 19:05:10 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 18 Dec 2008 01:05:10 -0000
Subject: [llvm-commits] [llvm] r61179 -
	/llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp
Message-ID: <200812180105.mBI15Ax4025192@zion.cs.uiuc.edu>

Author: djg
Date: Wed Dec 17 19:05:09 2008
New Revision: 61179

URL: http://llvm.org/viewvc/llvm-project?rev=61179&view=rev
Log:
Mark the x86 fp stack registers as "reserved". This tells LiveVariables
and the RegisterScavenger not to expect traditional liveness 
techniques are applicable to these registers, since we don't fully
modify the effects of push and pop after stackification.

Modified:
    llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp

Modified: llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp?rev=61179&r1=61178&r2=61179&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp Wed Dec 17 19:05:09 2008
@@ -263,16 +263,30 @@
 
 BitVector X86RegisterInfo::getReservedRegs(const MachineFunction &MF) const {
   BitVector Reserved(getNumRegs());
+  // Set the stack-pointer register and its aliases as reserved.
   Reserved.set(X86::RSP);
   Reserved.set(X86::ESP);
   Reserved.set(X86::SP);
   Reserved.set(X86::SPL);
+  // Set the frame-pointer register and its aliases as reserved if needed.
   if (hasFP(MF)) {
     Reserved.set(X86::RBP);
     Reserved.set(X86::EBP);
     Reserved.set(X86::BP);
     Reserved.set(X86::BPL);
   }
+  // Mark the x87 stack registers as reserved, since they don't
+  // behave normally with respect to liveness. We don't fully
+  // model the effects of x87 stack pushes and pops after
+  // stackification.
+  Reserved.set(X86::ST0);
+  Reserved.set(X86::ST1);
+  Reserved.set(X86::ST2);
+  Reserved.set(X86::ST3);
+  Reserved.set(X86::ST4);
+  Reserved.set(X86::ST5);
+  Reserved.set(X86::ST6);
+  Reserved.set(X86::ST7);
   return Reserved;
 }
 




From clattner at apple.com  Wed Dec 17 19:19:31 2008
From: clattner at apple.com (Chris Lattner)
Date: Wed, 17 Dec 2008 17:19:31 -0800
Subject: [llvm-commits] [llvm] r61178 -
	/llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp
In-Reply-To: <200812180057.mBI0vNRf024955@zion.cs.uiuc.edu>
References: <200812180057.mBI0vNRf024955@zion.cs.uiuc.edu>
Message-ID: <E83B2E0C-5E97-4623-B0AC-55CD9985A4B8@apple.com>

On Dec 17, 2008, at 4:57 PM, Dale Johannesen wrote:
> Everything above is exercised in
> CodeGen/X86/lsr-negative-stride.ll (and ifcvt4 in ARM which is
> the same IR).

I see no change in the testcase so obviously this patch doesn't affect  
whether the test passes or not.  Please add a testcase that fails  
before this patch and passes with it.

I'll review the patch after the testcase goes in.

Thanks,

-Chris



From isanbard at gmail.com  Wed Dec 17 19:22:31 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Wed, 17 Dec 2008 17:22:31 -0800
Subject: [llvm-commits] [llvm] r61176 -
	/llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp
In-Reply-To: <b087fca00812171640j260e141bo2902aee3753db11b@mail.gmail.com>
References: <200812180035.mBI0ZMZ8024152@zion.cs.uiuc.edu>
	<b087fca00812171640j260e141bo2902aee3753db11b@mail.gmail.com>
Message-ID: <16e5fdf90812171722v56fb4685jb287ffbe328a5814@mail.gmail.com>

On Wed, Dec 17, 2008 at 4:40 PM, Anton Korobeynikov
<anton at korobeynikov.info> wrote:
> Hi, Bill
>
>> Log:
>> XFAIL on Linux.
> This testcase definitely worked on linux. What's happened? XFAIL'ing
> it seems to be not good idea....
>
Hi Anton,

I think that Devang is doing changes which caused it to fail on
various platforms. I think that it's only temporary.

-bw


From dalej at apple.com  Wed Dec 17 19:23:42 2008
From: dalej at apple.com (Dale Johannesen)
Date: Thu, 18 Dec 2008 01:23:42 -0000
Subject: [llvm-commits] [llvm] r61181 -
	/llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp
Message-ID: <200812180123.mBI1Ngiv025767@zion.cs.uiuc.edu>

Author: johannes
Date: Wed Dec 17 19:23:41 2008
New Revision: 61181

URL: http://llvm.org/viewvc/llvm-project?rev=61181&view=rev
Log:
Revert previous patch, appears to break bootstrap.


Modified:
    llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp?rev=61181&r1=61180&r2=61181&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp Wed Dec 17 19:23:41 2008
@@ -508,22 +508,14 @@
     if (isa<PHINode>(User) && Processed.count(User))
       continue;
 
-    // Descend recursively, but not into PHI nodes outside the current loop.
-    // It's important to see the entire expression outside the loop to get
-    // choices that depend on addressing mode use right, although we won't
-    // consider references ouside the loop in all cases.
-    // If User is already in Processed, we don't want to recurse into it again,
-    // but do want to record a second reference in the same instruction.
+    // If this is an instruction defined in a nested loop, or outside this loop,
+    // don't recurse into it.
     bool AddUserToIVUsers = false;
     if (LI->getLoopFor(User->getParent()) != L) {
-      if (isa<PHINode>(User) || Processed.count(User) ||
-          !AddUsersIfInteresting(User, L, Processed)) {
-        DOUT << "FOUND USER in other loop: " << *User
-             << "   OF SCEV: " << *ISE << "\n";
-        AddUserToIVUsers = true;
-      }
-    } else if (Processed.count(User) || 
-               !AddUsersIfInteresting(User, L, Processed)) {
+      DOUT << "FOUND USER in other loop: " << *User
+           << "   OF SCEV: " << *ISE << "\n";
+      AddUserToIVUsers = true;
+    } else if (!AddUsersIfInteresting(User, L, Processed)) {
       DOUT << "FOUND USER: " << *User
            << "   OF SCEV: " << *ISE << "\n";
       AddUserToIVUsers = true;
@@ -712,45 +704,34 @@
   PHINode *PN = cast<PHINode>(Inst);
   for (unsigned i = 0, e = PN->getNumIncomingValues(); i != e; ++i) {
     if (PN->getIncomingValue(i) == OperandValToReplace) {
-      // If the original expression is outside the loop, put the replacement
-      // code in the same place as the original expression,
-      // which need not be an immediate predecessor of this PHI.  This way we 
-      // need only one copy of it even if it is referenced multiple times in
-      // the PHI.  We don't do this when the original expression is inside the
-      // loop because multiple copies sometimes do useful sinking of code in that
-      // case(?).
-      Instruction *OldLoc = dyn_cast<Instruction>(OperandValToReplace);
-      if (L->contains(OldLoc->getParent())) {
-        // If this is a critical edge, split the edge so that we do not insert the
-        // code on all predecessor/successor paths.  We do this unless this is the
-        // canonical backedge for this loop, as this can make some inserted code
-        // be in an illegal position.
-        BasicBlock *PHIPred = PN->getIncomingBlock(i);
-        if (e != 1 && PHIPred->getTerminator()->getNumSuccessors() > 1 &&
-            (PN->getParent() != L->getHeader() || !L->contains(PHIPred))) {
-
-          // First step, split the critical edge.
-          SplitCriticalEdge(PHIPred, PN->getParent(), P, false);
-
-          // Next step: move the basic block.  In particular, if the PHI node
-          // is outside of the loop, and PredTI is in the loop, we want to
-          // move the block to be immediately before the PHI block, not
-          // immediately after PredTI.
-          if (L->contains(PHIPred) && !L->contains(PN->getParent())) {
-            BasicBlock *NewBB = PN->getIncomingBlock(i);
-            NewBB->moveBefore(PN->getParent());
-          }
-
-          // Splitting the edge can reduce the number of PHI entries we have.
-          e = PN->getNumIncomingValues();
+      // If this is a critical edge, split the edge so that we do not insert the
+      // code on all predecessor/successor paths.  We do this unless this is the
+      // canonical backedge for this loop, as this can make some inserted code
+      // be in an illegal position.
+      BasicBlock *PHIPred = PN->getIncomingBlock(i);
+      if (e != 1 && PHIPred->getTerminator()->getNumSuccessors() > 1 &&
+          (PN->getParent() != L->getHeader() || !L->contains(PHIPred))) {
+        
+        // First step, split the critical edge.
+        SplitCriticalEdge(PHIPred, PN->getParent(), P, false);
+            
+        // Next step: move the basic block.  In particular, if the PHI node
+        // is outside of the loop, and PredTI is in the loop, we want to
+        // move the block to be immediately before the PHI block, not
+        // immediately after PredTI.
+        if (L->contains(PHIPred) && !L->contains(PN->getParent())) {
+          BasicBlock *NewBB = PN->getIncomingBlock(i);
+          NewBB->moveBefore(PN->getParent());
         }
+        
+        // Splitting the edge can reduce the number of PHI entries we have.
+        e = PN->getNumIncomingValues();
       }
+
       Value *&Code = InsertedCode[PN->getIncomingBlock(i)];
       if (!Code) {
         // Insert the code into the end of the predecessor block.
-        Instruction *InsertPt = (L->contains(OldLoc->getParent())) ?
-                                PN->getIncomingBlock(i)->getTerminator() :
-                                OldLoc->getParent()->getTerminator();
+        Instruction *InsertPt = PN->getIncomingBlock(i)->getTerminator();
         Code = InsertCodeForBaseAtPosition(NewBase, Rewriter, InsertPt, L);
 
         // Adjust the type back to match the PHI. Note that we can't use
@@ -1187,10 +1168,6 @@
 /// mode scale component and optional base reg. This allows the users of
 /// this stride to be rewritten as prev iv * factor. It returns 0 if no
 /// reuse is possible.  Factors can be negative on same targets, e.g. ARM.
-///
-/// If all uses are outside the loop, we don't require that all multiplies
-/// be folded into the addressing mode; a multiply (executed once) outside
-/// the loop is better than another IV within.  Well, usually.
 int64_t LoopStrengthReduce::CheckForIVReuse(bool HasBaseReg,
                                 bool AllUsesAreAddresses,
                                 bool AllUsesAreOutsideLoop,
@@ -1228,30 +1205,6 @@
             return Scale;
           }
     }
-  } else if (AllUsesAreOutsideLoop) {
-    // Accept nonconstant strides here; it is really really right to substitute
-    // an existing IV if we can.
-    // Special case, old IV is -1*x and this one is x.  Can treat this one as
-    // -1*old.
-    for (unsigned NewStride = 0, e = StrideOrder.size(); NewStride != e;
-         ++NewStride) {
-      std::map<SCEVHandle, IVsOfOneStride>::iterator SI = 
-                IVsByStride.find(StrideOrder[NewStride]);
-      if (SI == IVsByStride.end()) 
-        continue;
-      if (SCEVMulExpr *ME = dyn_cast<SCEVMulExpr>(SI->first))
-        if (SCEVConstant *SC = dyn_cast<SCEVConstant>(ME->getOperand(0)))
-          if (Stride == ME->getOperand(1) &&
-              SC->getValue()->getSExtValue() == -1LL)
-            for (std::vector<IVExpr>::iterator II = SI->second.IVs.begin(),
-                   IE = SI->second.IVs.end(); II != IE; ++II)
-              // Accept nonzero base here.
-              // Only reuse previous IV if it would not require a type conversion.
-              if (!RequiresTypeConversion(II->Base->getType(), Ty)) {
-                IV = *II;
-                return -1;
-              }
-    }
   }
   return 0;
 }
@@ -1596,18 +1549,6 @@
             !cast<ConstantInt>(CommonBaseV)->isZero())
           RewriteExpr = SE->getAddExpr(RewriteExpr,
                                        SE->getUnknown(CommonBaseV));
-        // If we're reusing an IV with a nonzero base (currently this happens
-        // only when all reuses are outside the loop) subtract out that base here
-        // This is the reverse of the above; the base HAS been used to initialize
-        // the PHI node but we don't want it here.
-        // (If the RewriteFactor is negative, we're effectively negating the
-        // old IV in this use, so we add the base instead of subtract.)
-        if (!ReuseIV.Base->isZero()) {
-          if (RewriteFactor < 0)
-            RewriteExpr = SE->getAddExpr(RewriteExpr, ReuseIV.Base);
-          else
-            RewriteExpr = SE->getMinusSCEV(RewriteExpr, ReuseIV.Base);
-        }
       }
 
       // Now that we know what we need to do, insert code before User for the




From resistor at mac.com  Wed Dec 17 19:27:20 2008
From: resistor at mac.com (Owen Anderson)
Date: Thu, 18 Dec 2008 01:27:20 -0000
Subject: [llvm-commits] [llvm] r61182 -
	/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp
Message-ID: <200812180127.mBI1RLlv025871@zion.cs.uiuc.edu>

Author: resistor
Date: Wed Dec 17 19:27:19 2008
New Revision: 61182

URL: http://llvm.org/viewvc/llvm-project?rev=61182&view=rev
Log:
Re-apply r61158 in a form that no longer breaks tests.

Modified:
    llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp

Modified: llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp?rev=61182&r1=61181&r2=61182&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp (original)
+++ llvm/trunk/lib/CodeGen/PreAllocSplitting.cpp Wed Dec 17 19:27:19 2008
@@ -41,6 +41,7 @@
 STATISTIC(NumSplits, "Number of intervals split");
 STATISTIC(NumRemats, "Number of intervals split by rematerialization");
 STATISTIC(NumFolds, "Number of intervals split with spill folding");
+STATISTIC(NumRenumbers, "Number of intervals renumbered into new registers");
 
 namespace {
   class VISIBILITY_HIDDEN PreAllocSplitting : public MachineFunctionPass {
@@ -137,7 +138,7 @@
 
     void UpdateSpillSlotInterval(VNInfo*, unsigned, unsigned);
 
-    void UpdateRegisterInterval(VNInfo*, unsigned, unsigned);
+    VNInfo* UpdateRegisterInterval(VNInfo*, unsigned, unsigned);
 
     bool ShrinkWrapToLastUse(MachineBasicBlock*, VNInfo*,
                              SmallVector<MachineOperand*, 4>&,
@@ -409,7 +410,7 @@
 /// UpdateRegisterInterval - Given the specified val# of the current live
 /// interval is being split, and the spill and restore indices, update the live
 /// interval accordingly.
-void
+VNInfo*
 PreAllocSplitting::UpdateRegisterInterval(VNInfo *ValNo, unsigned SpillIndex,
                                           unsigned RestoreIndex) {
   assert(LIs->getMBBFromIndex(RestoreIndex) == BarrierMBB &&
@@ -512,6 +513,8 @@
     unsigned End   = After[i].second;
     CurrLI->addRange(LiveRange(Start, End, AValNo));
   }
+  
+  return AValNo;
 }
 
 /// ShrinkWrapToLastUse - There are uses of the current live interval in the
@@ -700,17 +703,14 @@
   ShrinkWrapLiveInterval(ValNo, BarrierMBB, NULL, DefMI->getParent(), Visited,
                          Uses, UseMIs, UseMBBs);
 
-#if 0
-  if (!ValNo->hasPHIKill)
-    RenumberValno();
-#endif
-  // FIXME: If ValNo->hasPHIKill is false, then renumber the val# by
-  // the restore.
-
   // Remove live range from barrier to the restore. FIXME: Find a better
   // point to re-start the live interval.
-  UpdateRegisterInterval(ValNo, LIs->getUseIndex(BarrierIdx)+1,
-                         LIs->getDefIndex(RestoreIdx));
+  VNInfo* AfterValNo = UpdateRegisterInterval(ValNo,
+                                              LIs->getUseIndex(BarrierIdx)+1,
+                                              LIs->getDefIndex(RestoreIdx));
+  
+  // Attempt to renumber the new valno into a new vreg.
+  RenumberValno(AfterValNo);
 }
 
 /// RenumberValno - Split the given valno out into a new vreg, allowing it to
@@ -719,18 +719,59 @@
 /// removes them from the old interval, and rewrites all uses and defs of
 /// the original reg to the new vreg within those ranges.
 void PreAllocSplitting::RenumberValno(VNInfo* VN) {
+  SmallVector<VNInfo*, 4> Stack;
+  SmallVector<VNInfo*, 4> VNsToCopy;
+  Stack.push_back(VN);
+
+  // Walk through and copy the valno we care about, and any other valnos
+  // that are two-address redefinitions of the one we care about.  These
+  // will need to be rewritten as well.  We also check for safety of the 
+  // renumbering here, by making sure that none of the valno involved has
+  // phi kills.
+  while (!Stack.empty()) {
+    VNInfo* OldVN = Stack.back();
+    Stack.pop_back();
+    
+    // Bail out if we ever encounter a valno that has a PHI kill.  We can't
+    // renumber these.
+    if (OldVN->hasPHIKill) return;
+    
+    VNsToCopy.push_back(OldVN);
+    
+    // Locate two-address redefinitions
+    for (SmallVector<unsigned, 4>::iterator KI = OldVN->kills.begin(),
+         KE = OldVN->kills.end(); KI != KE; ++KI) {
+      MachineInstr* MI = LIs->getInstructionFromIndex(*KI);
+      //if (!MI) continue;
+      unsigned DefIdx = MI->findRegisterDefOperandIdx(CurrLI->reg);
+      if (DefIdx == ~0U) continue;
+      if (MI->isRegReDefinedByTwoAddr(DefIdx)) {
+        VNInfo* NextVN =
+                     CurrLI->findDefinedVNInfo(LiveIntervals::getDefIndex(*KI));
+        Stack.push_back(NextVN);
+      }
+    }
+  }
+  
   // Create the new vreg
   unsigned NewVReg = MRI->createVirtualRegister(MRI->getRegClass(CurrLI->reg));
   
-  // Copy over the valno and ranges
+  // Create the new live interval
   LiveInterval& NewLI = LIs->getOrCreateInterval(NewVReg);
-  VNInfo* NewVN = NewLI.getNextValue(VN->def, VN->copy, 
-                                     LIs->getVNInfoAllocator());
-  NewLI.copyValNumInfo(NewVN, VN);
-  NewLI.MergeValueInAsValue(*CurrLI, VN, NewVN);
   
-  // Remove the valno from the old interval
-  CurrLI->removeValNo(VN);
+  for (SmallVector<VNInfo*, 4>::iterator OI = VNsToCopy.begin(), OE = 
+       VNsToCopy.end(); OI != OE; ++OI) {
+    VNInfo* OldVN = *OI;
+    
+    // Copy the valno over
+    VNInfo* NewVN = NewLI.getNextValue(OldVN->def, OldVN->copy, 
+                                       LIs->getVNInfoAllocator());
+    NewLI.copyValNumInfo(NewVN, OldVN);
+    NewLI.MergeValueInAsValue(*CurrLI, OldVN, NewVN);
+
+    // Remove the valno from the old interval
+    CurrLI->removeValNo(OldVN);
+  }
   
   // Rewrite defs and uses.  This is done in two stages to avoid invalidating
   // the reg_iterator.
@@ -753,6 +794,8 @@
     MachineOperand& MO = Inst->getOperand(OpIdx);
     MO.setReg(NewVReg);
   }
+  
+  NumRenumbers++;
 }
 
 bool PreAllocSplitting::Rematerialize(unsigned vreg, VNInfo* ValNo,
@@ -1097,8 +1140,6 @@
   // Make sure blocks are numbered in order.
   MF.RenumberBlocks();
 
-#if 1
-  // FIXME: Go top down.
   MachineBasicBlock *Entry = MF.begin();
   SmallPtrSet<MachineBasicBlock*,16> Visited;
 
@@ -1117,22 +1158,6 @@
       MadeChange |= SplitRegLiveIntervals(BarrierRCs);
     }
   }
-#else
-  for (MachineFunction::reverse_iterator I = MF.rbegin(), E = MF.rend();
-       I != E; ++I) {
-    BarrierMBB = &*I;
-    for (MachineBasicBlock::reverse_iterator II = BarrierMBB->rbegin(),
-           EE = BarrierMBB->rend(); II != EE; ++II) {
-      Barrier = &*II;
-      const TargetRegisterClass **BarrierRCs =
-        Barrier->getDesc().getRegClassBarriers();
-      if (!BarrierRCs)
-        continue;
-      BarrierIdx = LIs->getInstructionIndex(Barrier);
-      MadeChange |= SplitRegLiveIntervals(BarrierRCs);
-    }
-  }
-#endif
 
   return MadeChange;
 }




From clattner at apple.com  Wed Dec 17 19:28:37 2008
From: clattner at apple.com (Chris Lattner)
Date: Wed, 17 Dec 2008 17:28:37 -0800
Subject: [llvm-commits] [llvm] r61164 - in /llvm/trunk:
	include/llvm/Analysis/DebugInfo.h
	include/llvm/CodeGen/MachineModuleInfo.h lib/Analysis/DebugInfo.cpp
In-Reply-To: <200812172239.mBHMdUc7020218@zion.cs.uiuc.edu>
References: <200812172239.mBHMdUc7020218@zion.cs.uiuc.edu>
Message-ID: <251ADCB1-E90A-4533-91E9-7264C7703035@apple.com>


On Dec 17, 2008, at 2:39 PM, Devang Patel wrote:

> Author: dpatel
> Date: Wed Dec 17 16:39:29 2008
> New Revision: 61164
>
> URL: http://llvm.org/viewvc/llvm-project?rev=61164&view=rev
> Log:
>
> Today the front-ends (llvm-gcc and clang) generate multiple  
> llvm.dbg.compile_units to identify source file for various debug  
> entities. Each llvm.dbg.compile_unit matches one file on the disk.  
> However, the backend only supports one DW_TAG_compile_unit per .o  
> file. The backend selects first compile_unit from the vector to  
> construct DW_TAG_compile_unit entry, which is not correct in all  
> cases.
>
> First step to resolve this is, record file name and directory  
> directly in debug info for various debug entities.

Hey Devang,

My understanding is that this just adds two fields to a few  
descriptors.  Instead of bumping the version number for debug info, is  
it possible to just treat structs with insufficient number of elements  
as having them set to empty?  This is what Analysis/DebugInfo does  
already for everything.

-Chris



From gohman at apple.com  Wed Dec 17 19:36:43 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 18 Dec 2008 01:36:43 -0000
Subject: [llvm-commits] [llvm] r61183 -
	/llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp
Message-ID: <200812180136.mBI1aiE6026162@zion.cs.uiuc.edu>

Author: djg
Date: Wed Dec 17 19:36:42 2008
New Revision: 61183

URL: http://llvm.org/viewvc/llvm-project?rev=61183&view=rev
Log:
Move post-RA scheduling before branch folding for now, because branch
folding's tail merging doesn't currently preserve liveness information
which post-RA scheduling requires.

Modified:
    llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp

Modified: llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp?rev=61183&r1=61182&r2=61183&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp (original)
+++ llvm/trunk/lib/CodeGen/LLVMTargetMachine.cpp Wed Dec 17 19:36:42 2008
@@ -225,13 +225,6 @@
   if (PrintMachineCode)
     PM.add(createMachineFunctionPrinterPass(cerr));
 
-  // Branch folding must be run after regalloc and prolog/epilog insertion.
-  if (!Fast)
-    PM.add(createBranchFoldingPass(getEnableTailMergeDefault()));
-
-  if (PrintMachineCode)
-    PM.add(createMachineFunctionPrinterPass(cerr));
-
   // Second pass scheduler.
   if (!Fast && !DisablePostRAScheduler) {
     PM.add(createPostRAScheduler());
@@ -240,6 +233,13 @@
       PM.add(createMachineFunctionPrinterPass(cerr));
   }
 
+  // Branch folding must be run after regalloc and prolog/epilog insertion.
+  if (!Fast)
+    PM.add(createBranchFoldingPass(getEnableTailMergeDefault()));
+
+  if (PrintMachineCode)
+    PM.add(createMachineFunctionPrinterPass(cerr));
+
   PM.add(createGCMachineCodeAnalysisPass());
 
   if (PrintMachineCode)




From gohman at apple.com  Wed Dec 17 19:37:57 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 18 Dec 2008 01:37:57 -0000
Subject: [llvm-commits] [llvm] r61184 -
	/llvm/trunk/lib/CodeGen/MachineLICM.cpp
Message-ID: <200812180137.mBI1bvVo026211@zion.cs.uiuc.edu>

Author: djg
Date: Wed Dec 17 19:37:56 2008
New Revision: 61184

URL: http://llvm.org/viewvc/llvm-project?rev=61184&view=rev
Log:
Give MachineLICM a name, for -time-passes etc.

Modified:
    llvm/trunk/lib/CodeGen/MachineLICM.cpp

Modified: llvm/trunk/lib/CodeGen/MachineLICM.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineLICM.cpp?rev=61184&r1=61183&r2=61184&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/MachineLICM.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineLICM.cpp Wed Dec 17 19:37:56 2008
@@ -49,6 +49,8 @@
 
     virtual bool runOnMachineFunction(MachineFunction &MF);
 
+    const char *getPassName() const { return "Machine Instruction LICM"; }
+
     // FIXME: Loop preheaders?
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.setPreservesCFG();




From isanbard at gmail.com  Wed Dec 17 19:45:16 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Thu, 18 Dec 2008 01:45:16 -0000
Subject: [llvm-commits] [llvm] r61185 - /llvm/tags/Apple/llvmCore-2090/
Message-ID: <200812180145.mBI1jHpk026420@zion.cs.uiuc.edu>

Author: void
Date: Wed Dec 17 19:45:16 2008
New Revision: 61185

URL: http://llvm.org/viewvc/llvm-project?rev=61185&view=rev
Log:
Creating llvmCore-2090 branch

Added:
    llvm/tags/Apple/llvmCore-2090/
      - copied from r61184, llvm/trunk/



From isanbard at gmail.com  Wed Dec 17 19:45:25 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Thu, 18 Dec 2008 01:45:25 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61186 -
	/llvm-gcc-4.2/tags/Apple/llvmgcc42-2090/
Message-ID: <200812180145.mBI1jPYk026433@zion.cs.uiuc.edu>

Author: void
Date: Wed Dec 17 19:45:24 2008
New Revision: 61186

URL: http://llvm.org/viewvc/llvm-project?rev=61186&view=rev
Log:
Creating llvmgcc42-2090 branch

Added:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2090/
      - copied from r61185, llvm-gcc-4.2/trunk/



From nicholas at mxc.ca  Wed Dec 17 20:15:06 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Thu, 18 Dec 2008 02:15:06 -0000
Subject: [llvm-commits] [llvm] r61189 - /llvm/trunk/docs/AliasAnalysis.html
Message-ID: <200812180215.mBI2F7ap027388@zion.cs.uiuc.edu>

Author: nicholas
Date: Wed Dec 17 20:15:05 2008
New Revision: 61189

URL: http://llvm.org/viewvc/llvm-project?rev=61189&view=rev
Log:
Recommit this grammar fix that was backed out along with nocapture.

Modified:
    llvm/trunk/docs/AliasAnalysis.html

Modified: llvm/trunk/docs/AliasAnalysis.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/AliasAnalysis.html?rev=61189&r1=61188&r2=61189&view=diff

==============================================================================
--- llvm/trunk/docs/AliasAnalysis.html (original)
+++ llvm/trunk/docs/AliasAnalysis.html Wed Dec 17 20:15:05 2008
@@ -192,11 +192,11 @@
 
 <div class="doc_text">
 <p>The NoAlias response is used when the two pointers refer to distinct objects,
-even regardless of whether the pointers compare equal.  For example, freed
-pointers don't alias any pointers that were allocated afterwards.  As a
-degenerate case, pointers returned by malloc(0) have no bytes for an object,
-and are considered NoAlias even when malloc returns the same pointer.  The same
-rule applies to NULL pointers.</p>
+regardless of whether the pointers compare equal.  For example, freed pointers
+don't alias any pointers that were allocated afterwards.  As a degenerate case,
+pointers returned by malloc(0) have no bytes for an object, and are considered
+NoAlias even when malloc returns the same pointer.  The same rule applies to
+NULL pointers.</p>
 
 <p>The MayAlias response is used whenever the two pointers might refer to the
 same object.  If the two memory objects overlap, but do not start at the same




From isanbard at gmail.com  Wed Dec 17 20:36:54 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Thu, 18 Dec 2008 02:36:54 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61190 - in /llvm-gcc-4.2/trunk/gcc:
	c-parser.c cp/parser.c
Message-ID: <200812180236.mBI2atnP028431@zion.cs.uiuc.edu>

Author: void
Date: Wed Dec 17 20:36:53 2008
New Revision: 61190

URL: http://llvm.org/viewvc/llvm-project?rev=61190&view=rev
Log:
- The type of the block_descriptor part of a block_literal was different from
  its actual type. This corrects that.
- Also, block_helpers are constant.

Modified:
    llvm-gcc-4.2/trunk/gcc/c-parser.c
    llvm-gcc-4.2/trunk/gcc/cp/parser.c

Modified: llvm-gcc-4.2/trunk/gcc/c-parser.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-parser.c?rev=61190&r1=61189&r2=61190&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-parser.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-parser.c Wed Dec 17 20:36:53 2008
@@ -9662,8 +9662,11 @@
 	      rest_of_decl_compilation (NSConcreteGlobalBlock_decl, 0, 0);
 	    }
 	}
+      /* LLVM LOCAL begin radar 5865221 */
       initlist = build_tree_list (fields,
-				  build_fold_addr_expr (NSConcreteGlobalBlock_decl));
+                                  convert (ptr_type_node,
+                                           build_fold_addr_expr (NSConcreteGlobalBlock_decl)));
+      /* LLVM LOCAL end radar 5865221 */
       flags |= BLOCK_IS_GLOBAL;
     }
   else
@@ -9683,8 +9686,11 @@
 	      rest_of_decl_compilation (NSConcreteStackBlock_decl, 0, 0);
 	    }
 	}
+      /* LLVM LOCAL begin radar 5865221 */
       initlist = build_tree_list (fields,
-				  build_fold_addr_expr (NSConcreteStackBlock_decl));
+                                  convert (ptr_type_node,
+                                           build_fold_addr_expr (NSConcreteStackBlock_decl)));
+      /* LLVM LOCAL end radar 5865221 */
     }
   fields = TREE_CHAIN (fields);
 
@@ -9707,9 +9713,11 @@
   fields = TREE_CHAIN (fields);
 
   /* __descriptor */
+  /* LLVM LOCAL begin radar 5865221 */
   initlist = tree_cons (fields,
-			convert (ptr_type_node, build_fold_addr_expr (descriptor_block_decl)),
+			build_fold_addr_expr (descriptor_block_decl),
 			initlist);
+  /* LLVM LOCAL end radar 5865221 */
   for (chain = block_impl->block_original_ref_decl_list; chain;
        chain = TREE_CHAIN (chain))
     {
@@ -9833,6 +9841,8 @@
     TREE_STATIC (block_holder_tmp_decl) = 1;
     finish_decl (block_holder_tmp_decl, constructor, NULL_TREE);
   }
+  /* LLVM LOCAL radar 5865221 */
+  TREE_CONSTANT (block_holder_tmp_decl) = 1;
   return block_holder_tmp_decl;
 }
 /* APPLE LOCAL end radar 5847213 - radar 6329245 */

Modified: llvm-gcc-4.2/trunk/gcc/cp/parser.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/parser.c?rev=61190&r1=61189&r2=61190&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/parser.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/parser.c Wed Dec 17 20:36:53 2008
@@ -20876,7 +20876,11 @@
 	      rest_of_decl_compilation (NSConcreteGlobalBlock_decl, 0, 0);
 	    }
 	}
-      CONSTRUCTOR_APPEND_ELT(impl_v, NULL_TREE, build_fold_addr_expr (NSConcreteGlobalBlock_decl));
+      /* LLVM LOCAL begin radar 5865221 */
+      CONSTRUCTOR_APPEND_ELT(impl_v, NULL_TREE,
+                             convert (ptr_type_node,
+                                      build_fold_addr_expr (NSConcreteGlobalBlock_decl)));
+      /* LLVM LOCAL end radar 5865221 */
       flags |= BLOCK_IS_GLOBAL;
     }
   else
@@ -20896,7 +20900,11 @@
 	      rest_of_decl_compilation (NSConcreteStackBlock_decl, 0, 0);
 	    }
 	}
-      CONSTRUCTOR_APPEND_ELT(impl_v, NULL_TREE, build_fold_addr_expr (NSConcreteStackBlock_decl));
+      /* LLVM LOCAL begin radar 5865221 */
+      CONSTRUCTOR_APPEND_ELT(impl_v, NULL_TREE,
+                             convert (ptr_type_node,
+                                      build_fold_addr_expr (NSConcreteStackBlock_decl)));
+      /* LLVM LOCAL end radar 5865221 */
     }
 
   /* __flags */
@@ -21029,6 +21037,8 @@
     TREE_PUBLIC (block_holder_tmp_decl) = 0;
     TREE_STATIC (block_holder_tmp_decl) = 1;
   }
+  /* LLVM LOCAL radar 5865221 */
+  TREE_CONSTANT (block_holder_tmp_decl) = 1;
   cp_finish_decl (block_holder_tmp_decl, constructor, 0, 0, LOOKUP_ONLYCONVERTING);
   return block_holder_tmp_decl;
 }




From monping at apple.com  Wed Dec 17 20:37:23 2008
From: monping at apple.com (Mon Ping Wang)
Date: Wed, 17 Dec 2008 18:37:23 -0800
Subject: [llvm-commits] Patch: x86 multiply v2i64
Message-ID: <639E7FE9-13A5-400A-ABC6-79CC945EFF78@apple.com>

Hi,

This is a patch to fix multiply of v2i64.  Today, on SSE4.1, we map a  
multiply of v2i64 to pmuldq which does two 32 bit multiples that  
generates two 64 bit results, which is incorrect.  This patch removes  
that and instead lowers it to set of vector code that works for  
SSE2+.  Please let me know if you have any comments.

Thanks,
   -- Mon Ping

-------------- next part --------------
A non-text attachment was scrubbed...
Name: mulv2i16.patch
Type: application/octet-stream
Size: 4464 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081217/903eddbb/attachment.obj 

From eli.friedman at gmail.com  Wed Dec 17 21:16:20 2008
From: eli.friedman at gmail.com (Eli Friedman)
Date: Wed, 17 Dec 2008 19:16:20 -0800
Subject: [llvm-commits] Patch: x86 multiply v2i64
In-Reply-To: <639E7FE9-13A5-400A-ABC6-79CC945EFF78@apple.com>
References: <639E7FE9-13A5-400A-ABC6-79CC945EFF78@apple.com>
Message-ID: <f5aa3e9b0812171916r76e057b3pd2351635e23177a@mail.gmail.com>

On Wed, Dec 17, 2008 at 6:37 PM, Mon Ping Wang <monping at apple.com> wrote:
> Hi,
>
> This is a patch to fix multiply of v2i64.  Today, on SSE4.1, we map a
> multiply of v2i64 to pmuldq which does two 32 bit multiples that generates
> two 64 bit results, which is incorrect.  This patch removes that

Did you forget to include a file in your patch?

> and instead
> lowers it to set of vector code that works for SSE2+.  Please let me know if
> you have any comments.

On x86-64, would we prefer to scalarize this?  Other than that, looks fine.

-Eli


From monping at apple.com  Wed Dec 17 22:06:20 2008
From: monping at apple.com (Mon Ping Wang)
Date: Wed, 17 Dec 2008 20:06:20 -0800
Subject: [llvm-commits] Patch: x86 multiply v2i64
In-Reply-To: <f5aa3e9b0812171916r76e057b3pd2351635e23177a@mail.gmail.com>
References: <639E7FE9-13A5-400A-ABC6-79CC945EFF78@apple.com>
	<f5aa3e9b0812171916r76e057b3pd2351635e23177a@mail.gmail.com>
Message-ID: <CA115B0A-0585-4D83-B7FF-1C47E22C0E83@apple.com>

Hi Eli,

On Dec 17, 2008, at 7:16 PM, Eli Friedman wrote:

> On Wed, Dec 17, 2008 at 6:37 PM, Mon Ping Wang <monping at apple.com>  
> wrote:
>> Hi,
>>
>> This is a patch to fix multiply of v2i64.  Today, on SSE4.1, we map a
>> multiply of v2i64 to pmuldq which does two 32 bit multiples that  
>> generates
>> two 64 bit results, which is incorrect.  This patch removes that
>
> Did you forget to include a file in your patch?
>

I should have included the changes to lib/Target/X86/X86InstrSSE.td  
that no longer maps a mul to pmuldq.  This is included in the updated  
patch.

>> and instead
>> lowers it to set of vector code that works for SSE2+.  Please let  
>> me know if
>> you have any comments.
>
> On x86-64, would we prefer to scalarize this?  Other than that,  
> looks fine.
>

On X86-64 with SSE4.1, it is pretty much a wash in terms of  
instruction count.  It should be a win in the other cases.

Thanks,
  -- Mon PIng

-------------- next part --------------
A non-text attachment was scrubbed...
Name: mulv2i16.patch
Type: application/octet-stream
Size: 6335 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081217/b653fadc/attachment.obj 
-------------- next part --------------


> -Eli
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


From foldr at codedgers.com  Wed Dec 17 22:07:01 2008
From: foldr at codedgers.com (Mikhail Glushenkov)
Date: Thu, 18 Dec 2008 04:07:01 -0000
Subject: [llvm-commits] [llvm] r61191 -
	/llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp
Message-ID: <200812180407.mBI471pv031058@zion.cs.uiuc.edu>

Author: foldr
Date: Wed Dec 17 22:06:58 2008
New Revision: 61191

URL: http://llvm.org/viewvc/llvm-project?rev=61191&view=rev
Log:
Fix typo in error message.

Modified:
    llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp

Modified: llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp?rev=61191&r1=61190&r2=61191&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/LLVMCConfigurationEmitter.cpp Wed Dec 17 22:06:58 2008
@@ -1560,7 +1560,7 @@
 
   else
     throw "Unknown operator in edge properties list: " + OpName + '!' +
-      "Only 'inc_weight', 'dec_weight' and 'error' are allowed.";
+      "\nOnly 'inc_weight', 'dec_weight' and 'error' are allowed.";
 
   if (d.getNumArgs() > 0)
     O << InitPtrToInt(d.getArg(0)) << ";\n";




From nicholas at mxc.ca  Wed Dec 17 23:04:19 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Wed, 17 Dec 2008 21:04:19 -0800
Subject: [llvm-commits] [llvm] r61094 - in /llvm/trunk:
 docs/AliasAnalysis.html docs/LangRef.html include/llvm/Attributes.h
 lib/Analysis/BasicAliasAnalysis.cpp lib/AsmParser/LLLexer.cpp
 lib/AsmParser/llvmAsmParser.y lib/Bitcode/Reader/BitcodeReader.cpp
 lib/Bitcode/Writer/BitcodeWriter.cpp lib/VMCore/Attributes.cpp
 test/Analysis/BasicAA/nocapture.ll
In-Reply-To: <200812161906.mBGJ6uTg021611@zion.cs.uiuc.edu>
References: <200812161906.mBGJ6uTg021611@zion.cs.uiuc.edu>
Message-ID: <4949D9D3.4010208@mxc.ca>

Hi Bill,

I was never able to reproduce the problem, but I think I found the fix 
by inspection. Would you please test out the attached patch?

The bug was that constructAlignmentFromInt was asserting that its input 
was a power of 2, which 0 is not. Zero is a valid alignment, and is 
explicitly set by llvm-gcc when passing structs byval on OS X.

Nick

Bill Wendling wrote:
> Author: void
> Date: Tue Dec 16 13:06:48 2008
> New Revision: 61094
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=61094&view=rev
> Log:
> Temporarily revert r61019, r61030, and r61040. These were breaking LLVM Release
> builds.
> 
> Modified:
>     llvm/trunk/docs/AliasAnalysis.html
>     llvm/trunk/docs/LangRef.html
>     llvm/trunk/include/llvm/Attributes.h
>     llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
>     llvm/trunk/lib/AsmParser/LLLexer.cpp
>     llvm/trunk/lib/AsmParser/llvmAsmParser.y
>     llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
>     llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
>     llvm/trunk/lib/VMCore/Attributes.cpp
>     llvm/trunk/test/Analysis/BasicAA/nocapture.ll
> 
> Modified: llvm/trunk/docs/AliasAnalysis.html
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/AliasAnalysis.html?rev=61094&r1=61093&r2=61094&view=diff
> 
> ==============================================================================
> --- llvm/trunk/docs/AliasAnalysis.html (original)
> +++ llvm/trunk/docs/AliasAnalysis.html Tue Dec 16 13:06:48 2008
> @@ -192,11 +192,11 @@
>  
>  <div class="doc_text">
>  <p>The NoAlias response is used when the two pointers refer to distinct objects,
> -regardless of whether the pointers compare equal.  For example, freed pointers
> -don't alias any pointers that were allocated afterwards.  As a degenerate case,
> -pointers returned by malloc(0) have no bytes for an object, and are considered
> -NoAlias even when malloc returns the same pointer.  The same rule applies to
> -NULL pointers.</p>
> +even regardless of whether the pointers compare equal.  For example, freed
> +pointers don't alias any pointers that were allocated afterwards.  As a
> +degenerate case, pointers returned by malloc(0) have no bytes for an object,
> +and are considered NoAlias even when malloc returns the same pointer.  The same
> +rule applies to NULL pointers.</p>
>  
>  <p>The MayAlias response is used whenever the two pointers might refer to the
>  same object.  If the two memory objects overlap, but do not start at the same
> 
> Modified: llvm/trunk/docs/LangRef.html
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=61094&r1=61093&r2=61094&view=diff
> 
> ==============================================================================
> --- llvm/trunk/docs/LangRef.html (original)
> +++ llvm/trunk/docs/LangRef.html Tue Dec 16 13:06:48 2008
> @@ -894,15 +894,9 @@
>      parameter.  The caller is responsible for ensuring that this is the
>      case. On a function return value, <tt>noalias</tt> additionally indicates
>      that the pointer does not alias any other pointers visible to the
> -    caller. For further details, please see the discussion of the NoAlias
> -    response in
> -    <a href="http://llvm.org/docs/AliasAnalysis.html#MustMayNo">alias
> -    analysis</a>.</dd>
> -
> -    <dt><tt>nocapture</tt></dt>
> -    <dd>This indicates that the callee does not make any copies of the pointer
> -    that outlive the callee itself. This is not a valid attribute for return
> -    values.</dd>
> +    caller. Note that this applies only to pointers that can be used to actually
> +    load/store a value: NULL, unique pointers from malloc(0), and freed pointers
> +    are considered to not alias anything.</dd>
>  
>      <dt><tt>nest</tt></dt>
>      <dd>This indicates that the pointer parameter can be excised using the
> 
> Modified: llvm/trunk/include/llvm/Attributes.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=61094&r1=61093&r2=61094&view=diff
> 
> ==============================================================================
> --- llvm/trunk/include/llvm/Attributes.h (original)
> +++ llvm/trunk/include/llvm/Attributes.h Tue Dec 16 13:06:48 2008
> @@ -15,7 +15,6 @@
>  #ifndef LLVM_ATTRIBUTES_H
>  #define LLVM_ATTRIBUTES_H
>  
> -#include "llvm/Support/MathExtras.h"
>  #include <cassert>
>  #include <string>
>  
> @@ -24,7 +23,7 @@
>  
>  /// Attributes - A bitset of attributes.
>  typedef unsigned Attributes;
> -
> +  
>  namespace Attribute {
>  
>  /// Function parameters and results can have attributes to indicate how they 
> @@ -45,18 +44,16 @@
>  const Attributes Nest      = 1<<8;  ///< Nested function static chain
>  const Attributes ReadNone  = 1<<9;  ///< Function does not access memory
>  const Attributes ReadOnly  = 1<<10; ///< Function only reads from memory
> -const Attributes NoInline        = 1<<11; ///< inline=never 
> -const Attributes AlwaysInline    = 1<<12; ///< inline=always
> -const Attributes OptimizeForSize = 1<<13; ///< opt_size
> -const Attributes StackProtect    = 1<<14; ///< Stack protection.
> -const Attributes StackProtectReq = 1<<15; ///< Stack protection required.
> -const Attributes Alignment = 31<<16; ///< Alignment of parameter (5 bits)
> -                                     // stored as log2 of alignment with +1 bias
> -                                     // 0 means unaligned different from align 1
> -const Attributes NoCapture = 1<<21; ///< Function creates no aliases of pointer
> -
> +const Attributes NoInline        = 1<<11; // inline=never 
> +const Attributes AlwaysInline    = 1<<12; // inline=always
> +const Attributes OptimizeForSize = 1<<13; // opt_size
> +const Attributes StackProtect    = 1<<14; // Stack protection.
> +const Attributes StackProtectReq = 1<<15; // Stack protection required.
> +const Attributes Alignment = 0xffff<<16; ///< Alignment of parameter (16 bits)
> +                                    // 0 = unknown, else in clear (not log)
> +                                    
>  /// @brief Attributes that only apply to function parameters.
> -const Attributes ParameterOnly = ByVal | Nest | StructRet | NoCapture;
> +const Attributes ParameterOnly = ByVal | Nest | StructRet;
>  
>  /// @brief Attributes that only apply to function.
>  const Attributes FunctionOnly = NoReturn | NoUnwind | ReadNone | ReadOnly | 
> @@ -67,7 +64,7 @@
>  
>  /// @brief Attributes that are mutually incompatible.
>  const Attributes MutuallyIncompatible[4] = {
> -  ByVal | InReg | Nest | StructRet,
> +  ByVal | InReg | Nest  | StructRet,
>    ZExt  | SExt,
>    ReadNone | ReadOnly,
>    NoInline | AlwaysInline
> @@ -79,9 +76,7 @@
>  /// This turns an int alignment (a power of 2, normally) into the
>  /// form used internally in Attributes.
>  inline Attributes constructAlignmentFromInt(unsigned i) {
> -  assert(isPowerOf2_32(i) && "Alignment must be a power of two.");
> -  assert(i <= 0x40000000 && "Alignment too large.");
> -  return (Log2_32(i)+1) << 16;
> +  return (i << 16);
>  }
>  
>  /// The set of Attributes set in Attributes is converted to a
> @@ -180,7 +175,7 @@
>    /// getParamAlignment - Return the alignment for the specified function
>    /// parameter.
>    unsigned getParamAlignment(unsigned Idx) const {
> -    return 1ull << (((getAttributes(Idx) & Attribute::Alignment) >> 16) - 1);
> +    return (getAttributes(Idx) & Attribute::Alignment) >> 16;
>    }
>    
>    /// hasAttrSomewhere - Return true if the specified attribute is set for at
> 
> Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=61094&r1=61093&r2=61094&view=diff
> 
> ==============================================================================
> --- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original)
> +++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Tue Dec 16 13:06:48 2008
> @@ -63,23 +63,12 @@
>        // callees could modify it.
>        break; // next use
>      case Instruction::Call:
> -      // If the argument to the call has the nocapture attribute, then the call
> -      // may store or load to the pointer, but it cannot escape.
> -      if (cast<CallInst>(I)->paramHasAttr(UI.getOperandNo(), 
> -                                          Attribute::NoCapture))
> -        continue;
> -
> -      // FIXME: MemIntrinsics should have their operands marked nocapture!
> -      if (isa<MemIntrinsic>(I))
> -        continue;  // next use
> -      return true;
> -    case Instruction::Invoke:
> -      // If the argument to the call has the nocapture attribute, then the call
> -      // may store or load to the pointer, but it cannot escape.
> -      if (cast<InvokeInst>(I)->paramHasAttr(UI.getOperandNo()-2,
> -                                            Attribute::NoCapture))
> -        continue;
> -      return true;
> +      // If the call is to a few known safe intrinsics, we know that it does
> +      // not escape.
> +      // TODO: Eventually just check the 'nocapture' attribute.
> +      if (!isa<MemIntrinsic>(I))
> +        return true;
> +      break;  // next use
>      default:
>        return true;
>      }
> 
> Modified: llvm/trunk/lib/AsmParser/LLLexer.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLLexer.cpp?rev=61094&r1=61093&r2=61094&view=diff
> 
> ==============================================================================
> --- llvm/trunk/lib/AsmParser/LLLexer.cpp (original)
> +++ llvm/trunk/lib/AsmParser/LLLexer.cpp Tue Dec 16 13:06:48 2008
> @@ -491,7 +491,6 @@
>    KEYWORD("nounwind", NOUNWIND);
>    KEYWORD("noreturn", NORETURN);
>    KEYWORD("noalias", NOALIAS);
> -  KEYWORD("nocapture", NOCAPTURE);
>    KEYWORD("byval", BYVAL);
>    KEYWORD("nest", NEST);
>    KEYWORD("readnone", READNONE);
> 
> Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=61094&r1=61093&r2=61094&view=diff
> 
> ==============================================================================
> --- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
> +++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Dec 16 13:06:48 2008
> @@ -1136,8 +1136,8 @@
>  %token <OtherOpVal> EXTRACTVALUE INSERTVALUE
>  
>  // Function Attributes
> -%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS NOCAPTURE BYVAL
> -%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ NEST
> +%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST
> +%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ
>  
>  // Visibility Styles
>  %token DEFAULT HIDDEN PROTECTED
> @@ -1265,16 +1265,15 @@
>                    CHECK_FOR_ERROR
>                   };
>  
> -Attribute     : ZEROEXT   { $$ = Attribute::ZExt;      }
> -              | ZEXT      { $$ = Attribute::ZExt;      }
> -              | SIGNEXT   { $$ = Attribute::SExt;      }
> -              | SEXT      { $$ = Attribute::SExt;      }
> -              | INREG     { $$ = Attribute::InReg;     }
> -              | SRET      { $$ = Attribute::StructRet; }
> -              | NOALIAS   { $$ = Attribute::NoAlias;   }
> -              | NOCAPTURE { $$ = Attribute::NoCapture; }
> -              | BYVAL     { $$ = Attribute::ByVal;     }
> -              | NEST      { $$ = Attribute::Nest;      }
> +Attribute     : ZEROEXT { $$ = Attribute::ZExt;      }
> +              | ZEXT    { $$ = Attribute::ZExt;      }
> +              | SIGNEXT { $$ = Attribute::SExt;      }
> +              | SEXT    { $$ = Attribute::SExt;      }
> +              | INREG   { $$ = Attribute::InReg;     }
> +              | SRET    { $$ = Attribute::StructRet; }
> +              | NOALIAS { $$ = Attribute::NoAlias;   }
> +              | BYVAL   { $$ = Attribute::ByVal;     }
> +              | NEST    { $$ = Attribute::Nest;      }
>                | ALIGN EUINT64VAL { $$ =
>                            Attribute::constructAlignmentFromInt($2);    }
>                ;
> @@ -1332,8 +1331,6 @@
>    $$ = $2;
>    if ($$ != 0 && !isPowerOf2_32($$))
>      GEN_ERROR("Alignment must be a power of two");
> -  if ($$ > 0x40000000)
> -    GEN_ERROR("Alignment too large");
>    CHECK_FOR_ERROR
>  };
>  OptCAlign : /*empty*/            { $$ = 0; } |
> @@ -1341,8 +1338,6 @@
>    $$ = $3;
>    if ($$ != 0 && !isPowerOf2_32($$))
>      GEN_ERROR("Alignment must be a power of two");
> -  if ($$ > 0x40000000)
> -    GEN_ERROR("Alignment too large");
>    CHECK_FOR_ERROR
>  };
>  
> @@ -1372,8 +1367,6 @@
>    | ALIGN EUINT64VAL {
>      if ($2 != 0 && !isPowerOf2_32($2))
>        GEN_ERROR("Alignment must be a power of two");
> -    if ($2 > 0x40000000)
> -      GEN_ERROR("Alignment too large");
>      CurGV->setAlignment($2);
>      CHECK_FOR_ERROR
>    };
> 
> Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=61094&r1=61093&r2=61094&view=diff
> 
> ==============================================================================
> --- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
> +++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Tue Dec 16 13:06:48 2008
> @@ -362,20 +362,6 @@
>        Attributes RetAttribute = Attribute::None;
>        Attributes FnAttribute = Attribute::None;
>        for (unsigned i = 0, e = Record.size(); i != e; i += 2) {
> -        // FIXME: remove in LLVM 3.0
> -        // The alignment is stored as a 16-bit raw value from bits 31--16.
> -        // We shift the bits above 31 down by 11 bits.
> -
> -        unsigned Alignment = (Record[i+1] & (0xffffull << 16)) >> 16;
> -        if (Alignment && !isPowerOf2_32(Alignment))
> -          return Error("Alignment is not a power of two.");
> -
> -        Attributes ReconstitutedAttr = Record[i+1] & 0xffff;
> -        if (Alignment)
> -          ReconstitutedAttr |= Attribute::constructAlignmentFromInt(Alignment);
> -        ReconstitutedAttr |= (Record[i+1] & (0xffffull << 32)) >> 11;
> -        Record[i+1] = ReconstitutedAttr;
> -
>          if (Record[i] == 0)
>            RetAttribute = Record[i+1];
>          else if (Record[i] == ~0U)
> 
> Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=61094&r1=61093&r2=61094&view=diff
> 
> ==============================================================================
> --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
> +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Tue Dec 16 13:06:48 2008
> @@ -122,17 +122,7 @@
>      for (unsigned i = 0, e = A.getNumSlots(); i != e; ++i) {
>        const AttributeWithIndex &PAWI = A.getSlot(i);
>        Record.push_back(PAWI.Index);
> -
> -      // FIXME: remove in LLVM 3.0
> -      // Store the alignment in the bitcode as a 16-bit raw value instead of a
> -      // 5-bit log2 encoded value. Shift the bits above the alignment up by
> -      // 11 bits.
> -      uint64_t FauxAttr = PAWI.Attrs & 0xffff;
> -      if (PAWI.Attrs & Attribute::Alignment)
> -        FauxAttr |= (1ull<<16)<<(((PAWI.Attrs & Attribute::Alignment)-1) >> 16);
> -      FauxAttr |= (PAWI.Attrs & (0x3FFull << 21)) << 11;
> -
> -      Record.push_back(FauxAttr);
> +      Record.push_back(PAWI.Attrs);
>      }
>      
>      Stream.EmitRecord(bitc::PARAMATTR_CODE_ENTRY, Record);
> 
> Modified: llvm/trunk/lib/VMCore/Attributes.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?rev=61094&r1=61093&r2=61094&view=diff
> 
> ==============================================================================
> --- llvm/trunk/lib/VMCore/Attributes.cpp (original)
> +++ llvm/trunk/lib/VMCore/Attributes.cpp Tue Dec 16 13:06:48 2008
> @@ -37,8 +37,6 @@
>      Result += "inreg ";
>    if (Attrs & Attribute::NoAlias)
>      Result += "noalias ";
> -  if (Attrs & Attribute::NoCapture)
> -    Result += "nocapture ";
>    if (Attrs & Attribute::StructRet)
>      Result += "sret ";  
>    if (Attrs & Attribute::ByVal)
> @@ -61,11 +59,10 @@
>      Result += "sspreq ";
>    if (Attrs & Attribute::Alignment) {
>      Result += "align ";
> -    Result += utostr(1ull << (((Attrs & Attribute::Alignment)>>16) - 1));
> +    Result += utostr((Attrs & Attribute::Alignment) >> 16);
>      Result += " ";
>    }
>    // Trim the trailing space.
> -  assert(!Result.empty() && "Unknown attribute!");
>    Result.erase(Result.end()-1);
>    return Result;
>  }
> @@ -79,7 +76,7 @@
>    
>    if (!isa<PointerType>(Ty))
>      // Attributes that only apply to pointers.
> -    Incompatible |= ByVal | Nest | NoAlias | StructRet | NoCapture;
> +    Incompatible |= ByVal | Nest | NoAlias | StructRet;
>    
>    return Incompatible;
>  }
> 
> Modified: llvm/trunk/test/Analysis/BasicAA/nocapture.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/BasicAA/nocapture.ll?rev=61094&r1=61093&r2=61094&view=diff
> 
> ==============================================================================
> --- llvm/trunk/test/Analysis/BasicAA/nocapture.ll (original)
> +++ llvm/trunk/test/Analysis/BasicAA/nocapture.ll Tue Dec 16 13:06:48 2008
> @@ -1,13 +0,0 @@
> -; RUN: llvm-as < %s | opt -basicaa -gvn -instcombine | llvm-dis | grep {ret i32 0}
> -
> -declare i32* @test(i32* nocapture)
> -
> -define i32 @test2() {
> -	%P = alloca i32
> -	%Q = call i32* @test(i32* %P)
> -	%a = load i32* %P
> -	store i32 4, i32* %Q   ;; cannot clobber P since it is nocapture.
> -	%b = load i32* %P
> -	%c = sub i32 %a, %b
> -	ret i32 %c
> -}
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: nocapture.patch
Type: text/x-diff
Size: 12488 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081217/c2dcde02/attachment.bin 

From sabre at nondot.org  Wed Dec 17 23:52:59 2008
From: sabre at nondot.org (Chris Lattner)
Date: Thu, 18 Dec 2008 05:52:59 -0000
Subject: [llvm-commits] [llvm] r61194 -
	/llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp
Message-ID: <200812180552.mBI5qxRR002202@zion.cs.uiuc.edu>

Author: lattner
Date: Wed Dec 17 23:52:56 2008
New Revision: 61194

URL: http://llvm.org/viewvc/llvm-project?rev=61194&view=rev
Log:
Fix PR2929 by making bugpoint/code extract propagate the nothrow
bit from the original function to the cloned one.

Modified:
    llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp

Modified: llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp?rev=61194&r1=61193&r2=61194&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp (original)
+++ llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp Wed Dec 17 23:52:56 2008
@@ -283,6 +283,10 @@
                                            GlobalValue::InternalLinkage,
                                            oldFunction->getName() + "_" +
                                            header->getName(), M);
+  // If the old function is no-throw, so is the new one.
+  if (oldFunction->doesNotThrow())
+    newFunction->setDoesNotThrow(true);
+  
   newFunction->getBasicBlockList().push_back(newRootNode);
 
   // Create an iterator to name all of the arguments we inserted.




From nicholas at mxc.ca  Thu Dec 18 00:31:12 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Thu, 18 Dec 2008 06:31:12 -0000
Subject: [llvm-commits] [llvm] r61195 - in /llvm/trunk:
 lib/Transforms/Scalar/InstructionCombining.cpp
 test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll
Message-ID: <200812180631.mBI6VEvT003546@zion.cs.uiuc.edu>

Author: nicholas
Date: Thu Dec 18 00:31:11 2008
New Revision: 61195

URL: http://llvm.org/viewvc/llvm-project?rev=61195&view=rev
Log:
Make all the vector elements positive in an srem of constant vector.

Added:
    llvm/trunk/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll
Modified:
    llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=61195&r1=61194&r2=61195&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Thu Dec 18 00:31:11 2008
@@ -3089,6 +3089,29 @@
     }
   }
 
+  // If it's a constant vector, flip any negative values positive.
+  if (isa<VectorType>(I.getType())) {
+    if (ConstantVector *RHSV = dyn_cast<ConstantVector>(Op1)) {
+      unsigned VWidth = RHSV->getNumOperands();
+      std::vector<Constant *> Elts(VWidth);
+
+      for (unsigned i = 0; i != VWidth; ++i) {
+        if (ConstantInt *RHS = dyn_cast<ConstantInt>(RHSV->getOperand(i))) {
+          if (RHS->getValue().isNegative())
+            Elts[i] = cast<ConstantInt>(ConstantExpr::getNeg(RHS));
+          else
+            Elts[i] = RHS;
+        }
+      }
+
+      Constant *NewRHSV = ConstantVector::get(Elts);
+      if (NewRHSV != RHSV) {
+        I.setOperand(1, NewRHSV);
+        return &I;
+      }
+    }
+  }
+
   return 0;
 }
 

Added: llvm/trunk/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll?rev=61195&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll (added)
+++ llvm/trunk/test/Transforms/InstCombine/2008-12-17-SRemNegConstVec.ll Thu Dec 18 00:31:11 2008
@@ -0,0 +1,7 @@
+; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep {i8 2, i8 2}
+; PR2756
+
+define <2 x i8> @foo(<2 x i8> %x) {
+  %A = srem <2 x i8> %x, <i8 2, i8 -2>
+  ret <2 x i8> %A
+}




From nicholas at mxc.ca  Thu Dec 18 00:42:30 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Thu, 18 Dec 2008 06:42:30 -0000
Subject: [llvm-commits] [llvm] r61196 -
	/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200812180642.mBI6gVfq003934@zion.cs.uiuc.edu>

Author: nicholas
Date: Thu Dec 18 00:42:28 2008
New Revision: 61196

URL: http://llvm.org/viewvc/llvm-project?rev=61196&view=rev
Log:
Oops! Left out a line.
Simplifying the sdiv might allow further simplifications for our users.

Modified:
    llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=61196&r1=61195&r2=61196&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Thu Dec 18 00:42:28 2008
@@ -3106,6 +3106,7 @@
 
       Constant *NewRHSV = ConstantVector::get(Elts);
       if (NewRHSV != RHSV) {
+        AddUsesToWorkList(I);
         I.setOperand(1, NewRHSV);
         return &I;
       }




From evan.cheng at apple.com  Thu Dec 18 03:01:27 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Thu, 18 Dec 2008 09:01:27 -0000
Subject: [llvm-commits] [llvm] r61201 - /llvm/trunk/lib/Analysis/LoopInfo.cpp
Message-ID: <200812180901.mBI91UjY008923@zion.cs.uiuc.edu>

Author: evancheng
Date: Thu Dec 18 03:01:18 2008
New Revision: 61201

URL: http://llvm.org/viewvc/llvm-project?rev=61201&view=rev
Log:
Remove dead comments.

Modified:
    llvm/trunk/lib/Analysis/LoopInfo.cpp

Modified: llvm/trunk/lib/Analysis/LoopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/LoopInfo.cpp?rev=61201&r1=61200&r2=61201&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/LoopInfo.cpp (original)
+++ llvm/trunk/lib/Analysis/LoopInfo.cpp Thu Dec 18 03:01:18 2008
@@ -35,9 +35,6 @@
 // Loop implementation
 //
 
-/// getNumBackEdges - Calculate the number of back edges to the loop header.
-///
-
 //===----------------------------------------------------------------------===//
 // LoopInfo implementation
 //




From dpatel at apple.com  Thu Dec 18 11:44:56 2008
From: dpatel at apple.com (Devang Patel)
Date: Thu, 18 Dec 2008 09:44:56 -0800
Subject: [llvm-commits] [llvm] r61164 - in /llvm/trunk:
	include/llvm/Analysis/DebugInfo.h	include/llvm/CodeGen/MachineModuleInfo.h
	lib/Analysis/DebugInfo.cpp
In-Reply-To: <251ADCB1-E90A-4533-91E9-7264C7703035@apple.com>
References: <200812172239.mBHMdUc7020218@zion.cs.uiuc.edu>
	<251ADCB1-E90A-4533-91E9-7264C7703035@apple.com>
Message-ID: <F0C96781-5777-451D-8A55-1B047680292F@apple.com>


On Dec 17, 2008, at 5:28 PM, Chris Lattner wrote:

>
> On Dec 17, 2008, at 2:39 PM, Devang Patel wrote:
>
>> Author: dpatel
>> Date: Wed Dec 17 16:39:29 2008
>> New Revision: 61164
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=61164&view=rev
>> Log:
>>
>> Today the front-ends (llvm-gcc and clang) generate multiple
>> llvm.dbg.compile_units to identify source file for various debug
>> entities. Each llvm.dbg.compile_unit matches one file on the disk.
>> However, the backend only supports one DW_TAG_compile_unit per .o
>> file. The backend selects first compile_unit from the vector to
>> construct DW_TAG_compile_unit entry, which is not correct in all
>> cases.
>>
>> First step to resolve this is, record file name and directory
>> directly in debug info for various debug entities.
>
> Hey Devang,
>
> My understanding is that this just adds two fields to a few
> descriptors.  Instead of bumping the version number for debug info, is
> it possible to just treat structs with insufficient number of elements
> as having them set to empty?  This is what Analysis/DebugInfo does
> already for everything.


I want to use version number to decide:

1) Emit DW_TAG_compile_unit for each DICompileUnit seen vs. Emit just  
one DW_TAG_compile_unit even though multiple DICompileUnit is seen.  
This is for backward compatibility.

2) Use compile_unit to identify source file info. vs. use filename  
field for source file info. In version7, filename field must provide  
source file info. (when required) otherwise we are dealing with  
invalid llvm.dbg value.
-
Devang





From sabre at nondot.org  Thu Dec 18 12:02:23 2008
From: sabre at nondot.org (Chris Lattner)
Date: Thu, 18 Dec 2008 12:02:23 -0600
Subject: [llvm-commits] CVS:
	llvm-www/pubs/2008-06-LCTES-ISelUsingSSAGraphs.html
	2008-06-LCTES-ISelUsingSSAGraphs.pdf index.html
Message-ID: <200812181802.mBII2NWS003393@zion.cs.uiuc.edu>



Changes in directory llvm-www/pubs:

2008-06-LCTES-ISelUsingSSAGraphs.html added (r1.1)
2008-06-LCTES-ISelUsingSSAGraphs.pdf added (r1.1)
index.html updated: 1.86 -> 1.87
---
Log message:

Add a new paper from LCTES'08


---
Diffs of the changes:  (+64 -0)

 2008-06-LCTES-ISelUsingSSAGraphs.html |   58 ++++++++++++++++++++++++++++++++++
 2008-06-LCTES-ISelUsingSSAGraphs.pdf  |    0 
 index.html                            |    6 +++
 3 files changed, 64 insertions(+)


Index: llvm-www/pubs/2008-06-LCTES-ISelUsingSSAGraphs.html
diff -c /dev/null llvm-www/pubs/2008-06-LCTES-ISelUsingSSAGraphs.html:1.1
*** /dev/null	Thu Dec 18 12:01:15 2008
--- llvm-www/pubs/2008-06-LCTES-ISelUsingSSAGraphs.html	Thu Dec 18 12:01:04 2008
***************
*** 0 ****
--- 1,58 ----
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+ <html>
+ <head>
+   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+   <link rel="stylesheet" href="http://llvm.org/llvm.css" type="text/css" media="screen" />
+   <title>Generalized Instruction Selection using SSA-Graphs</title>
+ </head>
+ <body>
+ 
+ <div class="pub_title">
+   Generalized Instruction Selection using SSA-Graphs
+ </div>
+ <div class="pub_author">
+   Dietmar Ebner, Florian Brandner, Bernhard Scholz, Andreas Krall, 
+   Peter Wiedermann and Albrecht Kadlec
+ </div>
+ 
+ <h2>Abstract:</h2>
+ <blockquote>
+ <p>Instruction selection is a well-studied compiler phase that translates 
+ the compiler's intermediate representation of programs to a sequence 
+ of target-dependent machine instructions optimizing for 
+ various compiler objectives (e.g. speed and space). Most existing 
+ instruction selection techniques are limited to the scope of a single 
+ statement or a basic block and cannot cope with irregular instruction 
+ sets that are frequently found in embedded systems. </p>
+ 
+ <p> We consider an optimal technique for instruction selection that 
+ uses Static Single Assignment (SSA) graphs as an intermediate 
+ representation of programs and employs the Partitioned Boolean 
+ Quadratic Problem (PBQP) for ???nding an optimal instruction selection. 
+ While existing approaches are limited to instruction patterns that 
+ can be expressed in a simple tree structure, we consider complex 
+ patterns producing multiple results at the same 
+ time including pre/post increment addressing modes, div-mod instructions, 
+ and SIMD extensions frequently found in embedded 
+ systems. Although both instruction selection on SSA-graphs and 
+ PBQP are known to be NP-complete, the problem can be solved 
+ efficiently - even for very large instances. </p>
+ 
+ <p>
+ Our approach has been implemented in LLVM for an embedded 
+ ARMv5 architecture. Extensive experiments show speedups of up 
+ to 57% on typical DSP kernels and up to 10% on SPECINT 2000 
+ and MiBench benchmarks. All of the test programs could be com- 
+ piled within less than half a minute using a heuristic PBQP solver 
+ that solves 99.83% of all instances optimally. </p>
+ 
+ </blockquote>
+ 
+ <h2>Download:</h2>
+ <ul>
+   <li><a href="2008-06-LCTES-ISelUsingSSAGraphs.pdf">Generalized Instruction 
+   Selection using SSA-Graphs</a> (PDF)</li>
+ </ul>
+ 
+ </body>
+ </html>


Index: llvm-www/pubs/2008-06-LCTES-ISelUsingSSAGraphs.pdf


Index: llvm-www/pubs/index.html
diff -u llvm-www/pubs/index.html:1.86 llvm-www/pubs/index.html:1.87
--- llvm-www/pubs/index.html:1.86	Fri Dec  5 12:32:02 2008
+++ llvm-www/pubs/index.html	Thu Dec 18 12:01:05 2008
@@ -39,6 +39,12 @@
 <i>Proc. International SPIN Workshop on Model Checking of Software (SPIN 
 2008)</i>, August 2008</li>
 
+<li>"<a href="2008-06-LCTES-ISelUsingSSAGraphs.html">Generalized Instruction Selection 
+using SSA-Graphs</a>"<br>
+Dietmar Ebner, Florian Brandner, Bernhard Scholz, Andreas Krall, Peter Wiedermann and Albrecht Kadlec<br>
+<i>Proc. Languages Compilers and Tools for Embedded Systems 2008 (LCTES'08)</i>, June, 2008</li>
+
+
 <li>"<a href="2008-06-13-SPAA-STMDataPartitioning.html">Automatic Data Partitioning in Software 
 Transactional Memories</a>"<br>
 Torvald Riegel, Christof Fetzer, and Pascal Felber<br>





From dpatel at apple.com  Thu Dec 18 12:08:26 2008
From: dpatel at apple.com (Devang Patel)
Date: Thu, 18 Dec 2008 18:08:26 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61204 -
	/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
Message-ID: <200812181808.mBII8QeU003584@zion.cs.uiuc.edu>

Author: dpatel
Date: Thu Dec 18 12:08:24 2008
New Revision: 61204

URL: http://llvm.org/viewvc/llvm-project?rev=61204&view=rev
Log:
Do not clobber 'type', which is used to maintain type cache, while walking array elements.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=61204&r1=61203&r2=61204&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Thu Dec 18 12:08:24 2008
@@ -468,9 +468,10 @@
 
       // There will be ARRAY_TYPE nodes for each rank.  Followed by the derived
       // type.
-      tree EltTy = TREE_TYPE(type);
-      for (; TREE_CODE(type) == ARRAY_TYPE; type = TREE_TYPE(type)) {
-        tree Domain = TYPE_DOMAIN(type);
+      tree atype = type;
+      tree EltTy = TREE_TYPE(atype);
+      for (; TREE_CODE(atype) == ARRAY_TYPE; atype = TREE_TYPE(atype)) {
+        tree Domain = TYPE_DOMAIN(atype);
         if (Domain) {
           // FIXME - handle dynamic ranges
           tree MinValue = TYPE_MIN_VALUE(Domain);
@@ -482,7 +483,7 @@
             Subscripts.push_back(DebugFactory.GetOrCreateSubrange(Low, Hi));
           }
         }
-        EltTy = TREE_TYPE(type);
+        EltTy = TREE_TYPE(atype);
       }
 
       llvm::DIArray SubscriptArray =




From dpatel at apple.com  Thu Dec 18 12:29:19 2008
From: dpatel at apple.com (Devang Patel)
Date: Thu, 18 Dec 2008 18:29:19 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61206 -
	/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
Message-ID: <200812181829.mBIITJZe004375@zion.cs.uiuc.edu>

Author: dpatel
Date: Thu Dec 18 12:29:18 2008
New Revision: 61206

URL: http://llvm.org/viewvc/llvm-project?rev=61206&view=rev
Log:
Set struct field offset properly.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=61206&r1=61205&r2=61206&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Thu Dec 18 12:29:18 2008
@@ -600,7 +600,8 @@
             DebugFactory.CreateDerivedType(DW_TAG_member, Unit, MemberName,
                                            Unit, MemLoc.line, NodeSizeInBits(Member),
                                            NodeAlignInBits(FieldNodeType),
-                                           0, Flags, MemberType);
+                                           int_bit_position(Member), 
+                                           Flags, MemberType);
           EltTys.push_back(DTy);
         } else {
           DEBUGASSERT(0 && "Unsupported member tree code!");




From clattner at apple.com  Thu Dec 18 13:00:33 2008
From: clattner at apple.com (Chris Lattner)
Date: Thu, 18 Dec 2008 11:00:33 -0800
Subject: [llvm-commits] [llvm] r61164 - in /llvm/trunk:
	include/llvm/Analysis/DebugInfo.h	include/llvm/CodeGen/MachineModuleInfo.h
	lib/Analysis/DebugInfo.cpp
In-Reply-To: <F0C96781-5777-451D-8A55-1B047680292F@apple.com>
References: <200812172239.mBHMdUc7020218@zion.cs.uiuc.edu>
	<251ADCB1-E90A-4533-91E9-7264C7703035@apple.com>
	<F0C96781-5777-451D-8A55-1B047680292F@apple.com>
Message-ID: <D777F1E8-133F-4088-8F3E-14B109A83AA5@apple.com>

On Dec 18, 2008, at 9:44 AM, Devang Patel wrote:
>> My understanding is that this just adds two fields to a few
>> descriptors.  Instead of bumping the version number for debug info,  
>> is
>> it possible to just treat structs with insufficient number of  
>> elements
>> as having them set to empty?  This is what Analysis/DebugInfo does
>> already for everything.
>
>
> I want to use version number to decide:
>
> 1) Emit DW_TAG_compile_unit for each DICompileUnit seen vs. Emit just
> one DW_TAG_compile_unit even though multiple DICompileUnit is seen.
> This is for backward compatibility.
>
> 2) Use compile_unit to identify source file info. vs. use filename
> field for source file info. In version7, filename field must provide
> source file info. (when required) otherwise we are dealing with
> invalid llvm.dbg value.

Ok!  Is this all implemented now, or is v7 going to be evolving over  
time until the 2.5 release?

-Chris


From dpatel at apple.com  Thu Dec 18 13:03:30 2008
From: dpatel at apple.com (Devang Patel)
Date: Thu, 18 Dec 2008 11:03:30 -0800
Subject: [llvm-commits] [llvm] r61164 - in /llvm/trunk:
	include/llvm/Analysis/DebugInfo.h	include/llvm/CodeGen/MachineModuleInfo.h
	lib/Analysis/DebugInfo.cpp
In-Reply-To: <D777F1E8-133F-4088-8F3E-14B109A83AA5@apple.com>
References: <200812172239.mBHMdUc7020218@zion.cs.uiuc.edu>
	<251ADCB1-E90A-4533-91E9-7264C7703035@apple.com>
	<F0C96781-5777-451D-8A55-1B047680292F@apple.com>
	<D777F1E8-133F-4088-8F3E-14B109A83AA5@apple.com>
Message-ID: <9346210A-BE15-42A1-94E5-E97CECF0BB93@apple.com>


On Dec 18, 2008, at 11:00 AM, Chris Lattner wrote:

> On Dec 18, 2008, at 9:44 AM, Devang Patel wrote:
>>> My understanding is that this just adds two fields to a few
>>> descriptors.  Instead of bumping the version number for debug info,
>>> is
>>> it possible to just treat structs with insufficient number of
>>> elements
>>> as having them set to empty?  This is what Analysis/DebugInfo does
>>> already for everything.
>>
>>
>> I want to use version number to decide:
>>
>> 1) Emit DW_TAG_compile_unit for each DICompileUnit seen vs. Emit just
>> one DW_TAG_compile_unit even though multiple DICompileUnit is seen.
>> This is for backward compatibility.
>>
>> 2) Use compile_unit to identify source file info. vs. use filename
>> field for source file info. In version7, filename field must provide
>> source file info. (when required) otherwise we are dealing with
>> invalid llvm.dbg value.
>
> Ok!  Is this all implemented now, or is v7 going to be evolving over
> time until the 2.5 release?


Yes, v7 is going to be evolving over until 2.5 release.
-
Devang





From dpatel at apple.com  Thu Dec 18 13:18:21 2008
From: dpatel at apple.com (Devang Patel)
Date: Thu, 18 Dec 2008 19:18:21 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61207 -
	/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
Message-ID: <200812181918.mBIJIMmK006291@zion.cs.uiuc.edu>

Author: dpatel
Date: Thu Dec 18 13:18:20 2008
New Revision: 61207

URL: http://llvm.org/viewvc/llvm-project?rev=61207&view=rev
Log:

Reuse DIType slot used for foward declaration for real definition.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=61207&r1=61206&r2=61207&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Thu Dec 18 13:18:20 2008
@@ -325,8 +325,14 @@
   
   // Check to see if the compile unit already has created this type.
   DIType &Slot = TypeCache[type];
-  if (!Slot.isNull())
-    return Slot;
+  bool SlotIsFwdDecl = false;
+  if (!Slot.isNull()) {
+    if (Slot.getFlags() == DW_AT_declaration
+        && TYPE_SIZE(type) != 0)
+      SlotIsFwdDecl = true;
+    if (!SlotIsFwdDecl)
+      return Slot;
+  }
   
   DIType MainTy;
   if (type != TYPE_MAIN_VARIANT(type))
@@ -528,15 +534,17 @@
       unsigned Tag = TREE_CODE(type) == RECORD_TYPE ? DW_TAG_structure_type :
                                                       DW_TAG_union_type;
 
-      // Records and classes and unions can all be recursive.  To handle them, we
-      // first generate a debug descriptor for the struct as a forward declaration.
-      // Then (if it is a definition) we go through and get debug info for all of
-      // its members.  Finally, we create a descriptor for the complete type (which
-      // may refer to the forward decl if the struct is recursive) and replace all
-      // uses of the forward declaration with the final definition.
+      // Records and classes and unions can all be recursive.  To handle them,
+      // we first generate a debug descriptor for the struct as a forward 
+      // declaration. Then (if it is a definition) we go through and get debug 
+      // info for all of its members.  Finally, we create a descriptor for the
+      // complete type (which may refer to the forward decl if the struct is 
+      // recursive) and replace all  uses of the forward declaration with the 
+      // final definition. 
       expanded_location Loc = GetNodeLocation(type, false);
-      llvm::DIType FwdDecl =
-        DebugFactory.CreateCompositeType(Tag, Unit, TypeName, Unit, Loc.line, 0, 0, 0, 0,
+      llvm::DIType FwdDecl = SlotIsFwdDecl ? Slot :
+        DebugFactory.CreateCompositeType(Tag, Unit, TypeName, Unit, Loc.line, 
+                                         0, 0, 0, DW_AT_declaration,
                                          llvm::DIType(), llvm::DIArray());
   
 




From dpatel at apple.com  Thu Dec 18 13:19:39 2008
From: dpatel at apple.com (Devang Patel)
Date: Thu, 18 Dec 2008 11:19:39 -0800
Subject: [llvm-commits] [llvm-gcc-4.2] r60908 -
	in	/llvm-gcc-4.2/trunk/gcc: llvm-backend.cpp
	llvm-convert.cpp	llvm-debug.cpp llvm-debug.h llvm-linker-hack.cpp
In-Reply-To: <72C2AB95-251A-41B1-907A-ADFDFFFEBBE6@apple.com>
References: <200812112322.mBBNMH3V010894@zion.cs.uiuc.edu>
	<72C2AB95-251A-41B1-907A-ADFDFFFEBBE6@apple.com>
Message-ID: <000C7EAE-8B3A-4DA4-BE8A-A10BBDC4F91E@apple.com>


On Dec 11, 2008, at 7:10 PM, Evan Cheng wrote:

> Awesome! Is it all done now?
>
> On Dec 11, 2008, at 3:22 PM, Devang Patel wrote:
>
>> // Check to see if the compile unit already has created this type.
>> -  TypeDesc *Slot = TypeCache[type];
>> -  if (Slot && !(Slot->isForwardDecl() && TYPE_SIZE(type) != 0))
>> -    // FIXME: If previously created type is just a forward
>> declaration, emit
>> -    // a new descriptor for the type definition. The correct fix is
>> to *fix*
>> -    // up the llvm ir (since MMI may have already been converted to
>> llvm). But
>> -    // that's correctly not doable. We'll fix this when we convert
>> to the new
>> -    // API in DebugInfo.h
>> +  DIType &Slot = TypeCache[type];
>> +  if (!Slot.isNull())
>>    return Slot;
>
> How do you solve this? It's a type that was previously a forward
> declaration but it's now defined:

This patch set the stage to modify the llvm ir. The next patch,  
r61207, detects forward declaration and does the right thing.
-
Devang
>
>
> struct ST;
>
> void foo(struct ST *x) {
> }
>
> struct ST {
>   int a;
> };
>
> typedef struct ST STtype;
> STtype X;
>
> void bar() {
>   X.a = 1;
> }
>
> Evan
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

-
Devang





From wangmp at apple.com  Thu Dec 18 14:03:19 2008
From: wangmp at apple.com (Mon P Wang)
Date: Thu, 18 Dec 2008 20:03:19 -0000
Subject: [llvm-commits] [llvm] r61209 - in /llvm/trunk:
 include/llvm/CodeGen/ValueTypes.h include/llvm/CodeGen/ValueTypes.td
 include/llvm/Target/TargetLowering.h
 lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
 lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
 lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
 lib/CodeGen/SelectionDAG/LegalizeTypes.h
 lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
 lib/CodeGen/SelectionDAG/TargetLowering.cpp lib/VMCore/ValueTypes.cpp
 utils/TableGen/CodeGenTarget.cpp
Message-ID: <200812182003.mBIK3Ll2008367@zion.cs.uiuc.edu>

Author: wangmp
Date: Thu Dec 18 14:03:17 2008
New Revision: 61209

URL: http://llvm.org/viewvc/llvm-project?rev=61209&view=rev
Log:
Added support for vector widening.

Modified:
    llvm/trunk/include/llvm/CodeGen/ValueTypes.h
    llvm/trunk/include/llvm/CodeGen/ValueTypes.td
    llvm/trunk/include/llvm/Target/TargetLowering.h
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h
    llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp
    llvm/trunk/lib/VMCore/ValueTypes.cpp
    llvm/trunk/utils/TableGen/CodeGenTarget.cpp

Modified: llvm/trunk/include/llvm/CodeGen/ValueTypes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ValueTypes.h?rev=61209&r1=61208&r2=61209&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/ValueTypes.h (original)
+++ llvm/trunk/include/llvm/CodeGen/ValueTypes.h Thu Dec 18 14:03:17 2008
@@ -49,25 +49,28 @@
 
       isVoid         =  13,   // This has no value
 
-      v8i8           =  14,   //  8 x i8
-      v4i16          =  15,   //  4 x i16
-      v2i32          =  16,   //  2 x i32
-      v1i64          =  17,   //  1 x i64
-      v16i8          =  18,   // 16 x i8
-      v8i16          =  19,   //  8 x i16
-      v3i32          =  20,   //  3 x i32
-      v4i32          =  21,   //  4 x i32
-      v2i64          =  22,   //  2 x i64
-
-      v2f32          =  23,   //  2 x f32
-      v3f32          =  24,   //  3 x f32
-      v4f32          =  25,   //  4 x f32
-      v2f64          =  26,   //  2 x f64
+      v2i8           =  14,   //  2 x i8
+      v4i8           =  15,   //  4 x i8
+      v2i16          =  16,   //  2 x i16
+      v8i8           =  17,   //  8 x i8
+      v4i16          =  18,   //  4 x i16
+      v2i32          =  19,   //  2 x i32
+      v1i64          =  20,   //  1 x i64
+      v16i8          =  21,   // 16 x i8
+      v8i16          =  22,   //  8 x i16
+      v3i32          =  23,   //  3 x i32
+      v4i32          =  24,   //  4 x i32
+      v2i64          =  25,   //  2 x i64
+
+      v2f32          =  26,   //  2 x f32
+      v3f32          =  27,   //  3 x f32
+      v4f32          =  28,   //  4 x f32
+      v2f64          =  29,   //  2 x f64
 
-      FIRST_VECTOR_VALUETYPE = v8i8,
+      FIRST_VECTOR_VALUETYPE = v2i8,
       LAST_VECTOR_VALUETYPE  = v2f64,
 
-      LAST_VALUETYPE =  27,   // This always remains at the end of the list.
+      LAST_VALUETYPE =  30,   // This always remains at the end of the list.
 
       // iPTRAny - An int value the size of the pointer of the current
       // target to any address space. This must only be used internal to
@@ -166,10 +169,13 @@
       default:
         break;
       case i8:
+        if (NumElements == 2)  return v2i8;
+        if (NumElements == 4)  return v4i8;
         if (NumElements == 8)  return v8i8;
         if (NumElements == 16) return v16i8;
         break;
       case i16:
+        if (NumElements == 2)  return v2i16;
         if (NumElements == 4)  return v4i16;
         if (NumElements == 8)  return v8i16;
         break;
@@ -233,7 +239,7 @@
       return isSimple() ?
              ((SimpleTy >= FIRST_INTEGER_VALUETYPE &&
                SimpleTy <= LAST_INTEGER_VALUETYPE) ||
-              (SimpleTy >= v8i8 && SimpleTy <= v2i64)) :
+              (SimpleTy >= v2i8 && SimpleTy <= v2i64)) :
              isExtendedInteger();
     }
 
@@ -312,8 +318,11 @@
       switch (V) {
       default:
         return getExtendedVectorElementType();
+      case v2i8 :
+      case v4i8 :
       case v8i8 :
       case v16i8: return i8;
+      case v2i16:
       case v4i16:
       case v8i16: return i16;
       case v2i32:
@@ -338,11 +347,14 @@
       case v16i8: return 16;
       case v8i8 :
       case v8i16: return 8;
+      case v4i8:
       case v4i16:
       case v4i32:
       case v4f32: return 4;
       case v3i32:
       case v3f32: return 3;
+      case v2i8:
+      case v2i16:
       case v2i32:
       case v2i64:
       case v2f32:
@@ -364,9 +376,12 @@
         return getExtendedSizeInBits();
       case i1  :  return 1;
       case i8  :  return 8;
-      case i16 :  return 16;
+      case i16 :
+      case v2i8:  return 16;
       case f32 :
-      case i32 :  return 32;
+      case i32 :
+      case v4i8:
+      case v2i16: return 32;
       case f64 :
       case i64 :
       case v8i8:
@@ -407,6 +422,25 @@
         return getIntegerVT(1 << Log2_32_Ceil(BitWidth));
     }
 
+    /// isPow2VectorType - Retuns true if the given vector is a power of 2.
+    bool isPow2VectorType() const {
+      unsigned NElts = getVectorNumElements();
+      return !(NElts & (NElts - 1));
+    }
+
+    /// getPow2VectorType - Widens the length of the given vector MVT up to
+    /// the nearest power of 2 and returns that type.
+    MVT getPow2VectorType() const {
+      if (!isPow2VectorType()) {
+        unsigned NElts = getVectorNumElements();
+        unsigned Pow2NElts = 1 <<  Log2_32_Ceil(NElts);
+        return MVT::getVectorVT(getVectorElementType(), Pow2NElts);
+      }
+      else {
+        return *this;
+      }
+   }
+
     /// getIntegerVTBitMask - Return an integer with 1's every place there are
     /// bits in the specified integer value type. FIXME: Should return an apint.
     uint64_t getIntegerVTBitMask() const {

Modified: llvm/trunk/include/llvm/CodeGen/ValueTypes.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/ValueTypes.td?rev=61209&r1=61208&r2=61209&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/ValueTypes.td (original)
+++ llvm/trunk/include/llvm/CodeGen/ValueTypes.td Thu Dec 18 14:03:17 2008
@@ -33,21 +33,24 @@
 def ppcf128: ValueType<128, 11>;   // PPC 128-bit floating point value
 def FlagVT : ValueType<0  , 12>;   // Condition code or machine flag
 def isVoid : ValueType<0  , 13>;   // Produces no value
-def v8i8   : ValueType<64 , 14>;   //  8 x i8  vector value
-def v4i16  : ValueType<64 , 15>;   //  4 x i16 vector value
-def v2i32  : ValueType<64 , 16>;   //  2 x i32 vector value
-def v1i64  : ValueType<64 , 17>;   //  1 x i64 vector value
-
-def v16i8  : ValueType<128, 18>;   // 16 x i8  vector value
-def v8i16  : ValueType<128, 19>;   //  8 x i16 vector value
-def v3i32  : ValueType<96 , 20>;   //  3 x i32 vector value
-def v4i32  : ValueType<128, 21>;   //  4 x i32 vector value
-def v2i64  : ValueType<128, 22>;   //  2 x i64 vector value
-
-def v2f32  : ValueType<64,  23>;   //  2 x f32 vector value
-def v3f32  : ValueType<96 , 24>;   //  3 x f32 vector value
-def v4f32  : ValueType<128, 25>;   //  4 x f32 vector value
-def v2f64  : ValueType<128, 26>;   //  2 x f64 vector value
+def v2i8   : ValueType<16 , 14>;   //  2 x i8  vector value
+def v4i8   : ValueType<32 , 15>;   //  4 x i8  vector value
+def v2i16  : ValueType<32 , 16>;   //  2 x i16 vector value
+def v8i8   : ValueType<64 , 17>;   //  8 x i8  vector value
+def v4i16  : ValueType<64 , 18>;   //  4 x i16 vector value
+def v2i32  : ValueType<64 , 19>;   //  2 x i32 vector value
+def v1i64  : ValueType<64 , 20>;   //  1 x i64 vector value
+
+def v16i8  : ValueType<128, 21>;   // 16 x i8  vector value
+def v8i16  : ValueType<128, 22>;   //  8 x i16 vector value
+def v3i32  : ValueType<96 , 23>;   //  3 x i32 vector value
+def v4i32  : ValueType<128, 24>;   //  4 x i32 vector value
+def v2i64  : ValueType<128, 25>;   //  2 x i64 vector value
+
+def v2f32  : ValueType<64,  26>;   //  2 x f32 vector value
+def v3f32  : ValueType<96 , 27>;   //  3 x f32 vector value
+def v4f32  : ValueType<128, 28>;   //  4 x f32 vector value
+def v2f64  : ValueType<128, 29>;   //  2 x f64 vector value
 
 // Pseudo valuetype mapped to the current pointer size to any address space.
 // Should only be used in TableGen.

Modified: llvm/trunk/include/llvm/Target/TargetLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetLowering.h?rev=61209&r1=61208&r2=61209&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetLowering.h (original)
+++ llvm/trunk/include/llvm/Target/TargetLowering.h Thu Dec 18 14:03:17 2008
@@ -168,8 +168,7 @@
     LegalizeAction getTypeAction(MVT VT) const {
       if (VT.isExtended()) {
         if (VT.isVector()) {
-          // First try vector widening
-          return Promote;
+          return VT.isPow2VectorType() ? Expand : Promote;
         }
         if (VT.isInteger())
           // First promote to a power-of-two size, then expand if necessary.
@@ -216,9 +215,15 @@
     }
 
     if (VT.isVector()) {
-      unsigned NumElts = VT.getVectorNumElements();
-      MVT EltVT = VT.getVectorElementType();
-      return (NumElts == 1) ? EltVT : MVT::getVectorVT(EltVT, NumElts / 2);
+      MVT NVT = VT.getPow2VectorType();
+      if (NVT == VT) {
+        // Vector length is a power of 2 - split to half the size.
+        unsigned NumElts = VT.getVectorNumElements();
+        MVT EltVT = VT.getVectorElementType();
+        return (NumElts == 1) ? EltVT : MVT::getVectorVT(EltVT, NumElts / 2);
+      }
+      // Promote to a power of two size, avoiding multi-step promotion.
+      return getTypeAction(NVT) == Promote ? getTypeToTransformTo(NVT) : NVT;
     } else if (VT.isInteger()) {
       MVT NVT = VT.getRoundIntegerType();
       if (NVT == VT)

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=61209&r1=61208&r2=61209&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Thu Dec 18 14:03:17 2008
@@ -491,9 +491,11 @@
   MVT VT = Op.getValueType();
   // If the type legalizer was run then we should never see any illegal result
   // types here except for target constants (the type legalizer does not touch
-  // those).
+  // those) or for build vector used as a mask for a vector shuffle.
+  // FIXME: We can removed the BUILD_VECTOR case when we fix PR2957.
   assert((TypesNeedLegalizing || getTypeAction(VT) == Legal ||
-          Op.getOpcode() == ISD::TargetConstant) &&
+          Op.getOpcode() == ISD::TargetConstant ||
+          Op.getOpcode() == ISD::BUILD_VECTOR) &&
          "Illegal type introduced after type legalization?");
   switch (getTypeAction(VT)) {
   default: assert(0 && "Bad type action!");
@@ -3299,7 +3301,7 @@
                          0);
         break;
       }
-      
+
       // Check to see if we have a libcall for this operator.
       RTLIB::Libcall LC = RTLIB::UNKNOWN_LIBCALL;
       bool isSigned = false;
@@ -7646,7 +7648,10 @@
   case ISD::XOR:
   case ISD::UREM:
   case ISD::SREM:
-  case ISD::FREM: {
+  case ISD::FREM:
+  case ISD::SHL:
+  case ISD::SRA:
+  case ISD::SRL: {
     SDValue LL, LH, RL, RH;
     SplitVectorOp(Node->getOperand(0), LL, LH);
     SplitVectorOp(Node->getOperand(1), RL, RH);
@@ -8067,30 +8072,33 @@
     SDValue Tmp1 = Node->getOperand(0);
     // Converts between two different types so we need to determine
     // the correct widen type for the input operand.
-    MVT TVT = Tmp1.getValueType();
-    assert(TVT.isVector() && "can not widen non vector type");
-    MVT TEVT = TVT.getVectorElementType();
-    assert(WidenVT.getSizeInBits() % EVT.getSizeInBits() == 0 &&
-         "can not widen bit bit convert that are not multiple of element type");
-    MVT TWidenVT =  MVT::getVectorVT(TEVT,
-                                   WidenVT.getSizeInBits()/EVT.getSizeInBits());
-    Tmp1 = WidenVectorOp(Tmp1, TWidenVT);
-    assert(Tmp1.getValueType().getSizeInBits() == WidenVT.getSizeInBits());
-    Result = DAG.getNode(Node->getOpcode(), WidenVT, Tmp1);
+    MVT InVT = Tmp1.getValueType();
+    unsigned WidenSize = WidenVT.getSizeInBits();    
+    if (InVT.isVector()) {
+      MVT InEltVT = InVT.getVectorElementType();
+      unsigned InEltSize = InEltVT.getSizeInBits();
+      assert(WidenSize % InEltSize == 0 &&
+             "can not widen bit convert that are not multiple of element type");
+      MVT NewInWidenVT = MVT::getVectorVT(InEltVT, WidenSize / InEltSize);
+      Tmp1 = WidenVectorOp(Tmp1, NewInWidenVT);
+      assert(Tmp1.getValueType().getSizeInBits() == WidenVT.getSizeInBits());
+      Result = DAG.getNode(ISD::BIT_CONVERT, WidenVT, Tmp1);
+    } else {
+      // If the result size is a multiple of the input size, widen the input
+      // and then convert.
+      unsigned InSize = InVT.getSizeInBits();
+      assert(WidenSize % InSize == 0 &&
+             "can not widen bit convert that are not multiple of element type");
+      unsigned NewNumElts = WidenSize / InSize;
+      SmallVector<SDValue, 16> Ops(NewNumElts);
+      SDValue UndefVal = DAG.getNode(ISD::UNDEF, InVT);
+      Ops[0] = Tmp1;
+      for (unsigned i = 1; i < NewNumElts; ++i)
+        Ops[i] = UndefVal;
 
-    TargetLowering::LegalizeAction action =
-      TLI.getOperationAction(Node->getOpcode(), WidenVT);
-    switch (action)  {
-    default: assert(0 && "action not supported");
-    case TargetLowering::Legal:
-        break;
-    case TargetLowering::Promote:
-        // We defer the promotion to when we legalize the op
-      break;
-    case TargetLowering::Expand:
-      // Expand the operation into a bunch of nasty scalar code.
-      Result = LegalizeOp(UnrollVectorOp(Result));
-      break;
+      MVT NewInVT = MVT::getVectorVT(InVT, NewNumElts);
+      Result = DAG.getNode(ISD::BUILD_VECTOR, NewInVT, &Ops[0], NewNumElts);
+      Result = DAG.getNode(ISD::BIT_CONVERT, WidenVT, Result);
     }
     break;
   }
@@ -8098,7 +8106,8 @@
   case ISD::SINT_TO_FP:
   case ISD::UINT_TO_FP:
   case ISD::FP_TO_SINT:
-  case ISD::FP_TO_UINT: {
+  case ISD::FP_TO_UINT:
+  case ISD::FP_ROUND: {
     SDValue Tmp1 = Node->getOperand(0);
     // Converts between two different types so we need to determine
     // the correct widen type for the input operand.
@@ -8118,7 +8127,6 @@
   case ISD::SIGN_EXTEND:
   case ISD::ZERO_EXTEND:
   case ISD::ANY_EXTEND:
-  case ISD::FP_ROUND:
   case ISD::SIGN_EXTEND_INREG:
   case ISD::FABS:
   case ISD::FNEG:
@@ -8129,7 +8137,7 @@
   case ISD::CTTZ:
   case ISD::CTLZ: {
     // Unary op widening
-    SDValue Tmp1;    
+    SDValue Tmp1;
     Tmp1 = WidenVectorOp(Node->getOperand(0), WidenVT);
     assert(Tmp1.getValueType() == WidenVT);
     Result = DAG.getNode(Node->getOpcode(), WidenVT, Tmp1);
@@ -8306,7 +8314,7 @@
     MVT TmpWidenVT =  MVT::getVectorVT(TmpEVT, NewNumElts);
     Tmp1 = WidenVectorOp(Tmp1, TmpWidenVT);
     SDValue Tmp2 = WidenVectorOp(Node->getOperand(1), TmpWidenVT);
-    Result = DAG.getNode(Node->getOpcode(), WidenVT, Tmp1, Tmp2, 
+    Result = DAG.getNode(Node->getOpcode(), WidenVT, Tmp1, Tmp2,
                          Node->getOperand(2));
     break;
   }

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp?rev=61209&r1=61208&r2=61209&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp Thu Dec 18 14:03:17 2008
@@ -217,7 +217,7 @@
     // Convert the element to an integer and promote it by hand.
     return DAG.getNode(ISD::ANY_EXTEND, NOutVT,
                        BitConvertToInteger(GetScalarizedVector(InOp)));
-  case SplitVector:
+  case SplitVector: {
     // For example, i32 = BIT_CONVERT v2i16 on alpha.  Convert the split
     // pieces of the input into integers and reassemble in the final type.
     SDValue Lo, Hi;
@@ -233,9 +233,13 @@
                        JoinIntegers(Lo, Hi));
     return DAG.getNode(ISD::BIT_CONVERT, NOutVT, InOp);
   }
+  case WidenVector:
+    if (OutVT.bitsEq(NInVT))
+      // The input is widened to the same size.  Convert to the widened value.
+      return DAG.getNode(ISD::BIT_CONVERT, OutVT, GetWidenedVector(InOp));
+  }
 
   // Otherwise, lower the bit-convert to a store/load from the stack.
-
   // Create the stack frame object.  Make sure it is aligned for both
   // the source and destination types.
   SDValue FIPtr = DAG.CreateStackTemporary(InVT, OutVT);

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp?rev=61209&r1=61208&r2=61209&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp Thu Dec 18 14:03:17 2008
@@ -108,6 +108,8 @@
         Mapped |= 32;
       if (SplitVectors.find(Res) != SplitVectors.end())
         Mapped |= 64;
+      if (WidenedVectors.find(Res) != WidenedVectors.end())
+        Mapped |= 128;
 
       if (I->getNodeId() != Processed) {
         if (Mapped != 0) {
@@ -115,7 +117,10 @@
           Failed = true;
         }
       } else if (isTypeLegal(Res.getValueType()) || IgnoreNodeResults(I)) {
-        if (Mapped > 1) {
+        // FIXME: Because of PR2957, the build vector can be placed on this
+        // list but if the associated vector shuffle is split, the build vector
+        // can also be split so we allow this to go through for now.
+        if (Mapped > 1 && Res.getOpcode() != ISD::BUILD_VECTOR) {
           cerr << "Value with legal type was transformed!";
           Failed = true;
         }
@@ -144,6 +149,8 @@
           cerr << " ExpandedFloats";
         if (Mapped & 64)
           cerr << " SplitVectors";
+        if (Mapped & 128)
+          cerr << " WidenedVectors";
         cerr << "\n";
         abort();
       }
@@ -241,6 +248,10 @@
         SplitVectorResult(N, i);
         Changed = true;
         goto NodeDone;
+      case WidenVector:
+        WidenVectorResult(N, i);
+        Changed = true;
+        goto NodeDone;
       }
     }
 
@@ -255,6 +266,13 @@
       if (IgnoreNodeResults(N->getOperand(i).getNode()))
         continue;
 
+      if (N->getOpcode() == ISD::VECTOR_SHUFFLE && i == 2) {
+        // The shuffle mask doesn't need to be a legal vector type.
+        // FIXME: We can remove this once we fix PR2957.
+        SetIgnoredNodeResult(N->getOperand(2).getNode());
+        continue;
+      }
+
       MVT OpVT = N->getOperand(i).getValueType();
       switch (getTypeAction(OpVT)) {
       default:
@@ -288,6 +306,10 @@
         NeedsReanalyzing = SplitVectorOperand(N, i);
         Changed = true;
         break;
+      case WidenVector:
+        NeedsReanalyzing = WidenVectorOperand(N, i);
+        Changed = true;
+        break;
       }
       break;
     }
@@ -791,6 +813,18 @@
   Entry.second = Hi;
 }
 
+void DAGTypeLegalizer::SetWidenedVector(SDValue Op, SDValue Result) {
+  AnalyzeNewValue(Result);
+
+  SDValue &OpEntry = WidenedVectors[Op];
+  assert(OpEntry.getNode() == 0 && "Node is already promoted!");
+  OpEntry = Result;
+}
+
+// Set to ignore result
+void DAGTypeLegalizer::SetIgnoredNodeResult(SDNode* N) {
+  IgnoredNodesResultsSet.insert(N);
+}
 
 //===----------------------------------------------------------------------===//
 // Utilities.

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h?rev=61209&r1=61208&r2=61209&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h Thu Dec 18 14:03:17 2008
@@ -20,6 +20,7 @@
 #include "llvm/CodeGen/SelectionDAG.h"
 #include "llvm/Target/TargetLowering.h"
 #include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/DenseSet.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
 
@@ -63,7 +64,8 @@
     SoftenFloat,     // Convert this float type to a same size integer type.
     ExpandFloat,     // Split this float type into two of half the size.
     ScalarizeVector, // Replace this one-element vector with its element type.
-    SplitVector      // This vector type should be split into smaller vectors.
+    SplitVector,     // This vector type should be split into smaller vectors.
+    WidenVector      // This vector type should be widened into larger vectors.
   };
 
   /// ValueTypeActions - This is a bitvector that contains two bits for each
@@ -88,11 +90,8 @@
       //   2) For vectors, use a wider vector type (e.g. v3i32 -> v4i32).
       if (!VT.isVector())
         return PromoteInteger;
-      else if (VT.getVectorNumElements() == 1)
-        return ScalarizeVector;
       else
-        // TODO: move widen code to LegalizeTypes.
-        return SplitVector;
+        return WidenVector;
     case TargetLowering::Expand:
       // Expand can mean
       // 1) split scalar in half, 2) convert a float to an integer,
@@ -120,9 +119,13 @@
 
   /// IgnoreNodeResults - Pretend all of this node's results are legal.
   bool IgnoreNodeResults(SDNode *N) const {
-    return N->getOpcode() == ISD::TargetConstant;
+    return N->getOpcode() == ISD::TargetConstant ||
+           IgnoredNodesResultsSet.count(N);
   }
 
+  /// IgnoredNode - Set of nodes whose result don't need to be legal.
+  DenseSet<SDNode*> IgnoredNodesResultsSet;
+
   /// PromotedIntegers - For integer nodes that are below legal width, this map
   /// indicates what promoted value to use.
   DenseMap<SDValue, SDValue> PromotedIntegers;
@@ -147,6 +150,10 @@
   /// which operands are the expanded version of the input.
   DenseMap<SDValue, std::pair<SDValue, SDValue> > SplitVectors;
 
+  /// WidenVectors - For vector nodes that need to be widened, indicates
+  /// the widen value to use.
+  DenseMap<SDValue, SDValue> WidenedVectors;
+
   /// ReplacedValues - For values that have been replaced with another,
   /// indicates the replacement value to use.
   DenseMap<SDValue, SDValue> ReplacedValues;
@@ -201,6 +208,8 @@
 
   SDValue GetVectorElementPointer(SDValue VecPtr, MVT EltVT, SDValue Index);
 
+  void SetIgnoredNodeResult(SDNode* N);
+
   //===--------------------------------------------------------------------===//
   // Integer Promotion Support: LegalizeIntegerTypes.cpp
   //===--------------------------------------------------------------------===//
@@ -563,6 +572,91 @@
   SDValue SplitVecOp_VECTOR_SHUFFLE(SDNode *N, unsigned OpNo);
 
   //===--------------------------------------------------------------------===//
+  // Vector Widening Support: LegalizeVectorTypes.cpp
+  //===--------------------------------------------------------------------===//
+  SDValue GetWidenedVector(SDValue Op) {
+    SDValue &WidenedOp = WidenedVectors[Op];
+    RemapValue(WidenedOp);
+    assert(WidenedOp.getNode() && "Operand wasn't widened?");
+    return WidenedOp;
+  }
+  void SetWidenedVector(SDValue Op, SDValue Result);
+
+  // Widen Vector Result Promotion.
+  void WidenVectorResult(SDNode *N, unsigned ResNo);
+  SDValue WidenVecRes_BIT_CONVERT(SDNode* N);
+  SDValue WidenVecRes_BUILD_VECTOR(SDNode* N);
+  SDValue WidenVecRes_CONCAT_VECTORS(SDNode* N);
+  SDValue WidenVecRes_CONVERT_RNDSAT(SDNode* N);
+  SDValue WidenVecRes_EXTRACT_SUBVECTOR(SDNode* N);
+  SDValue WidenVecRes_INSERT_VECTOR_ELT(SDNode* N);
+  SDValue WidenVecRes_LOAD(SDNode* N);
+  SDValue WidenVecRes_SCALAR_TO_VECTOR(SDNode* N);
+  SDValue WidenVecRes_SELECT(SDNode* N);
+  SDValue WidenVecRes_SELECT_CC(SDNode* N);
+  SDValue WidenVecRes_UNDEF(SDNode *N);
+  SDValue WidenVecRes_VECTOR_SHUFFLE(SDNode *N);
+  SDValue WidenVecRes_VSETCC(SDNode* N);
+
+  SDValue WidenVecRes_Binary(SDNode *N);
+  SDValue WidenVecRes_Convert(SDNode *N);
+  SDValue WidenVecRes_Shift(SDNode *N);
+  SDValue WidenVecRes_Unary(SDNode *N);
+
+  // Widen Vector Operand.
+  bool WidenVectorOperand(SDNode *N, unsigned ResNo);
+  SDValue WidenVecOp_CONCAT_VECTORS(SDNode *N);
+  SDValue WidenVecOp_EXTRACT_VECTOR_ELT(SDNode *N);
+  SDValue WidenVecOp_STORE(SDNode* N);
+
+  SDValue WidenVecOp_Convert(SDNode *N);
+
+  //===--------------------------------------------------------------------===//
+  // Vector Widening Utilities Support: LegalizeVectorTypes.cpp
+  //===--------------------------------------------------------------------===//
+
+  /// Helper genWidenVectorLoads - Helper function to generate a set of
+  /// loads to load a vector with a resulting wider type. It takes
+  ///   ExtType: Extension type
+  ///   LdChain: list of chains for the load we have generated.
+  ///   Chain:   incoming chain for the ld vector.
+  ///   BasePtr: base pointer to load from.
+  ///   SV:         memory disambiguation source value.
+  ///   SVOffset:   memory disambiugation offset.
+  ///   Alignment:  alignment of the memory.
+  ///   isVolatile: volatile load.
+  ///   LdWidth:    width of memory that we want to load. 
+  ///   ResType:    the wider result result type for the resulting vector.
+  SDValue GenWidenVectorLoads(SmallVector<SDValue, 16>& LdChain, SDValue Chain,
+                              SDValue BasePtr, const Value *SV,
+                              int SVOffset, unsigned Alignment,
+                              bool isVolatile, unsigned LdWidth,
+                              MVT ResType);
+
+  /// Helper genWidenVectorStores - Helper function to generate a set of
+  /// stores to store a widen vector into non widen memory
+  /// It takes
+  ///   StChain: list of chains for the stores we have generated
+  ///   Chain:   incoming chain for the ld vector
+  ///   BasePtr: base pointer to load from
+  ///   SV:      memory disambiguation source value
+  ///   SVOffset:   memory disambiugation offset
+  ///   Alignment:  alignment of the memory
+  ///   isVolatile: volatile lod
+  ///   ValOp:   value to store  
+  ///   StWidth: width of memory that we want to store 
+  void GenWidenVectorStores(SmallVector<SDValue, 16>& StChain, SDValue Chain,
+                            SDValue BasePtr, const Value *SV,
+                            int SVOffset, unsigned Alignment,
+                            bool isVolatile, SDValue ValOp,
+                            unsigned StWidth);
+
+  /// Modifies a vector input (widen or narrows) to a vector of NVT.  The
+  /// input vector must have the same element type as NVT.
+  SDValue ModifyToType(SDValue InOp, MVT WidenVT);
+
+
+  //===--------------------------------------------------------------------===//
   // Generic Splitting: LegalizeTypesGeneric.cpp
   //===--------------------------------------------------------------------===//
 

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp?rev=61209&r1=61208&r2=61209&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeVectorTypes.cpp Thu Dec 18 14:03:17 2008
@@ -371,7 +371,7 @@
   case ISD::FPOWI:             SplitVecRes_FPOWI(N, Lo, Hi); break;
   case ISD::INSERT_VECTOR_ELT: SplitVecRes_INSERT_VECTOR_ELT(N, Lo, Hi); break;
   case ISD::SCALAR_TO_VECTOR:  SplitVecRes_SCALAR_TO_VECTOR(N, Lo, Hi); break;
-  case ISD::LOAD:           SplitVecRes_LOAD(cast<LoadSDNode>(N), Lo, Hi);break;
+  case ISD::LOAD:              SplitVecRes_LOAD(cast<LoadSDNode>(N), Lo, Hi);break;
   case ISD::VECTOR_SHUFFLE:    SplitVecRes_VECTOR_SHUFFLE(N, Lo, Hi); break;
   case ISD::VSETCC:            SplitVecRes_VSETCC(N, Lo, Hi); break;
 
@@ -1062,3 +1062,1034 @@
   assert(false && "Failed to find an appropriate mask type!");
   return SDValue(N, 0);
 }
+
+
+//===----------------------------------------------------------------------===//
+//  Result Vector Widening
+//===----------------------------------------------------------------------===//
+
+void DAGTypeLegalizer::WidenVectorResult(SDNode *N, unsigned ResNo) {
+  DEBUG(cerr << "Widen node result " << ResNo << ": "; N->dump(&DAG);
+        cerr << "\n");
+  SDValue Res = SDValue();
+
+  switch (N->getOpcode()) {
+  default:
+#ifndef NDEBUG
+    cerr << "WidenVectorResult #" << ResNo << ": ";
+    N->dump(&DAG); cerr << "\n";
+#endif
+    assert(0 && "Do not know how to widen the result of this operator!");
+    abort();
+
+  case ISD::BIT_CONVERT:       Res = WidenVecRes_BIT_CONVERT(N); break;
+  case ISD::BUILD_VECTOR:      Res = WidenVecRes_BUILD_VECTOR(N); break;
+  case ISD::CONCAT_VECTORS:    Res = WidenVecRes_CONCAT_VECTORS(N); break;
+  case ISD::CONVERT_RNDSAT:    Res = WidenVecRes_CONVERT_RNDSAT(N); break;
+  case ISD::EXTRACT_SUBVECTOR: Res = WidenVecRes_EXTRACT_SUBVECTOR(N); break;
+  case ISD::INSERT_VECTOR_ELT: Res = WidenVecRes_INSERT_VECTOR_ELT(N); break;
+  case ISD::LOAD:              Res = WidenVecRes_LOAD(N); break;
+  case ISD::SCALAR_TO_VECTOR:  Res = WidenVecRes_SCALAR_TO_VECTOR(N); break;
+  case ISD::SELECT:            Res = WidenVecRes_SELECT(N); break;
+  case ISD::SELECT_CC:         Res = WidenVecRes_SELECT_CC(N); break;
+  case ISD::UNDEF:             Res = WidenVecRes_UNDEF(N); break;
+  case ISD::VECTOR_SHUFFLE:    Res = WidenVecRes_VECTOR_SHUFFLE(N); break;
+  case ISD::VSETCC:            Res = WidenVecRes_VSETCC(N); break;
+
+  case ISD::ADD:
+  case ISD::AND:
+  case ISD::BSWAP:
+  case ISD::FADD:
+  case ISD::FCOPYSIGN:
+  case ISD::FDIV:
+  case ISD::FMUL:
+  case ISD::FPOW:
+  case ISD::FPOWI:
+  case ISD::FREM:
+  case ISD::FSUB:
+  case ISD::MUL:
+  case ISD::MULHS:
+  case ISD::MULHU:
+  case ISD::OR:
+  case ISD::SDIV:
+  case ISD::SREM:
+  case ISD::UDIV:
+  case ISD::UREM:
+  case ISD::SUB:
+  case ISD::XOR:               Res = WidenVecRes_Binary(N); break;
+
+  case ISD::SHL:
+  case ISD::SRA:
+  case ISD::SRL:               Res = WidenVecRes_Shift(N); break;
+
+  case ISD::ANY_EXTEND:
+  case ISD::FP_ROUND:
+  case ISD::FP_TO_SINT:
+  case ISD::FP_TO_UINT:
+  case ISD::SIGN_EXTEND:
+  case ISD::SINT_TO_FP:
+  case ISD::TRUNCATE:
+  case ISD::ZERO_EXTEND:
+  case ISD::UINT_TO_FP:        Res = WidenVecRes_Convert(N); break;
+
+  case ISD::CTLZ:
+  case ISD::CTPOP:
+  case ISD::CTTZ:
+  case ISD::FABS:
+  case ISD::FCOS:
+  case ISD::FNEG:
+  case ISD::FSIN:
+  case ISD::FSQRT:             Res = WidenVecRes_Unary(N); break;
+  }
+
+  // If Res is null, the sub-method took care of registering the result.
+  if (Res.getNode())
+    SetWidenedVector(SDValue(N, ResNo), Res);
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_Binary(SDNode *N) {
+  // Binary op widening.
+  MVT WidenVT = TLI.getTypeToTransformTo(N->getValueType(0));
+  SDValue InOp1 = GetWidenedVector(N->getOperand(0));
+  SDValue InOp2 = GetWidenedVector(N->getOperand(1));
+  return DAG.getNode(N->getOpcode(), WidenVT, InOp1, InOp2);
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_Convert(SDNode *N) {
+  SDValue InOp = N->getOperand(0);
+  
+  MVT WidenVT = TLI.getTypeToTransformTo(N->getValueType(0));
+  unsigned WidenNumElts = WidenVT.getVectorNumElements();
+
+  MVT InVT = InOp.getValueType();
+  MVT InEltVT = InVT.getVectorElementType();
+  MVT InWidenVT = MVT::getVectorVT(InEltVT, WidenNumElts);
+
+  unsigned Opcode = N->getOpcode();
+  unsigned InVTNumElts = InVT.getVectorNumElements();
+
+  if (getTypeAction(InVT) == WidenVector) {
+    InOp = GetWidenedVector(N->getOperand(0));
+    InVT = InOp.getValueType();
+    InVTNumElts = InVT.getVectorNumElements();
+    if (InVTNumElts == WidenNumElts)
+      return DAG.getNode(Opcode, WidenVT, InOp);
+  }
+
+  if (TLI.isTypeLegal(InWidenVT)) {
+    // Because the result and the input are different vector types, widening
+    // the result could create a legal type but widening the input might make
+    // it an illegal type that might lead to repeatedly splitting the input
+    // and then widening it. To avoid this, we widen the input only if
+    // it results in a legal type.
+    if (WidenNumElts % InVTNumElts == 0) {
+      // Widen the input and call convert on the widened input vector.
+      unsigned NumConcat = WidenNumElts/InVTNumElts;
+      SmallVector<SDValue, 16> Ops(NumConcat);
+      Ops[0] = InOp;
+      SDValue UndefVal = DAG.getNode(ISD::UNDEF, InVT);
+      for (unsigned i = 1; i != NumConcat; ++i)
+        Ops[i] = UndefVal;
+      return DAG.getNode(Opcode, WidenVT,
+                         DAG.getNode(ISD::CONCAT_VECTORS, InWidenVT,
+                         &Ops[0], NumConcat));
+    }
+
+    if (InVTNumElts % WidenNumElts == 0) {
+      // Extract the input and convert the shorten input vector.
+      return DAG.getNode(Opcode, WidenVT,
+                         DAG.getNode(ISD::EXTRACT_SUBVECTOR, InWidenVT, InOp,
+                                     DAG.getIntPtrConstant(0)));
+    }
+  }
+
+  // Otherwise unroll into some nasty scalar code and rebuild the vector.
+  SmallVector<SDValue, 16> Ops(WidenNumElts);
+  MVT EltVT = WidenVT.getVectorElementType();
+  unsigned MinElts = std::min(InVTNumElts, WidenNumElts);
+  unsigned i;
+  for (i=0; i < MinElts; ++i)
+    Ops[i] = DAG.getNode(Opcode, EltVT,
+                         DAG.getNode(ISD::EXTRACT_VECTOR_ELT, InEltVT, InOp,
+                                     DAG.getIntPtrConstant(i)));
+
+  SDValue UndefVal = DAG.getNode(ISD::UNDEF, EltVT);
+  for (; i < WidenNumElts; ++i)
+    Ops[i] = UndefVal;
+
+  return DAG.getNode(ISD::BUILD_VECTOR, WidenVT, &Ops[0], WidenNumElts);
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_Shift(SDNode *N) {
+  MVT WidenVT = TLI.getTypeToTransformTo(N->getValueType(0));
+  SDValue InOp = GetWidenedVector(N->getOperand(0));
+  SDValue ShOp = N->getOperand(1);
+
+  MVT ShVT = ShOp.getValueType();
+  if (getTypeAction(ShVT) == WidenVector) {
+    ShOp = GetWidenedVector(ShOp);
+    ShVT = ShOp.getValueType();
+  }
+  MVT ShWidenVT = MVT::getVectorVT(ShVT.getVectorElementType(),
+                                   WidenVT.getVectorNumElements());
+  if (ShVT != ShWidenVT) 
+    ShOp = ModifyToType(ShOp, ShWidenVT);
+    
+  return DAG.getNode(N->getOpcode(), WidenVT, InOp, ShOp);
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_Unary(SDNode *N) {
+  // Unary op widening.
+  MVT WidenVT = TLI.getTypeToTransformTo(N->getValueType(0));
+  SDValue InOp = GetWidenedVector(N->getOperand(0));
+  return DAG.getNode(N->getOpcode(), WidenVT, InOp);
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_BIT_CONVERT(SDNode *N) {
+  SDValue InOp = N->getOperand(0);
+  MVT InVT = InOp.getValueType();
+  MVT VT = N->getValueType(0);
+  MVT WidenVT = TLI.getTypeToTransformTo(VT);
+
+  switch (getTypeAction(InVT)) {
+  default:
+    assert(false && "Unknown type action!");
+    break;
+  case Legal:
+    break;
+  case PromoteInteger:
+    // If the InOp is promoted to the same size, convert it.  Otherwise,
+    // fall out of the switch and widen the promoted input.
+    InOp = GetPromotedInteger(InOp);
+    InVT = InOp.getValueType();
+    if (WidenVT.bitsEq(InVT))
+      return DAG.getNode(ISD::BIT_CONVERT, WidenVT, InOp);
+    break;
+  case SoftenFloat:
+  case ExpandInteger:
+  case ExpandFloat:
+  case ScalarizeVector:
+  case SplitVector:
+    break;
+  case WidenVector:
+    // If the InOp is widened to the same size, convert it.  Otherwise, fall
+    // out of the switch and widen the widened input.
+    InOp = GetWidenedVector(InOp);
+    InVT = InOp.getValueType();
+    if (WidenVT.bitsEq(InVT))
+      // The input widens to the same size. Convert to the widen value.
+      return DAG.getNode(ISD::BIT_CONVERT, WidenVT, InOp);
+    break;
+  }
+
+  unsigned WidenSize = WidenVT.getSizeInBits();
+  unsigned InSize = InVT.getSizeInBits();
+  if (WidenSize % InSize == 0) {
+    // Determine new input vector type.  The new input vector type will use
+    // the same element type (if its a vector) or use the input type as a
+    // vector.  It is the same size as the type to widen to.
+    MVT NewInVT;
+    unsigned NewNumElts = WidenSize / InSize;
+    if (InVT.isVector()) {
+      MVT InEltVT = InVT.getVectorElementType();
+      NewInVT= MVT::getVectorVT(InEltVT, WidenSize / InEltVT.getSizeInBits());
+    } else {
+      NewInVT = MVT::getVectorVT(InVT, NewNumElts);
+    }
+
+    if (TLI.isTypeLegal(NewInVT)) {
+      // Because the result and the input are different vector types, widening
+      // the result could create a legal type but widening the input might make
+      // it an illegal type that might lead to repeatedly splitting the input
+      // and then widening it. To avoid this, we widen the input only if
+      // it results in a legal type.
+      SmallVector<SDValue, 16> Ops(NewNumElts);
+      SDValue UndefVal = DAG.getNode(ISD::UNDEF, InVT);
+      Ops[0] = InOp;
+      for (unsigned i = 1; i < NewNumElts; ++i)
+        Ops[i] = UndefVal;
+
+      SDValue NewVec;
+      if (InVT.isVector())
+        NewVec = DAG.getNode(ISD::CONCAT_VECTORS, NewInVT, &Ops[0], NewNumElts);
+      else
+        NewVec = DAG.getNode(ISD::BUILD_VECTOR, NewInVT, &Ops[0], NewNumElts);
+      return DAG.getNode(ISD::BIT_CONVERT, WidenVT, NewVec);
+    }
+  }
+
+  // This should occur rarely. Lower the bit-convert to a store/load
+  // from the stack. Create the stack frame object.  Make sure it is aligned
+  // for both the source and destination types.
+  SDValue FIPtr = DAG.CreateStackTemporary(InVT, WidenVT);
+
+  // Emit a store to the stack slot.
+  SDValue Store = DAG.getStore(DAG.getEntryNode(), InOp, FIPtr, NULL, 0);
+
+  // Result is a load from the stack slot.
+  return DAG.getLoad(WidenVT, Store, FIPtr, NULL, 0);
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_BUILD_VECTOR(SDNode *N) {
+  // Build a vector with undefined for the new nodes.
+  MVT VT = N->getValueType(0);
+  MVT EltVT = VT.getVectorElementType();
+  unsigned NumElts = VT.getVectorNumElements();
+
+  MVT WidenVT = TLI.getTypeToTransformTo(VT);
+  unsigned WidenNumElts = WidenVT.getVectorNumElements();
+
+  SmallVector<SDValue, 16> NewOps(N->op_begin(), N->op_end());
+  NewOps.reserve(WidenNumElts);
+  for (unsigned i = NumElts; i < WidenNumElts; ++i)
+    NewOps.push_back(DAG.getNode(ISD::UNDEF, EltVT));
+
+  return DAG.getNode(ISD::BUILD_VECTOR, WidenVT, &NewOps[0], NewOps.size());
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_CONCAT_VECTORS(SDNode *N) {
+  MVT InVT = N->getOperand(0).getValueType();
+  MVT WidenVT = TLI.getTypeToTransformTo(N->getValueType(0));
+  unsigned WidenNumElts = WidenVT.getVectorNumElements();
+  unsigned NumOperands = N->getNumOperands();
+  
+  bool InputWidened = false; // Indicates we need to widen the input.
+  if (getTypeAction(InVT) != WidenVector) {
+    if (WidenVT.getVectorNumElements() % InVT.getVectorNumElements() == 0) {
+      // Add undef vectors to widen to correct length.
+      unsigned NumConcat = WidenVT.getVectorNumElements() / 
+                           InVT.getVectorNumElements();
+      SDValue UndefVal = DAG.getNode(ISD::UNDEF, InVT);
+      SmallVector<SDValue, 16> Ops(NumConcat);
+      for (unsigned i=0; i < NumOperands; ++i)
+        Ops[i] = N->getOperand(i);
+      for (unsigned i = NumOperands; i != NumConcat; ++i)
+        Ops[i] = UndefVal;
+      return DAG.getNode(ISD::CONCAT_VECTORS, WidenVT, &Ops[0], NumConcat);
+    }
+  } else {
+    InputWidened = true;
+    if (WidenVT == TLI.getTypeToTransformTo(InVT)) {
+      // The inputs and the result are widen to the same value.
+      unsigned i;
+      for (i=1; i < NumOperands; ++i)
+        if (N->getOperand(i).getOpcode() != ISD::UNDEF)
+          break;
+
+      if (i > NumOperands)
+        // Everything but the first operand is an UNDEF so just return the
+        // widened first operand.
+        return GetWidenedVector(N->getOperand(0));
+
+      if (NumOperands == 2) {
+        // Replace concat of two operands with a shuffle.
+        MVT PtrVT = TLI.getPointerTy();
+        SmallVector<SDValue, 16> MaskOps(WidenNumElts);
+        for (unsigned i=0; i < WidenNumElts/2; ++i) {
+          MaskOps[i] = DAG.getConstant(i, PtrVT);
+          MaskOps[i+WidenNumElts/2] = DAG.getConstant(i+WidenNumElts, PtrVT);
+        }
+        SDValue Mask = DAG.getNode(ISD::BUILD_VECTOR,
+                                   MVT::getVectorVT(PtrVT, WidenNumElts),
+                                   &MaskOps[0], WidenNumElts);
+        return DAG.getNode(ISD::VECTOR_SHUFFLE, WidenVT,
+                           GetWidenedVector(N->getOperand(0)),
+                           GetWidenedVector(N->getOperand(1)), Mask);
+      }
+    }
+  }
+  
+  // Fall back to use extracts and build vector.
+  MVT EltVT = WidenVT.getVectorElementType();
+  unsigned NumInElts = InVT.getVectorNumElements();
+  SmallVector<SDValue, 16> Ops(WidenNumElts);
+  unsigned Idx = 0;
+  for (unsigned i=0; i < NumOperands; ++i) {
+    SDValue InOp = N->getOperand(i);
+    if (InputWidened)
+      InOp = GetWidenedVector(InOp);
+    for (unsigned j=0; j < NumInElts; ++j)
+        Ops[Idx++] = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, EltVT, InOp,
+                                 DAG.getIntPtrConstant(j));
+  }
+  SDValue UndefVal = DAG.getNode(ISD::UNDEF, EltVT);
+  for (; Idx < WidenNumElts; ++Idx)
+    Ops[Idx] = UndefVal;
+  return DAG.getNode(ISD::BUILD_VECTOR, WidenVT, &Ops[0], WidenNumElts);
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_CONVERT_RNDSAT(SDNode *N) {
+  SDValue InOp  = N->getOperand(0);
+  SDValue RndOp = N->getOperand(3);
+  SDValue SatOp = N->getOperand(4);
+
+  MVT      WidenVT = TLI.getTypeToTransformTo(N->getValueType(0));
+  unsigned WidenNumElts = WidenVT.getVectorNumElements();
+
+  MVT InVT = InOp.getValueType();
+  MVT InEltVT = InVT.getVectorElementType();
+  MVT InWidenVT = MVT::getVectorVT(InEltVT, WidenNumElts);
+
+  SDValue DTyOp = DAG.getValueType(WidenVT);
+  SDValue STyOp = DAG.getValueType(InWidenVT);
+  ISD::CvtCode CvtCode = cast<CvtRndSatSDNode>(N)->getCvtCode();
+
+  unsigned InVTNumElts = InVT.getVectorNumElements();
+  if (getTypeAction(InVT) == WidenVector) {
+    InOp = GetWidenedVector(InOp);
+    InVT = InOp.getValueType();
+    InVTNumElts = InVT.getVectorNumElements();
+    if (InVTNumElts == WidenNumElts)
+      return DAG.getConvertRndSat(WidenVT, InOp, DTyOp, STyOp, RndOp,
+                                  SatOp, CvtCode);
+  }
+
+  if (TLI.isTypeLegal(InWidenVT)) {
+    // Because the result and the input are different vector types, widening
+    // the result could create a legal type but widening the input might make
+    // it an illegal type that might lead to repeatedly splitting the input
+    // and then widening it. To avoid this, we widen the input only if
+    // it results in a legal type.
+    if (WidenNumElts % InVTNumElts == 0) {
+      // Widen the input and call convert on the widened input vector.
+      unsigned NumConcat = WidenNumElts/InVTNumElts;
+      SmallVector<SDValue, 16> Ops(NumConcat);
+      Ops[0] = InOp;
+      SDValue UndefVal = DAG.getNode(ISD::UNDEF, InVT);
+      for (unsigned i = 1; i != NumConcat; ++i) {
+        Ops[i] = UndefVal;
+      }
+      InOp = DAG.getNode(ISD::CONCAT_VECTORS, InWidenVT, &Ops[0], NumConcat);
+      return DAG.getConvertRndSat(WidenVT, InOp, DTyOp, STyOp, RndOp,
+                                  SatOp, CvtCode);
+    }
+
+    if (InVTNumElts % WidenNumElts == 0) {
+      // Extract the input and convert the shorten input vector.
+      InOp = DAG.getNode(ISD::EXTRACT_SUBVECTOR, InWidenVT, InOp,
+                         DAG.getIntPtrConstant(0));
+      return DAG.getConvertRndSat(WidenVT, InOp, DTyOp, STyOp, RndOp,
+                                SatOp, CvtCode);
+    }
+  }
+
+  // Otherwise unroll into some nasty scalar code and rebuild the vector.
+  SmallVector<SDValue, 16> Ops(WidenNumElts);
+  MVT EltVT = WidenVT.getVectorElementType();
+  DTyOp = DAG.getValueType(EltVT);
+  STyOp = DAG.getValueType(InEltVT);
+
+  unsigned MinElts = std::min(InVTNumElts, WidenNumElts);
+  unsigned i;
+  for (i=0; i < MinElts; ++i) {
+    SDValue ExtVal = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, InEltVT, InOp,
+                                 DAG.getIntPtrConstant(i));
+    Ops[i] = DAG.getConvertRndSat(WidenVT, ExtVal, DTyOp, STyOp, RndOp,
+                                        SatOp, CvtCode);
+  }
+
+  SDValue UndefVal = DAG.getNode(ISD::UNDEF, EltVT);
+  for (; i < WidenNumElts; ++i)
+    Ops[i] = UndefVal;
+
+  return DAG.getNode(ISD::BUILD_VECTOR, WidenVT, &Ops[0], WidenNumElts);
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_EXTRACT_SUBVECTOR(SDNode *N) {
+  MVT      VT = N->getValueType(0);
+  MVT      WidenVT = TLI.getTypeToTransformTo(VT);
+  unsigned WidenNumElts = WidenVT.getVectorNumElements();
+  SDValue  InOp = N->getOperand(0);
+  SDValue  Idx  = N->getOperand(1);
+
+  if (getTypeAction(InOp.getValueType()) == WidenVector)
+    InOp = GetWidenedVector(InOp);
+
+  MVT InVT = InOp.getValueType();
+
+  ConstantSDNode *CIdx = dyn_cast<ConstantSDNode>(Idx);
+  if (CIdx) {
+    unsigned IdxVal = CIdx->getZExtValue();
+    // Check if we can just return the input vector after widening.
+    if (IdxVal == 0 && InVT == WidenVT)
+      return InOp;
+
+    // Check if we can extract from the vector.
+    unsigned InNumElts = InVT.getVectorNumElements();
+    if (IdxVal % WidenNumElts == 0 && IdxVal + WidenNumElts < InNumElts)
+        return DAG.getNode(ISD::EXTRACT_SUBVECTOR, WidenVT, InOp, Idx);
+  }
+
+  // We could try widening the input to the right length but for now, extract
+  // the original elements, fill the rest with undefs and build a vector.
+  SmallVector<SDValue, 16> Ops(WidenNumElts);
+  MVT EltVT = VT.getVectorElementType();
+  MVT IdxVT = Idx.getValueType();
+  unsigned NumElts = VT.getVectorNumElements();
+  unsigned i;
+  if (CIdx) {
+    unsigned IdxVal = CIdx->getZExtValue();
+    for (i=0; i < NumElts; ++i)
+      Ops[i] = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, EltVT, InOp,
+                           DAG.getConstant(IdxVal+i, IdxVT));
+  } else {
+    Ops[0] = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, EltVT, InOp, Idx);
+    for (i=1; i < NumElts; ++i) {
+      SDValue NewIdx = DAG.getNode(ISD::ADD, Idx.getValueType(), Idx,
+                                   DAG.getConstant(i, IdxVT));
+      Ops[i] = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, EltVT, InOp, NewIdx);
+    }
+  }
+
+  SDValue UndefVal = DAG.getNode(ISD::UNDEF, EltVT);
+  for (; i < WidenNumElts; ++i)
+    Ops[i] = UndefVal;
+  return DAG.getNode(ISD::BUILD_VECTOR, WidenVT, &Ops[0], WidenNumElts);
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_INSERT_VECTOR_ELT(SDNode *N) {
+  SDValue InOp = GetWidenedVector(N->getOperand(0));
+  return DAG.getNode(ISD::INSERT_VECTOR_ELT, InOp.getValueType(), InOp,
+                     N->getOperand(1), N->getOperand(2));
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_LOAD(SDNode *N) {
+  LoadSDNode *LD = cast<LoadSDNode>(N);
+  MVT WidenVT = TLI.getTypeToTransformTo(LD->getValueType(0));
+  MVT LdVT    = LD->getMemoryVT();
+  assert(LdVT.isVector() && WidenVT.isVector());
+
+  // Load information
+  SDValue   Chain = LD->getChain();
+  SDValue   BasePtr = LD->getBasePtr();
+  int       SVOffset = LD->getSrcValueOffset();
+  unsigned  Align    = LD->getAlignment();
+  bool      isVolatile = LD->isVolatile();
+  const Value *SV = LD->getSrcValue();
+  ISD::LoadExtType ExtType = LD->getExtensionType();
+
+  SDValue Result;
+  SmallVector<SDValue, 16> LdChain;  // Chain for the series of load
+  if (ExtType != ISD::NON_EXTLOAD) {
+    // For extension loads, we can not play the tricks of chopping legal
+    // vector types and bit cast it to the right type.  Instead, we unroll
+    // the load and build a vector.
+    MVT EltVT = WidenVT.getVectorElementType();
+    MVT LdEltVT = LdVT.getVectorElementType();
+    unsigned NumElts = LdVT.getVectorNumElements();
+    
+    // Load each element and widen
+    unsigned WidenNumElts = WidenVT.getVectorNumElements();  
+    SmallVector<SDValue, 16> Ops(WidenNumElts);
+    unsigned Increment = LdEltVT.getSizeInBits() / 8;
+    Ops[0] = DAG.getExtLoad(ExtType, EltVT, Chain, BasePtr, SV, SVOffset,
+                            LdEltVT, isVolatile, Align);
+    LdChain.push_back(Ops[0].getValue(1));
+    unsigned i = 0, Offset = Increment;
+    for (i=1; i < NumElts; ++i, Offset += Increment) {
+      SDValue NewBasePtr = DAG.getNode(ISD::ADD, BasePtr.getValueType(), 
+                                       BasePtr, DAG.getIntPtrConstant(Offset));
+      Ops[i] = DAG.getExtLoad(ExtType, EltVT, Chain, NewBasePtr, SV,
+                              SVOffset + Offset, LdEltVT, isVolatile, Align);
+      LdChain.push_back(Ops[i].getValue(1));
+    }
+
+    // Fill the rest with undefs
+    SDValue UndefVal = DAG.getNode(ISD::UNDEF, EltVT);
+    for (; i != WidenNumElts; ++i)
+      Ops[i] = UndefVal;
+
+    Result =  DAG.getNode(ISD::BUILD_VECTOR, WidenVT, &Ops[0], Ops.size());
+  } else {
+    assert(LdVT.getVectorElementType() == WidenVT.getVectorElementType());
+    unsigned int LdWidth = LdVT.getSizeInBits();
+    Result = GenWidenVectorLoads(LdChain, Chain, BasePtr, SV, SVOffset,
+                                 Align, isVolatile, LdWidth, WidenVT);
+}
+
+ // If we generate a single load, we can use that for the chain.  Otherwise,
+ // build a factor node to remember the multiple loads are independent and
+ // chain to that.
+ SDValue NewChain;
+ if (LdChain.size() == 1)
+   NewChain = LdChain[0];
+ else
+   NewChain = DAG.getNode(ISD::TokenFactor, MVT::Other, &LdChain[0],
+                          LdChain.size());
+
+  // Modified the chain - switch anything that used the old chain to use
+  // the new one.
+  ReplaceValueWith(SDValue(N, 1), Chain);
+
+  return Result;
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_SCALAR_TO_VECTOR(SDNode *N) {
+  MVT WidenVT = TLI.getTypeToTransformTo(N->getValueType(0));
+  return DAG.getNode(ISD::SCALAR_TO_VECTOR, WidenVT, N->getOperand(0));
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_SELECT(SDNode *N) {
+  MVT WidenVT = TLI.getTypeToTransformTo(N->getValueType(0));
+  unsigned WidenNumElts = WidenVT.getVectorNumElements();
+
+  SDValue Cond1 = N->getOperand(0);
+  MVT CondVT = Cond1.getValueType();
+  if (CondVT.isVector()) {
+    MVT CondEltVT = CondVT.getVectorElementType();
+    MVT CondWidenVT =  MVT::getVectorVT(CondEltVT, WidenNumElts);
+    if (getTypeAction(CondVT) == WidenVector)
+      Cond1 = GetWidenedVector(Cond1);
+
+    if (Cond1.getValueType() != CondWidenVT)
+       Cond1 = ModifyToType(Cond1, CondWidenVT);
+  }
+
+  SDValue InOp1 = GetWidenedVector(N->getOperand(1));
+  SDValue InOp2 = GetWidenedVector(N->getOperand(2));
+  assert(InOp1.getValueType() == WidenVT && InOp2.getValueType() == WidenVT);
+  return DAG.getNode(ISD::SELECT, WidenVT, Cond1, InOp1, InOp2);
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_SELECT_CC(SDNode *N) {
+  SDValue InOp1 = GetWidenedVector(N->getOperand(2));
+  SDValue InOp2 = GetWidenedVector(N->getOperand(3));  
+  return DAG.getNode(ISD::SELECT_CC, InOp1.getValueType(), N->getOperand(0),
+                     N->getOperand(1), InOp1, InOp2, N->getOperand(4));
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_UNDEF(SDNode *N) {
+ MVT WidenVT = TLI.getTypeToTransformTo(N->getValueType(0));
+ return DAG.getNode(ISD::UNDEF, WidenVT);
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_VECTOR_SHUFFLE(SDNode *N) {
+  MVT VT = N->getValueType(0);
+  unsigned NumElts = VT.getVectorNumElements();
+
+  MVT WidenVT = TLI.getTypeToTransformTo(VT);
+  unsigned WidenNumElts = WidenVT.getVectorNumElements();
+
+  SDValue InOp1 = GetWidenedVector(N->getOperand(0));
+  SDValue InOp2 = GetWidenedVector(N->getOperand(1));
+
+  // Adjust mask based on new input vector length.
+  SDValue Mask = N->getOperand(2);
+  SmallVector<SDValue, 16> MaskOps(WidenNumElts);
+  MVT IdxVT = Mask.getValueType().getVectorElementType();
+  for (unsigned i = 0; i < NumElts; ++i) {
+    SDValue Arg = Mask.getOperand(i);
+    if (Arg.getOpcode() == ISD::UNDEF)
+      MaskOps[i] = Arg;
+    else {
+      unsigned Idx = cast<ConstantSDNode>(Arg)->getZExtValue();
+      if (Idx < NumElts)
+        MaskOps[i] = Arg;
+      else
+        MaskOps[i] = DAG.getConstant(Idx - NumElts + WidenNumElts, IdxVT);
+    }
+  }
+  for (unsigned i = NumElts; i < WidenNumElts; ++i)
+    MaskOps[i] = DAG.getNode(ISD::UNDEF, IdxVT);
+  SDValue NewMask = DAG.getNode(ISD::BUILD_VECTOR, 
+                                MVT::getVectorVT(IdxVT, WidenNumElts),
+                                &MaskOps[0], WidenNumElts); 
+
+  return DAG.getNode(ISD::VECTOR_SHUFFLE, WidenVT, InOp1, InOp2, NewMask);
+}
+
+SDValue DAGTypeLegalizer::WidenVecRes_VSETCC(SDNode *N) {
+  MVT WidenVT = TLI.getTypeToTransformTo(N->getValueType(0));
+  unsigned WidenNumElts = WidenVT.getVectorNumElements();
+
+  SDValue InOp1 = N->getOperand(0);
+  MVT InVT = InOp1.getValueType();
+  assert(InVT.isVector() && "can not widen non vector type");
+  MVT WidenInVT = MVT::getVectorVT(InVT.getVectorElementType(), WidenNumElts);
+  InOp1 = GetWidenedVector(InOp1);
+  SDValue InOp2 = GetWidenedVector(N->getOperand(1));
+
+  // Assume that the input and output will be widen appropriately.  If not,
+  // we will have to unroll it at some point.
+  assert(InOp1.getValueType() == WidenInVT &&
+         InOp2.getValueType() == WidenInVT &&
+         "Input not widened to expected type!");
+  return DAG.getNode(ISD::VSETCC, WidenVT, InOp1, InOp2, N->getOperand(2));
+}
+
+
+//===----------------------------------------------------------------------===//
+// Widen Vector Operand
+//===----------------------------------------------------------------------===//
+bool DAGTypeLegalizer::WidenVectorOperand(SDNode *N, unsigned ResNo) {
+  DEBUG(cerr << "Widen node operand " << ResNo << ": "; N->dump(&DAG);
+        cerr << "\n");
+  SDValue Res = SDValue();
+
+  switch (N->getOpcode()) {
+  default:
+#ifndef NDEBUG
+    cerr << "WidenVectorOperand op #" << ResNo << ": ";
+    N->dump(&DAG); cerr << "\n";
+#endif
+    assert(0 && "Do not know how to widen this operator's operand!");
+    abort();
+
+  case ISD::CONCAT_VECTORS:     Res = WidenVecOp_CONCAT_VECTORS(N); break;
+  case ISD::EXTRACT_VECTOR_ELT: Res = WidenVecOp_EXTRACT_VECTOR_ELT(N); break;
+  case ISD::STORE:              Res = WidenVecOp_STORE(N); break;
+  
+  case ISD::FP_ROUND:
+  case ISD::FP_TO_SINT:
+  case ISD::FP_TO_UINT:
+  case ISD::SINT_TO_FP:
+  case ISD::TRUNCATE:
+  case ISD::UINT_TO_FP:         Res = WidenVecOp_Convert(N); break;
+  }
+
+  // If Res is null, the sub-method took care of registering the result.
+  if (!Res.getNode()) return false;
+
+  // If the result is N, the sub-method updated N in place.  Tell the legalizer
+  // core about this.
+  if (Res.getNode() == N)
+    return true;
+
+
+  assert(Res.getValueType() == N->getValueType(0) && N->getNumValues() == 1 &&
+         "Invalid operand expansion");
+
+  ReplaceValueWith(SDValue(N, 0), Res);
+  return false;
+}
+
+SDValue DAGTypeLegalizer::WidenVecOp_Convert(SDNode *N) {
+  // Since the result is legal and the input is illegal, it is unlikely
+  // that we can fix the input to a legal type so unroll the convert
+  // into some scalar code and create a nasty build vector.
+  MVT VT = N->getValueType(0);
+  MVT EltVT = VT.getVectorElementType();
+  unsigned NumElts = VT.getVectorNumElements();
+  SDValue InOp = N->getOperand(0);
+  if (getTypeAction(InOp.getValueType()) == WidenVector)
+    InOp = GetWidenedVector(InOp);
+  MVT InVT = InOp.getValueType();
+  MVT InEltVT = InVT.getVectorElementType();
+
+  unsigned Opcode = N->getOpcode();
+  SmallVector<SDValue, 16> Ops(NumElts);
+  for (unsigned i=0; i < NumElts; ++i)
+    Ops[i] = DAG.getNode(Opcode, EltVT,
+                         DAG.getNode(ISD::EXTRACT_VECTOR_ELT, InEltVT, InOp,
+                                     DAG.getIntPtrConstant(i)));
+
+  return DAG.getNode(ISD::BUILD_VECTOR, VT, &Ops[0], NumElts); 
+}
+
+SDValue DAGTypeLegalizer::WidenVecOp_CONCAT_VECTORS(SDNode *N) {
+  // If the input vector is not legal, it is likely that we will not find a
+  // legal vector of the same size. Replace the concatenate vector with a
+  // nasty build vector.
+  MVT VT = N->getValueType(0);
+  MVT EltVT = VT.getVectorElementType();
+  unsigned NumElts = VT.getVectorNumElements();
+  SmallVector<SDValue, 16> Ops(NumElts);
+
+  MVT InVT = N->getOperand(0).getValueType();
+  unsigned NumInElts = InVT.getVectorNumElements();
+
+  unsigned Idx = 0;
+  unsigned NumOperands = N->getNumOperands();
+  for (unsigned i=0; i < NumOperands; ++i) {
+    SDValue InOp = N->getOperand(i);
+    if (getTypeAction(InOp.getValueType()) == WidenVector)
+      InOp = GetWidenedVector(InOp);
+    for (unsigned j=0; j < NumInElts; ++j)
+      Ops[Idx++] = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, EltVT, InOp,
+                               DAG.getIntPtrConstant(j));
+  }
+  return DAG.getNode(ISD::BUILD_VECTOR, VT, &Ops[0], NumElts);
+}
+
+SDValue DAGTypeLegalizer::WidenVecOp_EXTRACT_VECTOR_ELT(SDNode *N) {
+  SDValue InOp = GetWidenedVector(N->getOperand(0));
+  MVT EltVT = InOp.getValueType().getVectorElementType();
+  return DAG.getNode(ISD::EXTRACT_VECTOR_ELT, EltVT, InOp, N->getOperand(1));
+}
+
+SDValue DAGTypeLegalizer::WidenVecOp_STORE(SDNode *N) {
+  // We have to widen the value but we want only to store the original
+  // vector type.
+  StoreSDNode *ST = cast<StoreSDNode>(N);
+  SDValue  Chain = ST->getChain();
+  SDValue  BasePtr = ST->getBasePtr();
+  const    Value *SV = ST->getSrcValue();
+  int      SVOffset = ST->getSrcValueOffset();
+  unsigned Align = ST->getAlignment();
+  bool     isVolatile = ST->isVolatile();
+  SDValue  ValOp = GetWidenedVector(ST->getValue());
+  
+  MVT StVT = ST->getMemoryVT();
+  MVT ValVT = ValOp.getValueType();
+  // It must be true that we the widen vector type is bigger than where
+  // we need to store.
+  assert(StVT.isVector() && ValOp.getValueType().isVector());
+  assert(StVT.getSizeInBits() < ValOp.getValueType().getSizeInBits());
+
+  SmallVector<SDValue, 16> StChain;
+  if (ST->isTruncatingStore()) {
+    // For truncating stores, we can not play the tricks of chopping legal
+    // vector types and bit cast it to the right type.  Instead, we unroll
+    // the store.
+    MVT StEltVT  = StVT.getVectorElementType();
+    MVT ValEltVT = ValVT.getVectorElementType();
+    unsigned Increment = ValEltVT.getSizeInBits() / 8;
+    unsigned NumElts = StVT.getVectorNumElements();
+    SDValue EOp = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, ValEltVT, ValOp,
+                              DAG.getIntPtrConstant(0));
+    StChain.push_back(DAG.getTruncStore(Chain, EOp, BasePtr, SV,
+                                        SVOffset, StEltVT,
+                                        isVolatile, Align));
+    unsigned Offset = Increment;
+    for (unsigned i=1; i < NumElts; ++i, Offset += Increment) {
+      SDValue NewBasePtr = DAG.getNode(ISD::ADD, BasePtr.getValueType(),
+                                       BasePtr, DAG.getIntPtrConstant(Offset));
+      SDValue EOp = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, ValEltVT, ValOp,
+                              DAG.getIntPtrConstant(0));
+      StChain.push_back(DAG.getTruncStore(Chain, EOp, NewBasePtr, SV,
+                                          SVOffset + Offset, StEltVT,
+                                          isVolatile, MinAlign(Align, Offset))); 
+    }
+  }
+  else {
+    assert(StVT.getVectorElementType() == ValVT.getVectorElementType());
+    // Store value
+    GenWidenVectorStores(StChain, Chain, BasePtr, SV, SVOffset,
+                         Align, isVolatile, ValOp, StVT.getSizeInBits());
+  }
+  if (StChain.size() == 1)
+    return StChain[0];
+  else 
+    return DAG.getNode(ISD::TokenFactor, MVT::Other,&StChain[0],StChain.size());
+}
+
+//===----------------------------------------------------------------------===//
+// Vector Widening Utilities
+//===----------------------------------------------------------------------===//
+
+
+// Utility function to find a vector type and its associated element
+// type from a preferred width and whose vector type must be the same size
+// as the VecVT.
+//  TLI:   Target lowering used to determine legal types.
+//  Width: Preferred width to store.
+//  VecVT: Vector value type whose size we must match.
+// Returns NewVecVT and NewEltVT - the vector type and its associated
+// element type.
+static void FindAssocWidenVecType(TargetLowering &TLI, unsigned Width, MVT VecVT,
+                                  MVT& NewEltVT, MVT& NewVecVT) {
+  unsigned EltWidth = Width + 1;
+  if (TLI.isTypeLegal(VecVT)) {
+    // We start with the preferred with, making it a power of 2 and find a 
+    // legal vector type of that width.  If not, we reduce it by another of 2.
+    // For incoming type is legal, this process will end as a vector of the
+    // smallest loadable type should always be legal.
+    do {
+      assert(EltWidth > 0);
+      EltWidth = 1 << Log2_32(EltWidth - 1);
+      NewEltVT = MVT::getIntegerVT(EltWidth);
+      unsigned NumElts = VecVT.getSizeInBits() / EltWidth;
+      NewVecVT = MVT::getVectorVT(NewEltVT, NumElts);
+    } while (!TLI.isTypeLegal(NewVecVT) ||
+             VecVT.getSizeInBits() != NewVecVT.getSizeInBits());
+  } else {
+    // The incoming vector type is illegal and is the result of widening
+    // a vector to a power of 2. In this case, we will use the preferred
+    // with as long as it is a multiple of the incoming vector length.
+    // The legalization process will eventually make this into a legal type
+    // and remove the illegal bit converts (which would turn to stack converts
+    // if they are allow to exist).
+     do {
+      assert(EltWidth > 0);
+      EltWidth = 1 << Log2_32(EltWidth - 1);
+      NewEltVT = MVT::getIntegerVT(EltWidth);
+      unsigned NumElts = VecVT.getSizeInBits() / EltWidth;
+      NewVecVT = MVT::getVectorVT(NewEltVT, NumElts);
+    } while (!TLI.isTypeLegal(NewEltVT) ||
+             VecVT.getSizeInBits() != NewVecVT.getSizeInBits());
+  }
+}
+
+SDValue DAGTypeLegalizer::GenWidenVectorLoads(SmallVector<SDValue, 16>& LdChain,
+                                              SDValue      Chain,
+                                              SDValue      BasePtr,
+                                              const Value *SV,
+                                              int          SVOffset,
+                                              unsigned     Alignment,
+                                              bool         isVolatile,
+                                              unsigned     LdWidth,
+                                              MVT          ResType) {
+  // The strategy assumes that we can efficiently load powers of two widths.
+  // The routines chops the vector into the largest power of 2 load and
+  // can be inserted into a legal vector and then cast the result into the
+  // vector type we want.  This avoids unnecessary stack converts.
+
+  // TODO: If the Ldwidth is legal, alignment is the same as the LdWidth, and
+  //       the load is nonvolatile, we an use a wider load for the value.
+
+  // Find the vector type that can load from.
+  MVT NewEltVT, NewVecVT;
+  unsigned NewEltVTWidth;
+  FindAssocWidenVecType(TLI, LdWidth, ResType, NewEltVT, NewVecVT);
+  NewEltVTWidth = NewEltVT.getSizeInBits();
+
+  SDValue LdOp = DAG.getLoad(NewEltVT, Chain, BasePtr, SV, SVOffset, isVolatile,
+                             Alignment);
+  SDValue VecOp = DAG.getNode(ISD::SCALAR_TO_VECTOR, NewVecVT, LdOp);
+  LdChain.push_back(LdOp.getValue(1));
+
+  // Check if we can load the element with one instruction
+  if (LdWidth == NewEltVTWidth) {
+    return DAG.getNode(ISD::BIT_CONVERT, ResType, VecOp);
+  }
+
+  unsigned Idx = 1;
+  LdWidth -= NewEltVTWidth;
+  unsigned Offset = 0;
+    
+  while (LdWidth > 0) {
+    unsigned Increment = NewEltVTWidth / 8;
+    Offset += Increment;
+    BasePtr = DAG.getNode(ISD::ADD, BasePtr.getValueType(), BasePtr,
+                          DAG.getIntPtrConstant(Increment));
+
+    if (LdWidth < NewEltVTWidth) {
+      // Our current type we are using is too large, use a smaller size by
+      // using a smaller power of 2
+      unsigned oNewEltVTWidth = NewEltVTWidth;
+      FindAssocWidenVecType(TLI, LdWidth, ResType, NewEltVT, NewVecVT);
+      NewEltVTWidth = NewEltVT.getSizeInBits();
+      // Readjust position and vector position based on new load type
+      Idx = Idx * (oNewEltVTWidth/NewEltVTWidth);
+      VecOp = DAG.getNode(ISD::BIT_CONVERT, NewVecVT, VecOp);
+    }
+      
+    SDValue LdOp = DAG.getLoad(NewEltVT, Chain, BasePtr, SV,
+                                 SVOffset+Offset, isVolatile,
+                                 MinAlign(Alignment, Offset));
+    LdChain.push_back(LdOp.getValue(1));
+    VecOp = DAG.getNode(ISD::INSERT_VECTOR_ELT, NewVecVT, VecOp, LdOp,
+                        DAG.getIntPtrConstant(Idx++));
+    
+    LdWidth -= NewEltVTWidth;
+  }
+
+  return DAG.getNode(ISD::BIT_CONVERT, ResType, VecOp);
+}
+
+void DAGTypeLegalizer::GenWidenVectorStores(SmallVector<SDValue, 16>& StChain,
+                                            SDValue   Chain,
+                                            SDValue   BasePtr,
+                                            const Value *SV,
+                                            int         SVOffset,
+                                            unsigned    Alignment,
+                                            bool        isVolatile,
+                                            SDValue     ValOp,
+                                            unsigned    StWidth) {
+  // Breaks the stores into a series of power of 2 width stores.  For any
+  // width, we convert the vector to the vector of element size that we
+  // want to store.  This avoids requiring a stack convert.
+  
+  // Find a width of the element type we can store with
+  MVT WidenVT = ValOp.getValueType();
+  MVT NewEltVT, NewVecVT;
+
+  FindAssocWidenVecType(TLI, StWidth, WidenVT, NewEltVT, NewVecVT);
+  unsigned NewEltVTWidth = NewEltVT.getSizeInBits();
+
+  SDValue VecOp = DAG.getNode(ISD::BIT_CONVERT, NewVecVT, ValOp);
+  SDValue EOp = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, NewEltVT, VecOp,
+                            DAG.getIntPtrConstant(0));
+  SDValue StOp = DAG.getStore(Chain, EOp, BasePtr, SV, SVOffset,
+                               isVolatile, Alignment);
+  StChain.push_back(StOp);
+
+  // Check if we are done
+  if (StWidth == NewEltVTWidth) {
+    return;
+  }
+  
+  unsigned Idx = 1;
+  StWidth -= NewEltVTWidth;
+  unsigned Offset = 0;
+    
+  while (StWidth > 0) {
+    unsigned Increment = NewEltVTWidth / 8;
+    Offset += Increment;
+    BasePtr = DAG.getNode(ISD::ADD, BasePtr.getValueType(), BasePtr,
+                          DAG.getIntPtrConstant(Increment));
+                          
+    if (StWidth < NewEltVTWidth) {
+      // Our current type we are using is too large, use a smaller size by
+      // using a smaller power of 2
+      unsigned oNewEltVTWidth = NewEltVTWidth;
+      FindAssocWidenVecType(TLI, StWidth, WidenVT, NewEltVT, NewVecVT);
+      NewEltVTWidth = NewEltVT.getSizeInBits();
+      // Readjust position and vector position based on new load type
+      Idx = Idx * (oNewEltVTWidth/NewEltVTWidth);
+      VecOp = DAG.getNode(ISD::BIT_CONVERT, NewVecVT, VecOp);
+    }
+    
+    EOp = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, NewEltVT, VecOp,
+                      DAG.getIntPtrConstant(Idx++));
+    StChain.push_back(DAG.getStore(Chain, EOp, BasePtr, SV,
+                                   SVOffset + Offset, isVolatile,
+                                   MinAlign(Alignment, Offset)));
+    StWidth -= NewEltVTWidth;
+  }
+}
+
+/// Modifies a vector input (widen or narrows) to a vector of NVT.  The
+/// input vector must have the same element type as NVT.
+SDValue DAGTypeLegalizer::ModifyToType(SDValue InOp, MVT NVT) {
+  // Note that InOp might have been widened so it might already have
+  // the right width or it might need be narrowed.
+  MVT InVT = InOp.getValueType();
+  assert(InVT.getVectorElementType() == NVT.getVectorElementType() &&
+         "input and widen element type must match");
+
+  // Check if InOp already has the right width.
+  if (InVT == NVT)
+    return InOp;
+
+  unsigned InNumElts = InVT.getVectorNumElements();
+  unsigned WidenNumElts = NVT.getVectorNumElements();  
+  if (WidenNumElts > InNumElts && WidenNumElts % InNumElts == 0) {
+    unsigned NumConcat = WidenNumElts / InNumElts;
+    SmallVector<SDValue, 16> Ops(NumConcat);
+    SDValue UndefVal = DAG.getNode(ISD::UNDEF, InVT);
+    Ops[0] = InOp;
+    for (unsigned i = 1; i != NumConcat; ++i)
+      Ops[i] = UndefVal;
+
+    return DAG.getNode(ISD::CONCAT_VECTORS, NVT, &Ops[0], NumConcat);
+  }
+  
+  if (WidenNumElts < InNumElts && InNumElts % WidenNumElts)
+    return DAG.getNode(ISD::EXTRACT_SUBVECTOR, NVT, InOp,
+                       DAG.getIntPtrConstant(0));
+  
+  // Fall back to extract and build.
+  SmallVector<SDValue, 16> Ops(WidenNumElts);
+  MVT EltVT = NVT.getVectorElementType();
+  unsigned MinNumElts = std::min(WidenNumElts, InNumElts);
+  unsigned Idx;
+  for (Idx = 0; Idx < MinNumElts; ++Idx)
+    Ops[Idx] = DAG.getNode(ISD::EXTRACT_VECTOR_ELT, EltVT, InOp,
+                           DAG.getIntPtrConstant(Idx));
+
+  SDValue UndefVal = DAG.getNode(ISD::UNDEF, EltVT);
+  for ( ; Idx < WidenNumElts; ++Idx)
+    Ops[Idx] = UndefVal;
+  return DAG.getNode(ISD::BUILD_VECTOR, NVT, &Ops[0], WidenNumElts);
+}

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp?rev=61209&r1=61208&r2=61209&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp Thu Dec 18 14:03:17 2008
@@ -572,8 +572,32 @@
                                IntermediateVT, NumIntermediates,
                                RegisterVT);
       RegisterTypeForVT[i] = RegisterVT;
-      TransformToType[i] = MVT::Other; // this isn't actually used
-      ValueTypeActions.setTypeAction(VT, Promote);
+      
+      // Determine if there is a legal wider type.
+      bool IsLegalWiderType = false;
+      MVT EltVT = VT.getVectorElementType();
+      unsigned NElts = VT.getVectorNumElements();
+      for (unsigned nVT = i+1; nVT <= MVT::LAST_VECTOR_VALUETYPE; ++nVT) {
+        MVT SVT = (MVT::SimpleValueType)nVT;
+        if (isTypeLegal(SVT) && SVT.getVectorElementType() == EltVT &&
+            SVT.getVectorNumElements() > NElts) {
+          TransformToType[i] = SVT;
+          ValueTypeActions.setTypeAction(VT, Promote);
+          IsLegalWiderType = true;
+          break;
+        }
+      }
+      if (!IsLegalWiderType) {
+        MVT NVT = VT.getPow2VectorType();
+        if (NVT == VT) {
+          // Type is already a power of 2.  The default action is to split.
+          TransformToType[i] = MVT::Other;
+          ValueTypeActions.setTypeAction(VT, Expand);
+        } else {
+          TransformToType[i] = NVT;
+          ValueTypeActions.setTypeAction(VT, Promote);
+        }
+      }
     }
   }
 }

Modified: llvm/trunk/lib/VMCore/ValueTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/ValueTypes.cpp?rev=61209&r1=61208&r2=61209&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/ValueTypes.cpp (original)
+++ llvm/trunk/lib/VMCore/ValueTypes.cpp Thu Dec 18 14:03:17 2008
@@ -99,6 +99,9 @@
   case MVT::isVoid:  return "isVoid";
   case MVT::Other:   return "ch";
   case MVT::Flag:    return "flag";
+  case MVT::v2i8:    return "v2i8";
+  case MVT::v4i8:    return "v4i8";
+  case MVT::v2i16:   return "v2i16";
   case MVT::v8i8:    return "v8i8";
   case MVT::v4i16:   return "v4i16";
   case MVT::v2i32:   return "v2i32";
@@ -135,6 +138,9 @@
   case MVT::f80:     return Type::X86_FP80Ty;
   case MVT::f128:    return Type::FP128Ty;
   case MVT::ppcf128: return Type::PPC_FP128Ty;
+  case MVT::v2i8:    return VectorType::get(Type::Int8Ty, 2);
+  case MVT::v4i8:    return VectorType::get(Type::Int8Ty, 4);
+  case MVT::v2i16:    return VectorType::get(Type::Int16Ty, 2);
   case MVT::v8i8:    return VectorType::get(Type::Int8Ty, 8);
   case MVT::v4i16:   return VectorType::get(Type::Int16Ty, 4);
   case MVT::v2i32:   return VectorType::get(Type::Int32Ty, 2);

Modified: llvm/trunk/utils/TableGen/CodeGenTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/CodeGenTarget.cpp?rev=61209&r1=61208&r2=61209&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/CodeGenTarget.cpp (original)
+++ llvm/trunk/utils/TableGen/CodeGenTarget.cpp Thu Dec 18 14:03:17 2008
@@ -51,6 +51,9 @@
   case MVT::ppcf128:  return "MVT::ppcf128";
   case MVT::Flag:  return "MVT::Flag";
   case MVT::isVoid:return "MVT::isVoid";
+  case MVT::v2i8:  return "MVT::v2i8";
+  case MVT::v4i8:  return "MVT::v4i8";
+  case MVT::v2i16: return "MVT::v2i16";
   case MVT::v8i8:  return "MVT::v8i8";
   case MVT::v4i16: return "MVT::v4i16";
   case MVT::v2i32: return "MVT::v2i32";
@@ -88,6 +91,9 @@
   case MVT::ppcf128:  return "MVT::ppcf128";
   case MVT::Flag:  return "MVT::Flag";
   case MVT::isVoid:return "MVT::isVoid";
+  case MVT::v2i8:  return "MVT::v2i8";
+  case MVT::v4i8:  return "MVT::v4i8";
+  case MVT::v2i16: return "MVT::v2i16";
   case MVT::v8i8:  return "MVT::v8i8";
   case MVT::v4i16: return "MVT::v4i16";
   case MVT::v2i32: return "MVT::v2i32";




From wangmp at apple.com  Thu Dec 18 14:06:00 2008
From: wangmp at apple.com (Mon P Wang)
Date: Thu, 18 Dec 2008 20:06:00 -0000
Subject: [llvm-commits] [llvm] r61210 - in /llvm/trunk/test/CodeGen/X86:
 widen_arith-1.ll widen_arith-2.ll widen_arith-3.ll widen_arith-4.ll
 widen_arith-5.ll widen_arith-6.ll widen_cast-1.ll widen_cast-2.ll
 widen_cast-3.ll widen_cast-4.ll widen_cast-5.ll widen_conv-1.ll
 widen_conv-2.ll widen_conv-3.ll widen_conv-4.ll widen_select-1.ll
 widen_shuffle-1.ll widen_shuffle-2.ll
Message-ID: <200812182006.mBIK61qQ008485@zion.cs.uiuc.edu>

Author: wangmp
Date: Thu Dec 18 14:05:58 2008
New Revision: 61210

URL: http://llvm.org/viewvc/llvm-project?rev=61210&view=rev
Log:
Added some basic test cases for r61209

Added:
    llvm/trunk/test/CodeGen/X86/widen_arith-1.ll
    llvm/trunk/test/CodeGen/X86/widen_arith-2.ll
    llvm/trunk/test/CodeGen/X86/widen_arith-3.ll
    llvm/trunk/test/CodeGen/X86/widen_arith-4.ll
    llvm/trunk/test/CodeGen/X86/widen_arith-5.ll
    llvm/trunk/test/CodeGen/X86/widen_arith-6.ll
    llvm/trunk/test/CodeGen/X86/widen_cast-1.ll
    llvm/trunk/test/CodeGen/X86/widen_cast-2.ll
    llvm/trunk/test/CodeGen/X86/widen_cast-3.ll
    llvm/trunk/test/CodeGen/X86/widen_cast-4.ll
    llvm/trunk/test/CodeGen/X86/widen_cast-5.ll
    llvm/trunk/test/CodeGen/X86/widen_conv-1.ll
    llvm/trunk/test/CodeGen/X86/widen_conv-2.ll
    llvm/trunk/test/CodeGen/X86/widen_conv-3.ll
    llvm/trunk/test/CodeGen/X86/widen_conv-4.ll
    llvm/trunk/test/CodeGen/X86/widen_select-1.ll
    llvm/trunk/test/CodeGen/X86/widen_shuffle-1.ll
    llvm/trunk/test/CodeGen/X86/widen_shuffle-2.ll

Added: llvm/trunk/test/CodeGen/X86/widen_arith-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_arith-1.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_arith-1.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_arith-1.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,48 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+; RUN: grep paddb  %t | count 1
+; RUN: grep pextrb %t | count 1
+; RUN: grep pextrw %t | count 1
+
+; Widen a v3i8 to v16i8 to use a vector add
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+
+define void @update(<3 x i8>* %dst, <3 x i8>* %src, i32 %n) nounwind {
+entry:
+	%dst.addr = alloca <3 x i8>*		; <<3 x i8>**> [#uses=2]
+	%src.addr = alloca <3 x i8>*		; <<3 x i8>**> [#uses=2]
+	%n.addr = alloca i32		; <i32*> [#uses=2]
+	%i = alloca i32, align 4		; <i32*> [#uses=6]
+	store <3 x i8>* %dst, <3 x i8>** %dst.addr
+	store <3 x i8>* %src, <3 x i8>** %src.addr
+	store i32 %n, i32* %n.addr
+	store i32 0, i32* %i
+	br label %forcond
+
+forcond:		; preds = %forinc, %entry
+	%tmp = load i32* %i		; <i32> [#uses=1]
+	%tmp1 = load i32* %n.addr		; <i32> [#uses=1]
+	%cmp = icmp slt i32 %tmp, %tmp1		; <i1> [#uses=1]
+	br i1 %cmp, label %forbody, label %afterfor
+
+forbody:		; preds = %forcond
+	%tmp2 = load i32* %i		; <i32> [#uses=1]
+	%tmp3 = load <3 x i8>** %dst.addr		; <<3 x i8>*> [#uses=1]
+	%arrayidx = getelementptr <3 x i8>* %tmp3, i32 %tmp2		; <<3 x i8>*> [#uses=1]
+	%tmp4 = load i32* %i		; <i32> [#uses=1]
+	%tmp5 = load <3 x i8>** %src.addr		; <<3 x i8>*> [#uses=1]
+	%arrayidx6 = getelementptr <3 x i8>* %tmp5, i32 %tmp4		; <<3 x i8>*> [#uses=1]
+	%tmp7 = load <3 x i8>* %arrayidx6		; <<3 x i8>> [#uses=1]
+	%add = add <3 x i8> %tmp7, < i8 1, i8 1, i8 1 >		; <<3 x i8>> [#uses=1]
+	store <3 x i8> %add, <3 x i8>* %arrayidx
+	br label %forinc
+
+forinc:		; preds = %forbody
+	%tmp8 = load i32* %i		; <i32> [#uses=1]
+	%inc = add i32 %tmp8, 1		; <i32> [#uses=1]
+	store i32 %inc, i32* %i
+	br label %forcond
+
+afterfor:		; preds = %forcond
+	ret void
+}

Added: llvm/trunk/test/CodeGen/X86/widen_arith-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_arith-2.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_arith-2.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_arith-2.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,60 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+; RUN: grep paddb  %t | count 1
+; RUN: grep pand %t | count 1
+
+; widen v8i8 to v16i8 (checks even power of 2 widening with add & and)
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+
+define void @update(i64* %dst_i, i64* %src_i, i32 %n) nounwind {
+entry:
+	%dst_i.addr = alloca i64*		; <i64**> [#uses=2]
+	%src_i.addr = alloca i64*		; <i64**> [#uses=2]
+	%n.addr = alloca i32		; <i32*> [#uses=2]
+	%i = alloca i32, align 4		; <i32*> [#uses=8]
+	%dst = alloca <8 x i8>*, align 4		; <<8 x i8>**> [#uses=2]
+	%src = alloca <8 x i8>*, align 4		; <<8 x i8>**> [#uses=2]
+	store i64* %dst_i, i64** %dst_i.addr
+	store i64* %src_i, i64** %src_i.addr
+	store i32 %n, i32* %n.addr
+	store i32 0, i32* %i
+	br label %forcond
+
+forcond:		; preds = %forinc, %entry
+	%tmp = load i32* %i		; <i32> [#uses=1]
+	%tmp1 = load i32* %n.addr		; <i32> [#uses=1]
+	%cmp = icmp slt i32 %tmp, %tmp1		; <i1> [#uses=1]
+	br i1 %cmp, label %forbody, label %afterfor
+
+forbody:		; preds = %forcond
+	%tmp2 = load i32* %i		; <i32> [#uses=1]
+	%tmp3 = load i64** %dst_i.addr		; <i64*> [#uses=1]
+	%arrayidx = getelementptr i64* %tmp3, i32 %tmp2		; <i64*> [#uses=1]
+	%conv = bitcast i64* %arrayidx to <8 x i8>*		; <<8 x i8>*> [#uses=1]
+	store <8 x i8>* %conv, <8 x i8>** %dst
+	%tmp4 = load i32* %i		; <i32> [#uses=1]
+	%tmp5 = load i64** %src_i.addr		; <i64*> [#uses=1]
+	%arrayidx6 = getelementptr i64* %tmp5, i32 %tmp4		; <i64*> [#uses=1]
+	%conv7 = bitcast i64* %arrayidx6 to <8 x i8>*		; <<8 x i8>*> [#uses=1]
+	store <8 x i8>* %conv7, <8 x i8>** %src
+	%tmp8 = load i32* %i		; <i32> [#uses=1]
+	%tmp9 = load <8 x i8>** %dst		; <<8 x i8>*> [#uses=1]
+	%arrayidx10 = getelementptr <8 x i8>* %tmp9, i32 %tmp8		; <<8 x i8>*> [#uses=1]
+	%tmp11 = load i32* %i		; <i32> [#uses=1]
+	%tmp12 = load <8 x i8>** %src		; <<8 x i8>*> [#uses=1]
+	%arrayidx13 = getelementptr <8 x i8>* %tmp12, i32 %tmp11		; <<8 x i8>*> [#uses=1]
+	%tmp14 = load <8 x i8>* %arrayidx13		; <<8 x i8>> [#uses=1]
+	%add = add <8 x i8> %tmp14, < i8 1, i8 1, i8 1, i8 1, i8 1, i8 1, i8 1, i8 1 >		; <<8 x i8>> [#uses=1]
+	%and = and <8 x i8> %add, < i8 4, i8 4, i8 4, i8 4, i8 4, i8 4, i8 4, i8 4 >		; <<8 x i8>> [#uses=1]
+	store <8 x i8> %and, <8 x i8>* %arrayidx10
+	br label %forinc
+
+forinc:		; preds = %forbody
+	%tmp15 = load i32* %i		; <i32> [#uses=1]
+	%inc = add i32 %tmp15, 1		; <i32> [#uses=1]
+	store i32 %inc, i32* %i
+	br label %forcond
+
+afterfor:		; preds = %forcond
+	ret void
+}
+

Added: llvm/trunk/test/CodeGen/X86/widen_arith-3.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_arith-3.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_arith-3.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_arith-3.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,54 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+; RUN: grep paddw  %t | count 1
+; RUN: grep movd %t | count 2
+; RUN: grep pextrw %t | count 1
+
+; Widen a v3i16 to v8i16 to do a vector add
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+target triple = "i686-apple-darwin10.0.0d2"
+ at .str = internal constant [4 x i8] c"%d \00"		; <[4 x i8]*> [#uses=1]
+ at .str1 = internal constant [2 x i8] c"\0A\00"		; <[2 x i8]*> [#uses=1]
+
+define void @update(<3 x i16>* %dst, <3 x i16>* %src, i32 %n) nounwind {
+entry:
+	%dst.addr = alloca <3 x i16>*		; <<3 x i16>**> [#uses=2]
+	%src.addr = alloca <3 x i16>*		; <<3 x i16>**> [#uses=2]
+	%n.addr = alloca i32		; <i32*> [#uses=2]
+	%v = alloca <3 x i16>, align 8		; <<3 x i16>*> [#uses=1]
+	%i = alloca i32, align 4		; <i32*> [#uses=6]
+	store <3 x i16>* %dst, <3 x i16>** %dst.addr
+	store <3 x i16>* %src, <3 x i16>** %src.addr
+	store i32 %n, i32* %n.addr
+	store <3 x i16> < i16 1, i16 1, i16 1 >, <3 x i16>* %v
+	store i32 0, i32* %i
+	br label %forcond
+
+forcond:		; preds = %forinc, %entry
+	%tmp = load i32* %i		; <i32> [#uses=1]
+	%tmp1 = load i32* %n.addr		; <i32> [#uses=1]
+	%cmp = icmp slt i32 %tmp, %tmp1		; <i1> [#uses=1]
+	br i1 %cmp, label %forbody, label %afterfor
+
+forbody:		; preds = %forcond
+	%tmp2 = load i32* %i		; <i32> [#uses=1]
+	%tmp3 = load <3 x i16>** %dst.addr		; <<3 x i16>*> [#uses=1]
+	%arrayidx = getelementptr <3 x i16>* %tmp3, i32 %tmp2		; <<3 x i16>*> [#uses=1]
+	%tmp4 = load i32* %i		; <i32> [#uses=1]
+	%tmp5 = load <3 x i16>** %src.addr		; <<3 x i16>*> [#uses=1]
+	%arrayidx6 = getelementptr <3 x i16>* %tmp5, i32 %tmp4		; <<3 x i16>*> [#uses=1]
+	%tmp7 = load <3 x i16>* %arrayidx6		; <<3 x i16>> [#uses=1]
+	%add = add <3 x i16> %tmp7, < i16 1, i16 1, i16 1 >		; <<3 x i16>> [#uses=1]
+	store <3 x i16> %add, <3 x i16>* %arrayidx
+	br label %forinc
+
+forinc:		; preds = %forbody
+	%tmp8 = load i32* %i		; <i32> [#uses=1]
+	%inc = add i32 %tmp8, 1		; <i32> [#uses=1]
+	store i32 %inc, i32* %i
+	br label %forcond
+
+afterfor:		; preds = %forcond
+	ret void
+}
+

Added: llvm/trunk/test/CodeGen/X86/widen_arith-4.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_arith-4.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_arith-4.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_arith-4.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,51 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+; RUN: grep psubw  %t | count 1
+; RUN: grep pmullw %t | count 1
+
+; Widen a v5i16 to v8i16 to do a vector sub and multiple
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+
+define void @update(<5 x i16>* %dst, <5 x i16>* %src, i32 %n) nounwind {
+entry:
+	%dst.addr = alloca <5 x i16>*		; <<5 x i16>**> [#uses=2]
+	%src.addr = alloca <5 x i16>*		; <<5 x i16>**> [#uses=2]
+	%n.addr = alloca i32		; <i32*> [#uses=2]
+	%v = alloca <5 x i16>, align 16		; <<5 x i16>*> [#uses=1]
+	%i = alloca i32, align 4		; <i32*> [#uses=6]
+	store <5 x i16>* %dst, <5 x i16>** %dst.addr
+	store <5 x i16>* %src, <5 x i16>** %src.addr
+	store i32 %n, i32* %n.addr
+	store <5 x i16> < i16 1, i16 1, i16 1, i16 0, i16 0 >, <5 x i16>* %v
+	store i32 0, i32* %i
+	br label %forcond
+
+forcond:		; preds = %forinc, %entry
+	%tmp = load i32* %i		; <i32> [#uses=1]
+	%tmp1 = load i32* %n.addr		; <i32> [#uses=1]
+	%cmp = icmp slt i32 %tmp, %tmp1		; <i1> [#uses=1]
+	br i1 %cmp, label %forbody, label %afterfor
+
+forbody:		; preds = %forcond
+	%tmp2 = load i32* %i		; <i32> [#uses=1]
+	%tmp3 = load <5 x i16>** %dst.addr		; <<5 x i16>*> [#uses=1]
+	%arrayidx = getelementptr <5 x i16>* %tmp3, i32 %tmp2		; <<5 x i16>*> [#uses=1]
+	%tmp4 = load i32* %i		; <i32> [#uses=1]
+	%tmp5 = load <5 x i16>** %src.addr		; <<5 x i16>*> [#uses=1]
+	%arrayidx6 = getelementptr <5 x i16>* %tmp5, i32 %tmp4		; <<5 x i16>*> [#uses=1]
+	%tmp7 = load <5 x i16>* %arrayidx6		; <<5 x i16>> [#uses=1]
+	%sub = sub <5 x i16> %tmp7, < i16 271, i16 271, i16 271, i16 271, i16 271 >		; <<5 x i16>> [#uses=1]
+	%mul = mul <5 x i16> %sub, < i16 2, i16 2, i16 2, i16 2, i16 2 >		; <<5 x i16>> [#uses=1]
+	store <5 x i16> %mul, <5 x i16>* %arrayidx
+	br label %forinc
+
+forinc:		; preds = %forbody
+	%tmp8 = load i32* %i		; <i32> [#uses=1]
+	%inc = add i32 %tmp8, 1		; <i32> [#uses=1]
+	store i32 %inc, i32* %i
+	br label %forcond
+
+afterfor:		; preds = %forcond
+	ret void
+}
+

Added: llvm/trunk/test/CodeGen/X86/widen_arith-5.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_arith-5.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_arith-5.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_arith-5.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,51 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+; RUN: grep pmulld  %t | count 1
+; RUN: grep psubd  %t | count 1
+; RUN: grep movaps %t | count 1
+
+; widen a v3i32 to v4i32 to do a vector multiple and a subtraction
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+
+define void @update(<3 x i32>* %dst, <3 x i32>* %src, i32 %n) nounwind {
+entry:
+	%dst.addr = alloca <3 x i32>*		; <<3 x i32>**> [#uses=2]
+	%src.addr = alloca <3 x i32>*		; <<3 x i32>**> [#uses=2]
+	%n.addr = alloca i32		; <i32*> [#uses=2]
+	%v = alloca <3 x i32>, align 16		; <<3 x i32>*> [#uses=1]
+	%i = alloca i32, align 4		; <i32*> [#uses=6]
+	store <3 x i32>* %dst, <3 x i32>** %dst.addr
+	store <3 x i32>* %src, <3 x i32>** %src.addr
+	store i32 %n, i32* %n.addr
+	store <3 x i32> < i32 1, i32 1, i32 1 >, <3 x i32>* %v
+	store i32 0, i32* %i
+	br label %forcond
+
+forcond:		; preds = %forinc, %entry
+	%tmp = load i32* %i		; <i32> [#uses=1]
+	%tmp1 = load i32* %n.addr		; <i32> [#uses=1]
+	%cmp = icmp slt i32 %tmp, %tmp1		; <i1> [#uses=1]
+	br i1 %cmp, label %forbody, label %afterfor
+
+forbody:		; preds = %forcond
+	%tmp2 = load i32* %i		; <i32> [#uses=1]
+	%tmp3 = load <3 x i32>** %dst.addr		; <<3 x i32>*> [#uses=1]
+	%arrayidx = getelementptr <3 x i32>* %tmp3, i32 %tmp2		; <<3 x i32>*> [#uses=1]
+	%tmp4 = load i32* %i		; <i32> [#uses=1]
+	%tmp5 = load <3 x i32>** %src.addr		; <<3 x i32>*> [#uses=1]
+	%arrayidx6 = getelementptr <3 x i32>* %tmp5, i32 %tmp4		; <<3 x i32>*> [#uses=1]
+	%tmp7 = load <3 x i32>* %arrayidx6		; <<3 x i32>> [#uses=1]
+	%mul = mul <3 x i32> %tmp7, < i32 4, i32 4, i32 4 >		; <<3 x i32>> [#uses=1]
+	%sub = sub <3 x i32> %mul, < i32 3, i32 3, i32 3 >		; <<3 x i32>> [#uses=1]
+	store <3 x i32> %sub, <3 x i32>* %arrayidx
+	br label %forinc
+
+forinc:		; preds = %forbody
+	%tmp8 = load i32* %i		; <i32> [#uses=1]
+	%inc = add i32 %tmp8, 1		; <i32> [#uses=1]
+	store i32 %inc, i32* %i
+	br label %forcond
+
+afterfor:		; preds = %forcond
+	ret void
+}
+

Added: llvm/trunk/test/CodeGen/X86/widen_arith-6.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_arith-6.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_arith-6.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_arith-6.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,50 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+; RUN: grep mulps  %t | count 1
+; RUN: grep addps  %t | count 1
+
+; widen a v3f32 to vfi32 to do a vector multiple and an add
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+
+define void @update(<3 x float>* %dst, <3 x float>* %src, i32 %n) nounwind {
+entry:
+	%dst.addr = alloca <3 x float>*		; <<3 x float>**> [#uses=2]
+	%src.addr = alloca <3 x float>*		; <<3 x float>**> [#uses=2]
+	%n.addr = alloca i32		; <i32*> [#uses=2]
+	%v = alloca <3 x float>, align 16		; <<3 x float>*> [#uses=2]
+	%i = alloca i32, align 4		; <i32*> [#uses=6]
+	store <3 x float>* %dst, <3 x float>** %dst.addr
+	store <3 x float>* %src, <3 x float>** %src.addr
+	store i32 %n, i32* %n.addr
+	store <3 x float> < float 1.000000e+00, float 2.000000e+00, float 3.000000e+00 >, <3 x float>* %v
+	store i32 0, i32* %i
+	br label %forcond
+
+forcond:		; preds = %forinc, %entry
+	%tmp = load i32* %i		; <i32> [#uses=1]
+	%tmp1 = load i32* %n.addr		; <i32> [#uses=1]
+	%cmp = icmp slt i32 %tmp, %tmp1		; <i1> [#uses=1]
+	br i1 %cmp, label %forbody, label %afterfor
+
+forbody:		; preds = %forcond
+	%tmp2 = load i32* %i		; <i32> [#uses=1]
+	%tmp3 = load <3 x float>** %dst.addr		; <<3 x float>*> [#uses=1]
+	%arrayidx = getelementptr <3 x float>* %tmp3, i32 %tmp2		; <<3 x float>*> [#uses=1]
+	%tmp4 = load i32* %i		; <i32> [#uses=1]
+	%tmp5 = load <3 x float>** %src.addr		; <<3 x float>*> [#uses=1]
+	%arrayidx6 = getelementptr <3 x float>* %tmp5, i32 %tmp4		; <<3 x float>*> [#uses=1]
+	%tmp7 = load <3 x float>* %arrayidx6		; <<3 x float>> [#uses=1]
+	%tmp8 = load <3 x float>* %v		; <<3 x float>> [#uses=1]
+	%mul = mul <3 x float> %tmp7, %tmp8		; <<3 x float>> [#uses=1]
+	%add = add <3 x float> %mul, < float 0x409EE02900000000, float 0x409EE02900000000, float 0x409EE02900000000 >		; <<3 x float>> [#uses=1]
+	store <3 x float> %add, <3 x float>* %arrayidx
+	br label %forinc
+
+forinc:		; preds = %forbody
+	%tmp9 = load i32* %i		; <i32> [#uses=1]
+	%inc = add i32 %tmp9, 1		; <i32> [#uses=1]
+	store i32 %inc, i32* %i
+	br label %forcond
+
+afterfor:		; preds = %forcond
+	ret void
+}

Added: llvm/trunk/test/CodeGen/X86/widen_cast-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_cast-1.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_cast-1.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_cast-1.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,44 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+; RUN: grep paddw  %t | count 1
+; RUN: grep movd  %t | count 1
+; RUN: grep pextrd  %t | count 1
+
+; bitcast a v4i16 to v2i32
+
+define void @convert(<2 x i32>* %dst, <4 x i16>* %src) nounwind {
+entry:
+	%dst.addr = alloca <2 x i32>*		; <<2 x i32>**> [#uses=2]
+	%src.addr = alloca <4 x i16>*		; <<4 x i16>**> [#uses=2]
+	%i = alloca i32, align 4		; <i32*> [#uses=6]
+	store <2 x i32>* %dst, <2 x i32>** %dst.addr
+	store <4 x i16>* %src, <4 x i16>** %src.addr
+	store i32 0, i32* %i
+	br label %forcond
+
+forcond:		; preds = %forinc, %entry
+	%tmp = load i32* %i		; <i32> [#uses=1]
+	%cmp = icmp slt i32 %tmp, 4		; <i1> [#uses=1]
+	br i1 %cmp, label %forbody, label %afterfor
+
+forbody:		; preds = %forcond
+	%tmp1 = load i32* %i		; <i32> [#uses=1]
+	%tmp2 = load <2 x i32>** %dst.addr		; <<2 x i32>*> [#uses=1]
+	%arrayidx = getelementptr <2 x i32>* %tmp2, i32 %tmp1		; <<2 x i32>*> [#uses=1]
+	%tmp3 = load i32* %i		; <i32> [#uses=1]
+	%tmp4 = load <4 x i16>** %src.addr		; <<4 x i16>*> [#uses=1]
+	%arrayidx5 = getelementptr <4 x i16>* %tmp4, i32 %tmp3		; <<4 x i16>*> [#uses=1]
+	%tmp6 = load <4 x i16>* %arrayidx5		; <<4 x i16>> [#uses=1]
+	%add = add <4 x i16> %tmp6, < i16 1, i16 1, i16 1, i16 1 >		; <<4 x i16>> [#uses=1]
+	%conv = bitcast <4 x i16> %add to <2 x i32>		; <<2 x i32>> [#uses=1]
+	store <2 x i32> %conv, <2 x i32>* %arrayidx
+	br label %forinc
+
+forinc:		; preds = %forbody
+	%tmp7 = load i32* %i		; <i32> [#uses=1]
+	%inc = add i32 %tmp7, 1		; <i32> [#uses=1]
+	store i32 %inc, i32* %i
+	br label %forcond
+
+afterfor:		; preds = %forcond
+	ret void
+}

Added: llvm/trunk/test/CodeGen/X86/widen_cast-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_cast-2.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_cast-2.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_cast-2.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,43 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+; RUN: grep pextrd  %t | count 5
+; RUN: grep movd  %t | count 3
+
+; bitcast v14i16 to v7i32
+
+define void @convert(<7 x i32>* %dst, <14 x i16>* %src) nounwind {
+entry:
+	%dst.addr = alloca <7 x i32>*		; <<7 x i32>**> [#uses=2]
+	%src.addr = alloca <14 x i16>*		; <<14 x i16>**> [#uses=2]
+	%i = alloca i32, align 4		; <i32*> [#uses=6]
+	store <7 x i32>* %dst, <7 x i32>** %dst.addr
+	store <14 x i16>* %src, <14 x i16>** %src.addr
+	store i32 0, i32* %i
+	br label %forcond
+
+forcond:		; preds = %forinc, %entry
+	%tmp = load i32* %i		; <i32> [#uses=1]
+	%cmp = icmp slt i32 %tmp, 4		; <i1> [#uses=1]
+	br i1 %cmp, label %forbody, label %afterfor
+
+forbody:		; preds = %forcond
+	%tmp1 = load i32* %i		; <i32> [#uses=1]
+	%tmp2 = load <7 x i32>** %dst.addr		; <<2 x i32>*> [#uses=1]
+	%arrayidx = getelementptr <7 x i32>* %tmp2, i32 %tmp1		; <<7 x i32>*> [#uses=1]
+	%tmp3 = load i32* %i		; <i32> [#uses=1]
+	%tmp4 = load <14 x i16>** %src.addr		; <<4 x i16>*> [#uses=1]
+	%arrayidx5 = getelementptr <14 x i16>* %tmp4, i32 %tmp3		; <<4 x i16>*> [#uses=1]
+	%tmp6 = load <14 x i16>* %arrayidx5		; <<4 x i16>> [#uses=1]
+	%add = add <14 x i16> %tmp6, < i16 1, i16 1, i16 1, i16 1, i16 1, i16 1, i16 1, i16 1, i16 1, i16 1, i16 1, i16 1, i16 1, i16 1 >		; <<4 x i16>> [#uses=1]
+	%conv = bitcast <14 x i16> %add to <7 x i32>		; <<7 x i32>> [#uses=1]
+	store <7 x i32> %conv, <7 x i32>* %arrayidx
+	br label %forinc
+
+forinc:		; preds = %forbody
+	%tmp7 = load i32* %i		; <i32> [#uses=1]
+	%inc = add i32 %tmp7, 1		; <i32> [#uses=1]
+	store i32 %inc, i32* %i
+	br label %forcond
+
+afterfor:		; preds = %forcond
+	ret void
+}

Added: llvm/trunk/test/CodeGen/X86/widen_cast-3.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_cast-3.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_cast-3.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_cast-3.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,16 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+; RUN: grep paddd  %t | count 1
+; RUN: grep pextrd %t | count 2
+
+; bitcast v12i8 to v3i32
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"
+target triple = "i686-apple-darwin10.0.0d2"
+
+define void @convert(<12 x i8>* %dst.addr, <3 x i32> %src) nounwind {
+entry:
+	%add = add <3 x i32> %src, < i32 1, i32 1, i32 1 >		; <<3 x i32>> [#uses=1]
+	%conv = bitcast <3 x i32> %add to <12 x i8>		; <<12 x i8>> [#uses=1]
+	store <12 x i8> %conv, <12 x i8>* %dst.addr
+	ret void
+}

Added: llvm/trunk/test/CodeGen/X86/widen_cast-4.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_cast-4.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_cast-4.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_cast-4.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,60 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+; RUN: grep sarb  %t | count 16
+
+; v8i8 that is widen to v16i8 then split
+; FIXME: This is widen to v16i8 and split to 16 and we then rebuild the vector.
+; Unfortunately, we don't split the store so we don't get the code we want.
+
+define void @update(i64* %dst_i, i64* %src_i, i32 %n) nounwind {
+entry:
+	%dst_i.addr = alloca i64*		; <i64**> [#uses=2]
+	%src_i.addr = alloca i64*		; <i64**> [#uses=2]
+	%n.addr = alloca i32		; <i32*> [#uses=2]
+	%i = alloca i32, align 4		; <i32*> [#uses=8]
+	%dst = alloca <8 x i8>*, align 4		; <<8 x i8>**> [#uses=2]
+	%src = alloca <8 x i8>*, align 4		; <<8 x i8>**> [#uses=2]
+	store i64* %dst_i, i64** %dst_i.addr
+	store i64* %src_i, i64** %src_i.addr
+	store i32 %n, i32* %n.addr
+	store i32 0, i32* %i
+	br label %forcond
+
+forcond:		; preds = %forinc, %entry
+	%tmp = load i32* %i		; <i32> [#uses=1]
+	%tmp1 = load i32* %n.addr		; <i32> [#uses=1]
+	%cmp = icmp slt i32 %tmp, %tmp1		; <i1> [#uses=1]
+	br i1 %cmp, label %forbody, label %afterfor
+
+forbody:		; preds = %forcond
+	%tmp2 = load i32* %i		; <i32> [#uses=1]
+	%tmp3 = load i64** %dst_i.addr		; <i64*> [#uses=1]
+	%arrayidx = getelementptr i64* %tmp3, i32 %tmp2		; <i64*> [#uses=1]
+	%conv = bitcast i64* %arrayidx to <8 x i8>*		; <<8 x i8>*> [#uses=1]
+	store <8 x i8>* %conv, <8 x i8>** %dst
+	%tmp4 = load i32* %i		; <i32> [#uses=1]
+	%tmp5 = load i64** %src_i.addr		; <i64*> [#uses=1]
+	%arrayidx6 = getelementptr i64* %tmp5, i32 %tmp4		; <i64*> [#uses=1]
+	%conv7 = bitcast i64* %arrayidx6 to <8 x i8>*		; <<8 x i8>*> [#uses=1]
+	store <8 x i8>* %conv7, <8 x i8>** %src
+	%tmp8 = load i32* %i		; <i32> [#uses=1]
+	%tmp9 = load <8 x i8>** %dst		; <<8 x i8>*> [#uses=1]
+	%arrayidx10 = getelementptr <8 x i8>* %tmp9, i32 %tmp8		; <<8 x i8>*> [#uses=1]
+	%tmp11 = load i32* %i		; <i32> [#uses=1]
+	%tmp12 = load <8 x i8>** %src		; <<8 x i8>*> [#uses=1]
+	%arrayidx13 = getelementptr <8 x i8>* %tmp12, i32 %tmp11		; <<8 x i8>*> [#uses=1]
+	%tmp14 = load <8 x i8>* %arrayidx13		; <<8 x i8>> [#uses=1]
+	%add = add <8 x i8> %tmp14, < i8 1, i8 1, i8 1, i8 1, i8 1, i8 1, i8 1, i8 1 >		; <<8 x i8>> [#uses=1]
+	%shr = ashr <8 x i8> %add, < i8 2, i8 2, i8 2, i8 2, i8 2, i8 2, i8 2, i8 2 >		; <<8 x i8>> [#uses=1]
+	store <8 x i8> %shr, <8 x i8>* %arrayidx10
+	br label %forinc
+
+forinc:		; preds = %forbody
+	%tmp15 = load i32* %i		; <i32> [#uses=1]
+	%inc = add i32 %tmp15, 1		; <i32> [#uses=1]
+	store i32 %inc, i32* %i
+	br label %forcond
+
+afterfor:		; preds = %forcond
+	ret void
+}
+

Added: llvm/trunk/test/CodeGen/X86/widen_cast-5.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_cast-5.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_cast-5.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_cast-5.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,11 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+
+; bitcast a i64 to v2i32
+
+define void @convert(<2 x i32>* %dst.addr, i64 %src) nounwind {
+entry:
+	%conv = bitcast i64 %src to <2 x i32>
+	%xor = xor <2 x i32> %conv, < i32 255, i32 32767 >
+	store <2 x i32> %xor, <2 x i32>* %dst.addr
+	ret void
+}

Added: llvm/trunk/test/CodeGen/X86/widen_conv-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_conv-1.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_conv-1.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_conv-1.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,13 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+; RUN: grep pshufd %t | count 1
+; RUN: grep paddd  %t | count 1
+
+; truncate v2i64 to v2i32
+
+define void @convert(<2 x i32>* %dst.addr, <2 x i64> %src) nounwind {
+entry:
+	%val = trunc <2 x i64> %src to <2 x i32>
+	%add = add <2 x i32> %val, < i32 1, i32 1 >
+	store <2 x i32> %add, <2 x i32>* %dst.addr
+	ret void
+}

Added: llvm/trunk/test/CodeGen/X86/widen_conv-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_conv-2.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_conv-2.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_conv-2.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,10 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+
+; sign extension v2i32 to v2i16
+
+define void @convert(<2 x i32>* %dst.addr, <2 x i16> %src) nounwind {
+entry:
+	%signext = sext <2 x i16> %src to <2 x i32>		; <<12 x i8>> [#uses=1]
+	store <2 x i32> %signext, <2 x i32>* %dst.addr
+	ret void
+}

Added: llvm/trunk/test/CodeGen/X86/widen_conv-3.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_conv-3.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_conv-3.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_conv-3.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,10 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+; grep cvtsi2ss  %t | count 1 
+; sign to float v2i16 to v2f32
+
+define void @convert(<2 x float>* %dst.addr, <2 x i16> %src) nounwind {
+entry:
+	%val = sitofp <2 x i16> %src to <2 x float>
+	store <2 x float> %val, <2 x float>* %dst.addr
+	ret void
+}

Added: llvm/trunk/test/CodeGen/X86/widen_conv-4.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_conv-4.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_conv-4.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_conv-4.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,10 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+
+; unsigned to float v7i16 to v7f32
+
+define void @convert(<7 x float>* %dst.addr, <7 x i16> %src) nounwind {
+entry:
+	%val = sitofp <7 x i16> %src to <7 x float>
+	store <7 x float> %val, <7 x float>* %dst.addr
+	ret void
+}

Added: llvm/trunk/test/CodeGen/X86/widen_select-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_select-1.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_select-1.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_select-1.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,11 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+
+; widening select v6i32 and then a sub
+
+define void @select(i1 %c, <6 x i32>* %dst.addr, <6 x i32> %src1,<6 x i32> %src2) nounwind {
+entry:
+	%x = select i1 %c, <6 x i32> %src1, <6 x i32> %src2
+	%val = sub <6 x i32> %x, < i32 1, i32 1, i32 1, i32 1, i32 1, i32 1 >;
+	store <6 x i32> %val, <6 x i32>* %dst.addr
+	ret void
+}

Added: llvm/trunk/test/CodeGen/X86/widen_shuffle-1.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_shuffle-1.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_shuffle-1.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_shuffle-1.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,11 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+
+; widening shuffle v3float and then a add
+
+define void @shuf(<3 x float>* %dst.addr, <3 x float> %src1,<3 x float> %src2) nounwind {
+entry:
+	%x = shufflevector <3 x float> %src1, <3 x float> %src2, <3 x i32> < i32 0, i32 1, i32 2>
+	%val = add <3 x float> %x, %src2;
+	store <3 x float> %val, <3 x float>* %dst.addr
+	ret void
+}

Added: llvm/trunk/test/CodeGen/X86/widen_shuffle-2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/widen_shuffle-2.ll?rev=61210&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/widen_shuffle-2.ll (added)
+++ llvm/trunk/test/CodeGen/X86/widen_shuffle-2.ll Thu Dec 18 14:05:58 2008
@@ -0,0 +1,11 @@
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse42 -disable-mmx -o %t -f
+
+; widening shuffle v3float and then a add
+
+define void @shuf(<3 x float>* %dst.addr, <3 x float> %src1,<3 x float> %src2) nounwind {
+entry:
+	%x = shufflevector <3 x float> %src1, <3 x float> %src2, <3 x i32> < i32 0, i32 4, i32 2>
+	%val = add <3 x float> %x, %src2;
+	store <3 x float> %val, <3 x float>* %dst.addr
+	ret void
+}




From viridia at gmail.com  Thu Dec 18 15:10:43 2008
From: viridia at gmail.com (Talin)
Date: Thu, 18 Dec 2008 13:10:43 -0800
Subject: [llvm-commits] Patch: Adding unit tests to LLVM
Message-ID: <d1b71f830812181310i301f9304t940d28063294f57a@mail.gmail.com>

This patch adds a unit test framework to LLVM, along with a sample unit test
for DenseMap. I don't expect this patch to be accepted as-is, this is mainly
a trial balloon and proof of concept.
Some notes about the patch:

1) For the testing framework, I went with Google Test, since it's the one I
have the most experience with. I fully expect an extended bikeshed
discussion to result from this.

2) Both the test framework and the tests are optional build targets, they
will not be built with the normal "make all". To build and run the unit
tests, use "make check-unit".

3) I did not actually include the testing framework in the patch; It will
need to be checked in separately. There are two approaches to this. One
approach is to use the svn:external feature to create a link to the
googletest svn repository from the LLVM svn repository. The other approach
is to take a snapshot of googletest and check it in to the LLVM repository.

The GoogleTest tar archive is here:
http://code.google.com/p/googletest/downloads/list. I've located it within
the LLVM source tree in the location "third-party/googletest".

4) I've included makefiles for building the test framework and unit tests. I
had to do a bit of makefile hacking to get this to work, suggestions on how
to improve this are welcome.

-- 
-- Talin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081218/c3f97d8e/attachment.html 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: unittest.patch
Type: application/octet-stream
Size: 7598 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081218/c3f97d8e/attachment.obj 

From wangmp at apple.com  Thu Dec 18 15:42:24 2008
From: wangmp at apple.com (Mon P Wang)
Date: Thu, 18 Dec 2008 21:42:24 -0000
Subject: [llvm-commits] [llvm] r61211 - in /llvm/trunk/lib/Target/X86:
 X86ISelLowering.cpp X86ISelLowering.h X86InstrInfo.cpp X86InstrSSE.td
Message-ID: <200812182142.mBILgPex011799@zion.cs.uiuc.edu>

Author: wangmp
Date: Thu Dec 18 15:42:19 2008
New Revision: 61211

URL: http://llvm.org/viewvc/llvm-project?rev=61211&view=rev
Log:
Fixed x86 code generation of multiple for v2i64.  It was incorrect for SSE4.1.

Modified:
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
    llvm/trunk/lib/Target/X86/X86ISelLowering.h
    llvm/trunk/lib/Target/X86/X86InstrInfo.cpp
    llvm/trunk/lib/Target/X86/X86InstrSSE.td

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=61211&r1=61210&r2=61211&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Thu Dec 18 15:42:19 2008
@@ -687,6 +687,7 @@
     setOperationAction(ISD::ADD,                MVT::v8i16, Legal);
     setOperationAction(ISD::ADD,                MVT::v4i32, Legal);
     setOperationAction(ISD::ADD,                MVT::v2i64, Legal);
+    setOperationAction(ISD::MUL,                MVT::v2i64, Custom);
     setOperationAction(ISD::SUB,                MVT::v16i8, Legal);
     setOperationAction(ISD::SUB,                MVT::v8i16, Legal);
     setOperationAction(ISD::SUB,                MVT::v4i32, Legal);
@@ -758,7 +759,6 @@
   if (Subtarget->hasSSE41()) {
     // FIXME: Do we need to handle scalar-to-vector here?
     setOperationAction(ISD::MUL,                MVT::v4i32, Legal);
-    setOperationAction(ISD::MUL,                MVT::v2i64, Legal);
 
     // i8 and i16 vectors are custom , because the source register and source
     // source memory operand types are not the same width.  f32 vectors are
@@ -6136,6 +6136,50 @@
   return Op;
 }
 
+SDValue X86TargetLowering::LowerMUL_V2I64(SDValue Op, SelectionDAG &DAG) {
+  MVT VT = Op.getValueType();
+  assert(VT == MVT::v2i64 && "Only know how to lower V2I64 multiply");
+  
+  //  ulong2 Ahi = __builtin_ia32_psrlqi128( a, 32);
+  //  ulong2 Bhi = __builtin_ia32_psrlqi128( b, 32);
+  //  ulong2 AloBlo = __builtin_ia32_pmuludq128( a, b );
+  //  ulong2 AloBhi = __builtin_ia32_pmuludq128( a, Bhi );
+  //  ulong2 AhiBlo = __builtin_ia32_pmuludq128( Ahi, b );
+  //
+  //  AloBhi = __builtin_ia32_psllqi128( AloBhi, 32 );
+  //  AhiBlo = __builtin_ia32_psllqi128( AhiBlo, 32 );
+  //  return AloBlo + AloBhi + AhiBlo;
+
+  SDValue A = Op.getOperand(0);
+  SDValue B = Op.getOperand(1);
+  
+  SDValue Ahi = DAG.getNode(ISD::INTRINSIC_WO_CHAIN, VT,
+                       DAG.getConstant(Intrinsic::x86_sse2_psrli_q, MVT::i32),
+                       A, DAG.getConstant(32, MVT::i32));
+  SDValue Bhi = DAG.getNode(ISD::INTRINSIC_WO_CHAIN, VT,
+                       DAG.getConstant(Intrinsic::x86_sse2_psrli_q, MVT::i32),
+                       B, DAG.getConstant(32, MVT::i32));
+  SDValue AloBlo = DAG.getNode(ISD::INTRINSIC_WO_CHAIN, VT,
+                       DAG.getConstant(Intrinsic::x86_sse2_pmulu_dq, MVT::i32),
+                       A, B);
+  SDValue AloBhi = DAG.getNode(ISD::INTRINSIC_WO_CHAIN, VT,
+                       DAG.getConstant(Intrinsic::x86_sse2_pmulu_dq, MVT::i32),
+                       A, Bhi);
+  SDValue AhiBlo = DAG.getNode(ISD::INTRINSIC_WO_CHAIN, VT,
+                       DAG.getConstant(Intrinsic::x86_sse2_pmulu_dq, MVT::i32),
+                       Ahi, B);
+  AloBhi = DAG.getNode(ISD::INTRINSIC_WO_CHAIN, VT,
+                       DAG.getConstant(Intrinsic::x86_sse2_pslli_q, MVT::i32),
+                       AloBhi, DAG.getConstant(32, MVT::i32));
+  AhiBlo = DAG.getNode(ISD::INTRINSIC_WO_CHAIN, VT,
+                       DAG.getConstant(Intrinsic::x86_sse2_pslli_q, MVT::i32),
+                       AhiBlo, DAG.getConstant(32, MVT::i32));
+  SDValue Res = DAG.getNode(ISD::ADD, VT, AloBlo, AloBhi);
+  Res = DAG.getNode(ISD::ADD, VT, Res, AhiBlo);
+  return Res;
+}
+
+
 SDValue X86TargetLowering::LowerXALUO(SDValue Op, SelectionDAG &DAG) {
   // Lower the "add/sub/mul with overflow" instruction into a regular ins plus
   // a "setcc" instruction that checks the overflow flag. The "brcond" lowering
@@ -6305,6 +6349,7 @@
   case ISD::FLT_ROUNDS_:        return LowerFLT_ROUNDS_(Op, DAG);
   case ISD::CTLZ:               return LowerCTLZ(Op, DAG);
   case ISD::CTTZ:               return LowerCTTZ(Op, DAG);
+  case ISD::MUL:                return LowerMUL_V2I64(Op, DAG);
   case ISD::SADDO:
   case ISD::UADDO:
   case ISD::SSUBO:

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.h?rev=61211&r1=61210&r2=61211&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.h (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.h Thu Dec 18 15:42:19 2008
@@ -597,6 +597,7 @@
     SDValue LowerFLT_ROUNDS_(SDValue Op, SelectionDAG &DAG);
     SDValue LowerCTLZ(SDValue Op, SelectionDAG &DAG);
     SDValue LowerCTTZ(SDValue Op, SelectionDAG &DAG);
+    SDValue LowerMUL_V2I64(SDValue Op, SelectionDAG &DAG);
     SDValue LowerXALUO(SDValue Op, SelectionDAG &DAG);
 
     SDValue LowerCMP_SWAP(SDValue Op, SelectionDAG &DAG);

Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.cpp?rev=61211&r1=61210&r2=61211&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86InstrInfo.cpp Thu Dec 18 15:42:19 2008
@@ -581,7 +581,6 @@
     { X86::PMINSWrr,        X86::PMINSWrm },
     { X86::PMINUBrr,        X86::PMINUBrm },
     { X86::PMULDQrr,        X86::PMULDQrm },
-    { X86::PMULDQrr_int,    X86::PMULDQrm_int },
     { X86::PMULHUWrr,       X86::PMULHUWrm },
     { X86::PMULHWrr,        X86::PMULHWrm },
     { X86::PMULLDrr,        X86::PMULLDrm },

Modified: llvm/trunk/lib/Target/X86/X86InstrSSE.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrSSE.td?rev=61211&r1=61210&r2=61211&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrSSE.td (original)
+++ llvm/trunk/lib/Target/X86/X86InstrSSE.td Thu Dec 18 15:42:19 2008
@@ -3313,12 +3313,13 @@
 defm PMAXUW       : SS41I_binop_rm_int<0x3E, "pmaxuw",
                                        int_x86_sse41_pmaxuw, 1>;
 
+defm PMULDQ       : SS41I_binop_rm_int<0x28, "pmuldq", int_x86_sse41_pmuldq, 1>;
+
 def : Pat<(v2i64 (X86pcmpeqq VR128:$src1, VR128:$src2)),
           (PCMPEQQrr VR128:$src1, VR128:$src2)>;
 def : Pat<(v2i64 (X86pcmpeqq VR128:$src1, (memop addr:$src2))),
           (PCMPEQQrm VR128:$src1, addr:$src2)>;
 
-
 /// SS41I_binop_rm_int - Simple SSE 4.1 binary operator
 let Constraints = "$src1 = $dst" in {
   multiclass SS41I_binop_patint<bits<8> opc, string OpcodeStr, ValueType OpVT,
@@ -3353,9 +3354,6 @@
 }
 defm PMULLD       : SS41I_binop_patint<0x40, "pmulld", v4i32, mul,
                                        int_x86_sse41_pmulld, 1>;
-defm PMULDQ       : SS41I_binop_patint<0x28, "pmuldq", v2i64, mul,
-                                       int_x86_sse41_pmuldq, 1>;
-
 
 /// SS41I_binop_rmi_int - SSE 4.1 binary operator with 8-bit immediate
 let Constraints = "$src1 = $dst" in {




From gohman at apple.com  Thu Dec 18 15:51:32 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 18 Dec 2008 21:51:32 -0000
Subject: [llvm-commits] [llvm] r61213 -
	/llvm/trunk/lib/CodeGen/MachineInstr.cpp
Message-ID: <200812182151.mBILpYEF012113@zion.cs.uiuc.edu>

Author: djg
Date: Thu Dec 18 15:51:27 2008
New Revision: 61213

URL: http://llvm.org/viewvc/llvm-project?rev=61213&view=rev
Log:
Print subreg information in MachineInstr::dump.

Modified:
    llvm/trunk/lib/CodeGen/MachineInstr.cpp

Modified: llvm/trunk/lib/CodeGen/MachineInstr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineInstr.cpp?rev=61213&r1=61212&r2=61213&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/MachineInstr.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineInstr.cpp Thu Dec 18 15:51:27 2008
@@ -187,7 +187,11 @@
       else
         OS << "%mreg" << getReg();
     }
-      
+
+    if (getSubReg() != 0) {
+      OS << ":" << getSubReg();
+    }
+
     if (isDef() || isKill() || isDead() || isImplicit() || isEarlyClobber()) {
       OS << "<";
       bool NeedComma = false;




From gohman at apple.com  Thu Dec 18 16:01:54 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 18 Dec 2008 22:01:54 -0000
Subject: [llvm-commits] [llvm] r61214 -
	/llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp
Message-ID: <200812182201.mBIM1scR012503@zion.cs.uiuc.edu>

Author: djg
Date: Thu Dec 18 16:01:52 2008
New Revision: 61214

URL: http://llvm.org/viewvc/llvm-project?rev=61214&view=rev
Log:
When setting up the frame pointer, add it as a live-in register to all
non-entry blocks, so that it doesn't appear use-before-def anywhere.

Modified:
    llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp

Modified: llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp?rev=61214&r1=61213&r2=61214&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp Thu Dec 18 16:01:52 2008
@@ -745,6 +745,11 @@
     BuildMI(MBB, MBBI, TII.get(Is64Bit ? X86::MOV64rr : X86::MOV32rr), FramePtr)
       .addReg(StackPtr);
 
+    // Mark the FramePtr as live-in in every block except the entry.
+    for (MachineFunction::iterator I = next(MF.begin()), E = MF.end();
+         I != E; ++I)
+      I->addLiveIn(FramePtr);
+
     // Realign stack
     if (needsStackRealignment(MF))
       BuildMI(MBB, MBBI,




From gohman at apple.com  Thu Dec 18 16:03:48 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 18 Dec 2008 22:03:48 -0000
Subject: [llvm-commits] [llvm] r61215 -
	/llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp
Message-ID: <200812182203.mBIM3naK012588@zion.cs.uiuc.edu>

Author: djg
Date: Thu Dec 18 16:03:42 2008
New Revision: 61215

URL: http://llvm.org/viewvc/llvm-project?rev=61215&view=rev
Log:
When emitting instructions that define EFLAGS and the EFLAGS value isn't
used, mark the defs as dead.

Modified:
    llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp

Modified: llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp?rev=61215&r1=61214&r2=61215&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86RegisterInfo.cpp Thu Dec 18 16:03:42 2008
@@ -403,6 +403,9 @@
         }
       }
 
+      // The EFLAGS implicit def is dead.
+      New->getOperand(3).setIsDead();
+
       // Replace the pseudo instruction with a new instruction...
       if (New) MBB.insert(I, New);
     }
@@ -416,6 +419,9 @@
         (Is64Bit ? X86::SUB64ri32 : X86::SUB32ri);
       MachineInstr *New =
         BuildMI(MF, TII.get(Opc), StackPtr).addReg(StackPtr).addImm(CalleeAmt);
+      // The EFLAGS implicit def is dead.
+      New->getOperand(3).setIsDead();
+
       MBB.insert(I, New);
     }
   }
@@ -517,7 +523,10 @@
 
   while (Offset) {
     uint64_t ThisVal = (Offset > Chunk) ? Chunk : Offset;
-    BuildMI(MBB, MBBI, TII.get(Opc), StackPtr).addReg(StackPtr).addImm(ThisVal);
+    MachineInstr *MI =
+      BuildMI(MBB, MBBI, TII.get(Opc), StackPtr).addReg(StackPtr).addImm(ThisVal);
+    // The EFLAGS implicit def is dead.
+    MI->getOperand(3).setIsDead();
     Offset -= ThisVal;
   }
 }
@@ -713,8 +722,11 @@
   // applies to tail call optimized functions where the callee argument stack
   // size is bigger than the callers.
   if (TailCallReturnAddrDelta < 0) {
-    BuildMI(MBB, MBBI, TII.get(Is64Bit? X86::SUB64ri32 : X86::SUB32ri),
-            StackPtr).addReg(StackPtr).addImm(-TailCallReturnAddrDelta);
+    MachineInstr *MI =
+      BuildMI(MBB, MBBI, TII.get(Is64Bit? X86::SUB64ri32 : X86::SUB32ri),
+              StackPtr).addReg(StackPtr).addImm(-TailCallReturnAddrDelta);
+    // The EFLAGS implicit def is dead.
+    MI->getOperand(3).setIsDead();
   }
 
   uint64_t NumBytes = 0;
@@ -751,10 +763,14 @@
       I->addLiveIn(FramePtr);
 
     // Realign stack
-    if (needsStackRealignment(MF))
-      BuildMI(MBB, MBBI,
-              TII.get(Is64Bit ? X86::AND64ri32 : X86::AND32ri),
-              StackPtr).addReg(StackPtr).addImm(-MaxAlign);
+    if (needsStackRealignment(MF)) {
+      MachineInstr *MI =
+        BuildMI(MBB, MBBI,
+                TII.get(Is64Bit ? X86::AND64ri32 : X86::AND32ri),
+                StackPtr).addReg(StackPtr).addImm(-MaxAlign);
+      // The EFLAGS implicit def is dead.
+      MI->getOperand(3).setIsDead();
+    }
   } else
     NumBytes = StackSize - X86FI->getCalleeSavedFrameSize();
 




From gohman at apple.com  Thu Dec 18 16:06:09 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 18 Dec 2008 22:06:09 -0000
Subject: [llvm-commits] [llvm] r61216 -
	/llvm/trunk/lib/CodeGen/LowerSubregs.cpp
Message-ID: <200812182206.mBIM69kr012745@zion.cs.uiuc.edu>

Author: djg
Date: Thu Dec 18 16:06:01 2008
New Revision: 61216

URL: http://llvm.org/viewvc/llvm-project?rev=61216&view=rev
Log:
Fix indentation level.

Modified:
    llvm/trunk/lib/CodeGen/LowerSubregs.cpp

Modified: llvm/trunk/lib/CodeGen/LowerSubregs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LowerSubregs.cpp?rev=61216&r1=61215&r2=61216&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LowerSubregs.cpp (original)
+++ llvm/trunk/lib/CodeGen/LowerSubregs.cpp Thu Dec 18 16:06:01 2008
@@ -59,42 +59,42 @@
 }
 
 bool LowerSubregsInstructionPass::LowerExtract(MachineInstr *MI) {
-   MachineBasicBlock *MBB = MI->getParent();
-   MachineFunction &MF = *MBB->getParent();
-   const TargetRegisterInfo &TRI = *MF.getTarget().getRegisterInfo();
-   const TargetInstrInfo &TII = *MF.getTarget().getInstrInfo();
-   
-   assert(MI->getOperand(0).isReg() && MI->getOperand(0).isDef() &&
-          MI->getOperand(1).isReg() && MI->getOperand(1).isUse() &&
-          MI->getOperand(2).isImm() && "Malformed extract_subreg");
-
-   unsigned DstReg   = MI->getOperand(0).getReg();
-   unsigned SuperReg = MI->getOperand(1).getReg();
-   unsigned SubIdx   = MI->getOperand(2).getImm();
-   unsigned SrcReg   = TRI.getSubReg(SuperReg, SubIdx);
-
-   assert(TargetRegisterInfo::isPhysicalRegister(SuperReg) &&
-          "Extract supperg source must be a physical register");
-   assert(TargetRegisterInfo::isPhysicalRegister(DstReg) &&
-          "Insert destination must be in a physical register");
-          
-   DOUT << "subreg: CONVERTING: " << *MI;
+  MachineBasicBlock *MBB = MI->getParent();
+  MachineFunction &MF = *MBB->getParent();
+  const TargetRegisterInfo &TRI = *MF.getTarget().getRegisterInfo();
+  const TargetInstrInfo &TII = *MF.getTarget().getInstrInfo();
+  
+  assert(MI->getOperand(0).isReg() && MI->getOperand(0).isDef() &&
+         MI->getOperand(1).isReg() && MI->getOperand(1).isUse() &&
+         MI->getOperand(2).isImm() && "Malformed extract_subreg");
+
+  unsigned DstReg   = MI->getOperand(0).getReg();
+  unsigned SuperReg = MI->getOperand(1).getReg();
+  unsigned SubIdx   = MI->getOperand(2).getImm();
+  unsigned SrcReg   = TRI.getSubReg(SuperReg, SubIdx);
+
+  assert(TargetRegisterInfo::isPhysicalRegister(SuperReg) &&
+         "Extract supperg source must be a physical register");
+  assert(TargetRegisterInfo::isPhysicalRegister(DstReg) &&
+         "Insert destination must be in a physical register");
+         
+  DOUT << "subreg: CONVERTING: " << *MI;
 
-   if (SrcReg != DstReg) {
-     const TargetRegisterClass *TRC = TRI.getPhysicalRegisterRegClass(DstReg);
-     assert(TRC == TRI.getPhysicalRegisterRegClass(SrcReg) &&
-             "Extract subreg and Dst must be of same register class");
-     TII.copyRegToReg(*MBB, MI, DstReg, SrcReg, TRC, TRC);
-     
+  if (SrcReg != DstReg) {
+    const TargetRegisterClass *TRC = TRI.getPhysicalRegisterRegClass(DstReg);
+    assert(TRC == TRI.getPhysicalRegisterRegClass(SrcReg) &&
+            "Extract subreg and Dst must be of same register class");
+    TII.copyRegToReg(*MBB, MI, DstReg, SrcReg, TRC, TRC);
+    
 #ifndef NDEBUG
-     MachineBasicBlock::iterator dMI = MI;
-     DOUT << "subreg: " << *(--dMI);
+    MachineBasicBlock::iterator dMI = MI;
+    DOUT << "subreg: " << *(--dMI);
 #endif
-   }
+  }
 
-   DOUT << "\n";
-   MBB->erase(MI);
-   return true;
+  DOUT << "\n";
+  MBB->erase(MI);
+  return true;
 }
 
 bool LowerSubregsInstructionPass::LowerSubregToReg(MachineInstr *MI) {




From anton at korobeynikov.info  Thu Dec 18 16:07:00 2008
From: anton at korobeynikov.info (Anton Korobeynikov)
Date: Fri, 19 Dec 2008 01:07:00 +0300
Subject: [llvm-commits] [llvm] r61211 - in /llvm/trunk/lib/Target/X86:
	X86ISelLowering.cpp X86ISelLowering.h X86InstrInfo.cpp
	X86InstrSSE.td
In-Reply-To: <200812182142.mBILgPex011799@zion.cs.uiuc.edu>
References: <200812182142.mBILgPex011799@zion.cs.uiuc.edu>
Message-ID: <b087fca00812181407x72d4adb4mb45d1442e2ba2373@mail.gmail.com>

Hi Mon Ping

On Fri, Dec 19, 2008 at 12:42 AM, Mon P Wang <wangmp at apple.com> wrote:
> Author: wangmp
> Date: Thu Dec 18 15:42:19 2008
> New Revision: 61211
This causes bunch of test fails, please investigate

-- 
With best regards, Anton Korobeynikov
Faculty of Mathematics and Mechanics, Saint Petersburg State University


From gohman at apple.com  Thu Dec 18 16:07:27 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 18 Dec 2008 22:07:27 -0000
Subject: [llvm-commits] [llvm] r61217 -
	/llvm/trunk/lib/CodeGen/LowerSubregs.cpp
Message-ID: <200812182207.mBIM7RWa012793@zion.cs.uiuc.edu>

Author: djg
Date: Thu Dec 18 16:07:25 2008
New Revision: 61217

URL: http://llvm.org/viewvc/llvm-project?rev=61217&view=rev
Log:
Fix a copy+pasto in an assertion message.

Modified:
    llvm/trunk/lib/CodeGen/LowerSubregs.cpp

Modified: llvm/trunk/lib/CodeGen/LowerSubregs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LowerSubregs.cpp?rev=61217&r1=61216&r2=61217&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LowerSubregs.cpp (original)
+++ llvm/trunk/lib/CodeGen/LowerSubregs.cpp Thu Dec 18 16:07:25 2008
@@ -76,7 +76,7 @@
   assert(TargetRegisterInfo::isPhysicalRegister(SuperReg) &&
          "Extract supperg source must be a physical register");
   assert(TargetRegisterInfo::isPhysicalRegister(DstReg) &&
-         "Insert destination must be in a physical register");
+         "Extract destination must be in a physical register");
          
   DOUT << "subreg: CONVERTING: " << *MI;
 




From gohman at apple.com  Thu Dec 18 16:11:36 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 18 Dec 2008 22:11:36 -0000
Subject: [llvm-commits] [llvm] r61218 -
	/llvm/trunk/lib/CodeGen/LowerSubregs.cpp
Message-ID: <200812182211.mBIMBbvP012957@zion.cs.uiuc.edu>

Author: djg
Date: Thu Dec 18 16:11:34 2008
New Revision: 61218

URL: http://llvm.org/viewvc/llvm-project?rev=61218&view=rev
Log:
Make LowerSubregs' debug output for EXTRACT_SUBREG consistent with
that of INSERT_SUBREG and SUBREG_TO_REG.

Modified:
    llvm/trunk/lib/CodeGen/LowerSubregs.cpp

Modified: llvm/trunk/lib/CodeGen/LowerSubregs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LowerSubregs.cpp?rev=61218&r1=61217&r2=61218&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LowerSubregs.cpp (original)
+++ llvm/trunk/lib/CodeGen/LowerSubregs.cpp Thu Dec 18 16:11:34 2008
@@ -80,7 +80,11 @@
          
   DOUT << "subreg: CONVERTING: " << *MI;
 
-  if (SrcReg != DstReg) {
+  if (SrcReg == DstReg) {
+    // No need to insert an identify copy instruction.
+    DOUT << "subreg: eliminated!";
+  } else {
+    // Insert copy
     const TargetRegisterClass *TRC = TRI.getPhysicalRegisterRegClass(DstReg);
     assert(TRC == TRI.getPhysicalRegisterRegClass(SrcReg) &&
             "Extract subreg and Dst must be of same register class");
@@ -177,6 +181,7 @@
     const TargetRegisterClass *TRC0= TRI.getPhysicalRegisterRegClass(DstSubReg);
     const TargetRegisterClass *TRC1= TRI.getPhysicalRegisterRegClass(InsReg);
     TII.copyRegToReg(*MBB, MI, DstSubReg, InsReg, TRC0, TRC1);
+
 #ifndef NDEBUG
     MachineBasicBlock::iterator dMI = MI;
     DOUT << "subreg: " << *(--dMI);




From isanbard at gmail.com  Thu Dec 18 16:13:32 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Thu, 18 Dec 2008 22:13:32 -0000
Subject: [llvm-commits] [llvm] r61219 - in /llvm/trunk:
 lib/Transforms/Scalar/GVN.cpp test/FrontendC++/2006-11-06-StackTrace.cpp
Message-ID: <200812182213.mBIMDXig013021@zion.cs.uiuc.edu>

Author: void
Date: Thu Dec 18 16:13:31 2008
New Revision: 61219

URL: http://llvm.org/viewvc/llvm-project?rev=61219&view=rev
Log:
Re-XFAIL this test until debug stuff settles down.

Modified:
    llvm/trunk/lib/Transforms/Scalar/GVN.cpp
    llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/GVN.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/GVN.cpp?rev=61219&r1=61218&r2=61219&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/GVN.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/GVN.cpp Thu Dec 18 16:13:31 2008
@@ -48,7 +48,7 @@
 
 static cl::opt<bool> EnablePRE("enable-pre",
                                cl::init(true), cl::Hidden);
-cl::opt<bool> EnableLoadPRE("enable-load-pre"/*, cl::init(true)*/);
+cl::opt<bool> EnableLoadPRE("enable-load-pre", cl::init(true));
 
 //===----------------------------------------------------------------------===//
 //                         ValueTable Class

Modified: llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC%2B%2B/2006-11-06-StackTrace.cpp?rev=61219&r1=61218&r2=61219&view=diff

==============================================================================
--- llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp (original)
+++ llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp Thu Dec 18 16:13:31 2008
@@ -10,7 +10,10 @@
 // RUN:   grep {#7  0x.* in main.*(argc=\[12\],.*argv=.*)}
 
 // Only works on ppc, x86 and x86_64.  Should generalize?
-// XFAIL: alpha|ia64|arm|linux
+// XFAIL: alpha|ia64|arm
+
+// FIXME: Un-XFAIL this test when debug stuff is working again.
+// XFAIL: *
 
 #include <stdlib.h>
 




From gohman at apple.com  Thu Dec 18 16:14:09 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 18 Dec 2008 22:14:09 -0000
Subject: [llvm-commits] [llvm] r61220 -
	/llvm/trunk/lib/CodeGen/LowerSubregs.cpp
Message-ID: <200812182214.mBIME91d013050@zion.cs.uiuc.edu>

Author: djg
Date: Thu Dec 18 16:14:08 2008
New Revision: 61220

URL: http://llvm.org/viewvc/llvm-project?rev=61220&view=rev
Log:
Teach LowerSubregs to preserve kill/dead information when lowering
subreg instructions.

Modified:
    llvm/trunk/lib/CodeGen/LowerSubregs.cpp

Modified: llvm/trunk/lib/CodeGen/LowerSubregs.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LowerSubregs.cpp?rev=61220&r1=61219&r2=61220&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LowerSubregs.cpp (original)
+++ llvm/trunk/lib/CodeGen/LowerSubregs.cpp Thu Dec 18 16:14:08 2008
@@ -49,6 +49,11 @@
     bool LowerExtract(MachineInstr *MI);
     bool LowerInsert(MachineInstr *MI);
     bool LowerSubregToReg(MachineInstr *MI);
+
+    void TransferDeadFlag(MachineInstr *MI, unsigned DstReg,
+                          const TargetRegisterInfo &TRI);
+    void TransferKillFlag(MachineInstr *MI, unsigned SrcReg,
+                          const TargetRegisterInfo &TRI);
   };
 
   char LowerSubregsInstructionPass::ID = 0;
@@ -58,6 +63,38 @@
   return new LowerSubregsInstructionPass(); 
 }
 
+/// TransferDeadFlag - MI is a pseudo-instruction with DstReg dead,
+/// and the lowered replacement instructions immediately precede it.
+/// Mark the replacement instructions with the dead flag.
+void
+LowerSubregsInstructionPass::TransferDeadFlag(MachineInstr *MI,
+                                              unsigned DstReg,
+                                              const TargetRegisterInfo &TRI) {
+  for (MachineBasicBlock::iterator MII =
+        prior(MachineBasicBlock::iterator(MI)); ; --MII) {
+    if (MII->addRegisterDead(DstReg, &TRI))
+      break;
+    assert(MII != MI->getParent()->begin() &&
+           "copyRegToReg output doesn't reference destination register!");
+  }
+}
+
+/// TransferKillFlag - MI is a pseudo-instruction with SrcReg killed,
+/// and the lowered replacement instructions immediately precede it.
+/// Mark the replacement instructions with the kill flag.
+void
+LowerSubregsInstructionPass::TransferKillFlag(MachineInstr *MI,
+                                              unsigned SrcReg,
+                                              const TargetRegisterInfo &TRI) {
+  for (MachineBasicBlock::iterator MII =
+        prior(MachineBasicBlock::iterator(MI)); ; --MII) {
+    if (MII->addRegisterKilled(SrcReg, &TRI))
+      break;
+    assert(MII != MI->getParent()->begin() &&
+           "copyRegToReg output doesn't reference source register!");
+  }
+}
+
 bool LowerSubregsInstructionPass::LowerExtract(MachineInstr *MI) {
   MachineBasicBlock *MBB = MI->getParent();
   MachineFunction &MF = *MBB->getParent();
@@ -83,13 +120,28 @@
   if (SrcReg == DstReg) {
     // No need to insert an identify copy instruction.
     DOUT << "subreg: eliminated!";
+    // Find the kill of the destination register's live range, and insert
+    // a kill of the source register at that point.
+    if (MI->getOperand(1).isKill() && !MI->getOperand(0).isDead())
+      for (MachineBasicBlock::iterator MII =
+             next(MachineBasicBlock::iterator(MI));
+           MII != MBB->end(); ++MII)
+        if (MII->killsRegister(DstReg, &TRI)) {
+          MII->addRegisterKilled(SuperReg, &TRI, /*AddIfNotFound=*/true);
+          break;
+        }
   } else {
     // Insert copy
     const TargetRegisterClass *TRC = TRI.getPhysicalRegisterRegClass(DstReg);
     assert(TRC == TRI.getPhysicalRegisterRegClass(SrcReg) &&
             "Extract subreg and Dst must be of same register class");
     TII.copyRegToReg(*MBB, MI, DstReg, SrcReg, TRC, TRC);
-    
+    // Transfer the kill/dead flags, if needed.
+    if (MI->getOperand(0).isDead())
+      TransferDeadFlag(MI, DstReg, TRI);
+    if (MI->getOperand(1).isKill())
+      TransferKillFlag(MI, SrcReg, TRI);
+
 #ifndef NDEBUG
     MachineBasicBlock::iterator dMI = MI;
     DOUT << "subreg: " << *(--dMI);
@@ -133,6 +185,11 @@
     const TargetRegisterClass *TRC0= TRI.getPhysicalRegisterRegClass(DstSubReg);
     const TargetRegisterClass *TRC1= TRI.getPhysicalRegisterRegClass(InsReg);
     TII.copyRegToReg(*MBB, MI, DstSubReg, InsReg, TRC0, TRC1);
+    // Transfer the kill/dead flags, if needed.
+    if (MI->getOperand(0).isDead())
+      TransferDeadFlag(MI, DstSubReg, TRI);
+    if (MI->getOperand(2).isKill())
+      TransferKillFlag(MI, InsReg, TRI);
 
 #ifndef NDEBUG
     MachineBasicBlock::iterator dMI = MI;
@@ -181,6 +238,11 @@
     const TargetRegisterClass *TRC0= TRI.getPhysicalRegisterRegClass(DstSubReg);
     const TargetRegisterClass *TRC1= TRI.getPhysicalRegisterRegClass(InsReg);
     TII.copyRegToReg(*MBB, MI, DstSubReg, InsReg, TRC0, TRC1);
+    // Transfer the kill/dead flags, if needed.
+    if (MI->getOperand(0).isDead())
+      TransferDeadFlag(MI, DstSubReg, TRI);
+    if (MI->getOperand(1).isKill())
+      TransferKillFlag(MI, InsReg, TRI);
 
 #ifndef NDEBUG
     MachineBasicBlock::iterator dMI = MI;




From dpatel at apple.com  Thu Dec 18 16:14:12 2008
From: dpatel at apple.com (Devang Patel)
Date: Thu, 18 Dec 2008 22:14:12 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61221 -
	/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
Message-ID: <200812182214.mBIMEDh4013064@zion.cs.uiuc.edu>

Author: dpatel
Date: Thu Dec 18 16:14:11 2008
New Revision: 61221

URL: http://llvm.org/viewvc/llvm-project?rev=61221&view=rev
Log:
Fix debug info of a pointer type.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=61221&r1=61220&r2=61221&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Thu Dec 18 16:14:11 2008
@@ -416,7 +416,7 @@
                                            NodeAlignInBits(type),
                                            0 /*offset */, 
                                            0 /* flags */, 
-                                           MainTy);
+                                           FromTy);
       
       break;
     }




From isanbard at gmail.com  Thu Dec 18 16:19:54 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Thu, 18 Dec 2008 22:19:54 -0000
Subject: [llvm-commits] [llvm] r61222 -
	/llvm/trunk/lib/Transforms/Scalar/GVN.cpp
Message-ID: <200812182219.mBIMJtVI013319@zion.cs.uiuc.edu>

Author: void
Date: Thu Dec 18 16:19:50 2008
New Revision: 61222

URL: http://llvm.org/viewvc/llvm-project?rev=61222&view=rev
Log:
Didn't mean to commit this.

Modified:
    llvm/trunk/lib/Transforms/Scalar/GVN.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/GVN.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/GVN.cpp?rev=61222&r1=61221&r2=61222&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/GVN.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/GVN.cpp Thu Dec 18 16:19:50 2008
@@ -48,7 +48,7 @@
 
 static cl::opt<bool> EnablePRE("enable-pre",
                                cl::init(true), cl::Hidden);
-cl::opt<bool> EnableLoadPRE("enable-load-pre", cl::init(true));
+cl::opt<bool> EnableLoadPRE("enable-load-pre"/*, cl::init(true)*/);
 
 //===----------------------------------------------------------------------===//
 //                         ValueTable Class




From clattner at apple.com  Thu Dec 18 16:20:50 2008
From: clattner at apple.com (Chris Lattner)
Date: Thu, 18 Dec 2008 14:20:50 -0800
Subject: [llvm-commits] [llvm] r61219 - in /llvm/trunk:
	lib/Transforms/Scalar/GVN.cpp
	test/FrontendC++/2006-11-06-StackTrace.cpp
In-Reply-To: <200812182213.mBIMDXig013021@zion.cs.uiuc.edu>
References: <200812182213.mBIMDXig013021@zion.cs.uiuc.edu>
Message-ID: <5D97E17F-F3EC-4D21-81BA-1078E7BAE80D@apple.com>

On Dec 18, 2008, at 2:13 PM, Bill Wendling wrote:

> Author: void
> Date: Thu Dec 18 16:13:31 2008
> New Revision: 61219
>
> URL: http://llvm.org/viewvc/llvm-project?rev=61219&view=rev
> Log:
> Re-XFAIL this test until debug stuff settles down.

Yay, long live load pre! :)

-Chris

>
>
> Modified:
>    llvm/trunk/lib/Transforms/Scalar/GVN.cpp
>    llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp
>
> Modified: llvm/trunk/lib/Transforms/Scalar/GVN.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/GVN.cpp?rev=61219&r1=61218&r2=61219&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- llvm/trunk/lib/Transforms/Scalar/GVN.cpp (original)
> +++ llvm/trunk/lib/Transforms/Scalar/GVN.cpp Thu Dec 18 16:13:31 2008
> @@ -48,7 +48,7 @@
>
> static cl::opt<bool> EnablePRE("enable-pre",
>                                cl::init(true), cl::Hidden);
> -cl::opt<bool> EnableLoadPRE("enable-load-pre"/*, cl::init(true)*/);
> +cl::opt<bool> EnableLoadPRE("enable-load-pre", cl::init(true));
>
> // 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> //                         ValueTable Class
>
> Modified: llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC%2B%2B/2006-11-06-StackTrace.cpp?rev=61219&r1=61218&r2=61219&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp (original)
> +++ llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp Thu Dec 18  
> 16:13:31 2008
> @@ -10,7 +10,10 @@
> // RUN:   grep {#7  0x.* in main.*(argc=\[12\],.*argv=.*)}
>
> // Only works on ppc, x86 and x86_64.  Should generalize?
> -// XFAIL: alpha|ia64|arm|linux
> +// XFAIL: alpha|ia64|arm
> +
> +// FIXME: Un-XFAIL this test when debug stuff is working again.
> +// XFAIL: *
>
> #include <stdlib.h>
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From isanbard at gmail.com  Thu Dec 18 16:22:07 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Thu, 18 Dec 2008 14:22:07 -0800
Subject: [llvm-commits] [llvm] r61219 - in /llvm/trunk:
	lib/Transforms/Scalar/GVN.cpp
	test/FrontendC++/2006-11-06-StackTrace.cpp
In-Reply-To: <5D97E17F-F3EC-4D21-81BA-1078E7BAE80D@apple.com>
References: <200812182213.mBIMDXig013021@zion.cs.uiuc.edu>
	<5D97E17F-F3EC-4D21-81BA-1078E7BAE80D@apple.com>
Message-ID: <16e5fdf90812181422o44714688l65e043deb12f0ed4@mail.gmail.com>

On Thu, Dec 18, 2008 at 2:20 PM, Chris Lattner <clattner at apple.com> wrote:
> On Dec 18, 2008, at 2:13 PM, Bill Wendling wrote:
>
>> Author: void
>> Date: Thu Dec 18 16:13:31 2008
>> New Revision: 61219
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=61219&view=rev
>> Log:
>> Re-XFAIL this test until debug stuff settles down.
>
> Yay, long live load pre! :)
>
It was a mistake. ;-) But we're getting closer to the answer!

-bw


From monping at apple.com  Thu Dec 18 16:48:52 2008
From: monping at apple.com (Mon Ping Wang)
Date: Thu, 18 Dec 2008 14:48:52 -0800
Subject: [llvm-commits] [llvm] r61211 - in /llvm/trunk/lib/Target/X86:
	X86ISelLowering.cpp X86ISelLowering.h
	X86InstrInfo.cpp	X86InstrSSE.td
In-Reply-To: <b087fca00812181407x72d4adb4mb45d1442e2ba2373@mail.gmail.com>
References: <200812182142.mBILgPex011799@zion.cs.uiuc.edu>
	<b087fca00812181407x72d4adb4mb45d1442e2ba2373@mail.gmail.com>
Message-ID: <F6E4ED0D-4DB0-42EE-8CB9-2C2B3B171585@apple.com>

I'll take a look right now.

-- Mon Ping


On Dec 19, 2008, at 1:07 AM, Anton Korobeynikov wrote:

> Hi Mon Ping
>
> On Fri, Dec 19, 2008 at 12:42 AM, Mon P Wang <wangmp at apple.com> wrote:
>> Author: wangmp
>> Date: Thu Dec 18 15:42:19 2008
>> New Revision: 61211
> This causes bunch of test fails, please investigate
>
> --  
> With best regards, Anton Korobeynikov
> Faculty of Mathematics and Mechanics, Saint Petersburg State  
> University
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From kremenek at apple.com  Thu Dec 18 17:35:47 2008
From: kremenek at apple.com (Ted Kremenek)
Date: Thu, 18 Dec 2008 23:35:47 -0000
Subject: [llvm-commits] [llvm] r61225 - /llvm/tags/checker/checker-136/
Message-ID: <200812182335.mBINZmXn015850@zion.cs.uiuc.edu>

Author: kremenek
Date: Thu Dec 18 17:35:47 2008
New Revision: 61225

URL: http://llvm.org/viewvc/llvm-project?rev=61225&view=rev
Log:
Tagging checker-136.

Added:
    llvm/tags/checker/checker-136/
      - copied from r61224, llvm/trunk/



From wangmp at apple.com  Thu Dec 18 17:42:38 2008
From: wangmp at apple.com (Mon P Wang)
Date: Thu, 18 Dec 2008 23:42:38 -0000
Subject: [llvm-commits] [llvm] r61228 - /llvm/trunk/test/CodeGen/X86/pmul.ll
Message-ID: <200812182342.mBINgcG5016104@zion.cs.uiuc.edu>

Author: wangmp
Date: Thu Dec 18 17:42:37 2008
New Revision: 61228

URL: http://llvm.org/viewvc/llvm-project?rev=61228&view=rev
Log:
Fix test to account for generating some vector code for mul v2i64 instead
of incorrectly generating pmuldq

Modified:
    llvm/trunk/test/CodeGen/X86/pmul.ll

Modified: llvm/trunk/test/CodeGen/X86/pmul.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pmul.ll?rev=61228&r1=61227&r2=61228&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/X86/pmul.ll (original)
+++ llvm/trunk/test/CodeGen/X86/pmul.ll Thu Dec 18 17:42:37 2008
@@ -1,6 +1,6 @@
 ; RUN: llvm-as < %s | llc -march=x86 -mattr=sse41 -stack-alignment=16 > %t
-; RUN: grep pmul %t | count 6
-; RUN: grep mov %t | count 8
+; RUN: grep pmul %t | count 12
+; RUN: grep mov %t | count 19
 
 define <4 x i32> @a(<4 x i32> %i) nounwind  {
         %A = mul <4 x i32> %i, < i32 117, i32 117, i32 117, i32 117 >




From isanbard at gmail.com  Thu Dec 18 17:51:17 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Thu, 18 Dec 2008 15:51:17 -0800
Subject: [llvm-commits] [llvm] r61094 - in /llvm/trunk:
	docs/AliasAnalysis.html docs/LangRef.html
	include/llvm/Attributes.h lib/Analysis/BasicAliasAnalysis.cpp
	lib/AsmParser/LLLexer.cpp lib/AsmParser/llvmAsmParser.y
	lib/Bitcode/Reader/BitcodeReader.cpp li
Message-ID: <16e5fdf90812181551ub7f3bd1t4790028dae64f2b@mail.gmail.com>

Hi Nick,

I tested this on my PPC machine and it works. Go ahead and submit it.
Thanks for looking into this!

-bw

On Wed, Dec 17, 2008 at 9:04 PM, Nick Lewycky <nicholas at mxc.ca> wrote:
> Hi Bill,
>
> I was never able to reproduce the problem, but I think I found the fix by
> inspection. Would you please test out the attached patch?
>
> The bug was that constructAlignmentFromInt was asserting that its input was
> a power of 2, which 0 is not. Zero is a valid alignment, and is explicitly
> set by llvm-gcc when passing structs byval on OS X.
>
> Nick
>
> Bill Wendling wrote:
>>
>> Author: void
>> Date: Tue Dec 16 13:06:48 2008
>> New Revision: 61094
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=61094&view=rev
>> Log:
>> Temporarily revert r61019, r61030, and r61040. These were breaking LLVM
>> Release
>> builds.
>>
>> Modified:
>>    llvm/trunk/docs/AliasAnalysis.html
>>    llvm/trunk/docs/LangRef.html
>>    llvm/trunk/include/llvm/Attributes.h
>>    llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
>>    llvm/trunk/lib/AsmParser/LLLexer.cpp
>>    llvm/trunk/lib/AsmParser/llvmAsmParser.y
>>    llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
>>    llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
>>    llvm/trunk/lib/VMCore/Attributes.cpp
>>    llvm/trunk/test/Analysis/BasicAA/nocapture.ll
>>
>> Modified: llvm/trunk/docs/AliasAnalysis.html
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/AliasAnalysis.html?rev=61094&r1=61093&r2=61094&view=diff
>>
>>
>> ==============================================================================
>> --- llvm/trunk/docs/AliasAnalysis.html (original)
>> +++ llvm/trunk/docs/AliasAnalysis.html Tue Dec 16 13:06:48 2008
>> @@ -192,11 +192,11 @@
>>   <div class="doc_text">
>>  <p>The NoAlias response is used when the two pointers refer to distinct
>> objects,
>> -regardless of whether the pointers compare equal.  For example, freed
>> pointers
>> -don't alias any pointers that were allocated afterwards.  As a degenerate
>> case,
>> -pointers returned by malloc(0) have no bytes for an object, and are
>> considered
>> -NoAlias even when malloc returns the same pointer.  The same rule applies
>> to
>> -NULL pointers.</p>
>> +even regardless of whether the pointers compare equal.  For example,
>> freed
>> +pointers don't alias any pointers that were allocated afterwards.  As a
>> +degenerate case, pointers returned by malloc(0) have no bytes for an
>> object,
>> +and are considered NoAlias even when malloc returns the same pointer.
>>  The same
>> +rule applies to NULL pointers.</p>
>>   <p>The MayAlias response is used whenever the two pointers might refer
>> to the
>>  same object.  If the two memory objects overlap, but do not start at the
>> same
>>
>> Modified: llvm/trunk/docs/LangRef.html
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=61094&r1=61093&r2=61094&view=diff
>>
>>
>> ==============================================================================
>> --- llvm/trunk/docs/LangRef.html (original)
>> +++ llvm/trunk/docs/LangRef.html Tue Dec 16 13:06:48 2008
>> @@ -894,15 +894,9 @@
>>     parameter.  The caller is responsible for ensuring that this is the
>>     case. On a function return value, <tt>noalias</tt> additionally
>> indicates
>>     that the pointer does not alias any other pointers visible to the
>> -    caller. For further details, please see the discussion of the NoAlias
>> -    response in
>> -    <a href="http://llvm.org/docs/AliasAnalysis.html#MustMayNo">alias
>> -    analysis</a>.</dd>
>> -
>> -    <dt><tt>nocapture</tt></dt>
>> -    <dd>This indicates that the callee does not make any copies of the
>> pointer
>> -    that outlive the callee itself. This is not a valid attribute for
>> return
>> -    values.</dd>
>> +    caller. Note that this applies only to pointers that can be used to
>> actually
>> +    load/store a value: NULL, unique pointers from malloc(0), and freed
>> pointers
>> +    are considered to not alias anything.</dd>
>>       <dt><tt>nest</tt></dt>
>>     <dd>This indicates that the pointer parameter can be excised using the
>>
>> Modified: llvm/trunk/include/llvm/Attributes.h
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=61094&r1=61093&r2=61094&view=diff
>>
>>
>> ==============================================================================
>> --- llvm/trunk/include/llvm/Attributes.h (original)
>> +++ llvm/trunk/include/llvm/Attributes.h Tue Dec 16 13:06:48 2008
>> @@ -15,7 +15,6 @@
>>  #ifndef LLVM_ATTRIBUTES_H
>>  #define LLVM_ATTRIBUTES_H
>>  -#include "llvm/Support/MathExtras.h"
>>  #include <cassert>
>>  #include <string>
>>  @@ -24,7 +23,7 @@
>>   /// Attributes - A bitset of attributes.
>>  typedef unsigned Attributes;
>> -
>> +   namespace Attribute {
>>   /// Function parameters and results can have attributes to indicate how
>> they @@ -45,18 +44,16 @@
>>  const Attributes Nest      = 1<<8;  ///< Nested function static chain
>>  const Attributes ReadNone  = 1<<9;  ///< Function does not access memory
>>  const Attributes ReadOnly  = 1<<10; ///< Function only reads from memory
>> -const Attributes NoInline        = 1<<11; ///< inline=never -const
>> Attributes AlwaysInline    = 1<<12; ///< inline=always
>> -const Attributes OptimizeForSize = 1<<13; ///< opt_size
>> -const Attributes StackProtect    = 1<<14; ///< Stack protection.
>> -const Attributes StackProtectReq = 1<<15; ///< Stack protection required.
>> -const Attributes Alignment = 31<<16; ///< Alignment of parameter (5 bits)
>> -                                     // stored as log2 of alignment with
>> +1 bias
>> -                                     // 0 means unaligned different from
>> align 1
>> -const Attributes NoCapture = 1<<21; ///< Function creates no aliases of
>> pointer
>> -
>> +const Attributes NoInline        = 1<<11; // inline=never +const
>> Attributes AlwaysInline    = 1<<12; // inline=always
>> +const Attributes OptimizeForSize = 1<<13; // opt_size
>> +const Attributes StackProtect    = 1<<14; // Stack protection.
>> +const Attributes StackProtectReq = 1<<15; // Stack protection required.
>> +const Attributes Alignment = 0xffff<<16; ///< Alignment of parameter (16
>> bits)
>> +                                    // 0 = unknown, else in clear (not
>> log)
>> +                                     /// @brief Attributes that only
>> apply to function parameters.
>> -const Attributes ParameterOnly = ByVal | Nest | StructRet | NoCapture;
>> +const Attributes ParameterOnly = ByVal | Nest | StructRet;
>>   /// @brief Attributes that only apply to function.
>>  const Attributes FunctionOnly = NoReturn | NoUnwind | ReadNone | ReadOnly
>> | @@ -67,7 +64,7 @@
>>   /// @brief Attributes that are mutually incompatible.
>>  const Attributes MutuallyIncompatible[4] = {
>> -  ByVal | InReg | Nest | StructRet,
>> +  ByVal | InReg | Nest  | StructRet,
>>   ZExt  | SExt,
>>   ReadNone | ReadOnly,
>>   NoInline | AlwaysInline
>> @@ -79,9 +76,7 @@
>>  /// This turns an int alignment (a power of 2, normally) into the
>>  /// form used internally in Attributes.
>>  inline Attributes constructAlignmentFromInt(unsigned i) {
>> -  assert(isPowerOf2_32(i) && "Alignment must be a power of two.");
>> -  assert(i <= 0x40000000 && "Alignment too large.");
>> -  return (Log2_32(i)+1) << 16;
>> +  return (i << 16);
>>  }
>>   /// The set of Attributes set in Attributes is converted to a
>> @@ -180,7 +175,7 @@
>>   /// getParamAlignment - Return the alignment for the specified function
>>   /// parameter.
>>   unsigned getParamAlignment(unsigned Idx) const {
>> -    return 1ull << (((getAttributes(Idx) & Attribute::Alignment) >> 16) -
>> 1);
>> +    return (getAttributes(Idx) & Attribute::Alignment) >> 16;
>>   }
>>     /// hasAttrSomewhere - Return true if the specified attribute is set
>> for at
>>
>> Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=61094&r1=61093&r2=61094&view=diff
>>
>>
>> ==============================================================================
>> --- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original)
>> +++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Tue Dec 16 13:06:48
>> 2008
>> @@ -63,23 +63,12 @@
>>       // callees could modify it.
>>       break; // next use
>>     case Instruction::Call:
>> -      // If the argument to the call has the nocapture attribute, then
>> the call
>> -      // may store or load to the pointer, but it cannot escape.
>> -      if (cast<CallInst>(I)->paramHasAttr(UI.getOperandNo(), -
>>                                Attribute::NoCapture))
>> -        continue;
>> -
>> -      // FIXME: MemIntrinsics should have their operands marked
>> nocapture!
>> -      if (isa<MemIntrinsic>(I))
>> -        continue;  // next use
>> -      return true;
>> -    case Instruction::Invoke:
>> -      // If the argument to the call has the nocapture attribute, then
>> the call
>> -      // may store or load to the pointer, but it cannot escape.
>> -      if (cast<InvokeInst>(I)->paramHasAttr(UI.getOperandNo()-2,
>> -                                            Attribute::NoCapture))
>> -        continue;
>> -      return true;
>> +      // If the call is to a few known safe intrinsics, we know that it
>> does
>> +      // not escape.
>> +      // TODO: Eventually just check the 'nocapture' attribute.
>> +      if (!isa<MemIntrinsic>(I))
>> +        return true;
>> +      break;  // next use
>>     default:
>>       return true;
>>     }
>>
>> Modified: llvm/trunk/lib/AsmParser/LLLexer.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLLexer.cpp?rev=61094&r1=61093&r2=61094&view=diff
>>
>>
>> ==============================================================================
>> --- llvm/trunk/lib/AsmParser/LLLexer.cpp (original)
>> +++ llvm/trunk/lib/AsmParser/LLLexer.cpp Tue Dec 16 13:06:48 2008
>> @@ -491,7 +491,6 @@
>>   KEYWORD("nounwind", NOUNWIND);
>>   KEYWORD("noreturn", NORETURN);
>>   KEYWORD("noalias", NOALIAS);
>> -  KEYWORD("nocapture", NOCAPTURE);
>>   KEYWORD("byval", BYVAL);
>>   KEYWORD("nest", NEST);
>>   KEYWORD("readnone", READNONE);
>>
>> Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=61094&r1=61093&r2=61094&view=diff
>>
>>
>> ==============================================================================
>> --- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
>> +++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Dec 16 13:06:48 2008
>> @@ -1136,8 +1136,8 @@
>>  %token <OtherOpVal> EXTRACTVALUE INSERTVALUE
>>   // Function Attributes
>> -%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS NOCAPTURE
>> BYVAL
>> -%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ NEST
>> +%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST
>> +%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ
>>   // Visibility Styles
>>  %token DEFAULT HIDDEN PROTECTED
>> @@ -1265,16 +1265,15 @@
>>                   CHECK_FOR_ERROR
>>                  };
>>  -Attribute     : ZEROEXT   { $$ = Attribute::ZExt;      }
>> -              | ZEXT      { $$ = Attribute::ZExt;      }
>> -              | SIGNEXT   { $$ = Attribute::SExt;      }
>> -              | SEXT      { $$ = Attribute::SExt;      }
>> -              | INREG     { $$ = Attribute::InReg;     }
>> -              | SRET      { $$ = Attribute::StructRet; }
>> -              | NOALIAS   { $$ = Attribute::NoAlias;   }
>> -              | NOCAPTURE { $$ = Attribute::NoCapture; }
>> -              | BYVAL     { $$ = Attribute::ByVal;     }
>> -              | NEST      { $$ = Attribute::Nest;      }
>> +Attribute     : ZEROEXT { $$ = Attribute::ZExt;      }
>> +              | ZEXT    { $$ = Attribute::ZExt;      }
>> +              | SIGNEXT { $$ = Attribute::SExt;      }
>> +              | SEXT    { $$ = Attribute::SExt;      }
>> +              | INREG   { $$ = Attribute::InReg;     }
>> +              | SRET    { $$ = Attribute::StructRet; }
>> +              | NOALIAS { $$ = Attribute::NoAlias;   }
>> +              | BYVAL   { $$ = Attribute::ByVal;     }
>> +              | NEST    { $$ = Attribute::Nest;      }
>>               | ALIGN EUINT64VAL { $$ =
>>                           Attribute::constructAlignmentFromInt($2);    }
>>               ;
>> @@ -1332,8 +1331,6 @@
>>   $$ = $2;
>>   if ($$ != 0 && !isPowerOf2_32($$))
>>     GEN_ERROR("Alignment must be a power of two");
>> -  if ($$ > 0x40000000)
>> -    GEN_ERROR("Alignment too large");
>>   CHECK_FOR_ERROR
>>  };
>>  OptCAlign : /*empty*/            { $$ = 0; } |
>> @@ -1341,8 +1338,6 @@
>>   $$ = $3;
>>   if ($$ != 0 && !isPowerOf2_32($$))
>>     GEN_ERROR("Alignment must be a power of two");
>> -  if ($$ > 0x40000000)
>> -    GEN_ERROR("Alignment too large");
>>   CHECK_FOR_ERROR
>>  };
>>  @@ -1372,8 +1367,6 @@
>>   | ALIGN EUINT64VAL {
>>     if ($2 != 0 && !isPowerOf2_32($2))
>>       GEN_ERROR("Alignment must be a power of two");
>> -    if ($2 > 0x40000000)
>> -      GEN_ERROR("Alignment too large");
>>     CurGV->setAlignment($2);
>>     CHECK_FOR_ERROR
>>   };
>>
>> Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=61094&r1=61093&r2=61094&view=diff
>>
>>
>> ==============================================================================
>> --- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
>> +++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Tue Dec 16 13:06:48
>> 2008
>> @@ -362,20 +362,6 @@
>>       Attributes RetAttribute = Attribute::None;
>>       Attributes FnAttribute = Attribute::None;
>>       for (unsigned i = 0, e = Record.size(); i != e; i += 2) {
>> -        // FIXME: remove in LLVM 3.0
>> -        // The alignment is stored as a 16-bit raw value from bits
>> 31--16.
>> -        // We shift the bits above 31 down by 11 bits.
>> -
>> -        unsigned Alignment = (Record[i+1] & (0xffffull << 16)) >> 16;
>> -        if (Alignment && !isPowerOf2_32(Alignment))
>> -          return Error("Alignment is not a power of two.");
>> -
>> -        Attributes ReconstitutedAttr = Record[i+1] & 0xffff;
>> -        if (Alignment)
>> -          ReconstitutedAttr |=
>> Attribute::constructAlignmentFromInt(Alignment);
>> -        ReconstitutedAttr |= (Record[i+1] & (0xffffull << 32)) >> 11;
>> -        Record[i+1] = ReconstitutedAttr;
>> -
>>         if (Record[i] == 0)
>>           RetAttribute = Record[i+1];
>>         else if (Record[i] == ~0U)
>>
>> Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=61094&r1=61093&r2=61094&view=diff
>>
>>
>> ==============================================================================
>> --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
>> +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Tue Dec 16 13:06:48
>> 2008
>> @@ -122,17 +122,7 @@
>>     for (unsigned i = 0, e = A.getNumSlots(); i != e; ++i) {
>>       const AttributeWithIndex &PAWI = A.getSlot(i);
>>       Record.push_back(PAWI.Index);
>> -
>> -      // FIXME: remove in LLVM 3.0
>> -      // Store the alignment in the bitcode as a 16-bit raw value instead
>> of a
>> -      // 5-bit log2 encoded value. Shift the bits above the alignment up
>> by
>> -      // 11 bits.
>> -      uint64_t FauxAttr = PAWI.Attrs & 0xffff;
>> -      if (PAWI.Attrs & Attribute::Alignment)
>> -        FauxAttr |= (1ull<<16)<<(((PAWI.Attrs & Attribute::Alignment)-1)
>> >> 16);
>> -      FauxAttr |= (PAWI.Attrs & (0x3FFull << 21)) << 11;
>> -
>> -      Record.push_back(FauxAttr);
>> +      Record.push_back(PAWI.Attrs);
>>     }
>>         Stream.EmitRecord(bitc::PARAMATTR_CODE_ENTRY, Record);
>>
>> Modified: llvm/trunk/lib/VMCore/Attributes.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?rev=61094&r1=61093&r2=61094&view=diff
>>
>>
>> ==============================================================================
>> --- llvm/trunk/lib/VMCore/Attributes.cpp (original)
>> +++ llvm/trunk/lib/VMCore/Attributes.cpp Tue Dec 16 13:06:48 2008
>> @@ -37,8 +37,6 @@
>>     Result += "inreg ";
>>   if (Attrs & Attribute::NoAlias)
>>     Result += "noalias ";
>> -  if (Attrs & Attribute::NoCapture)
>> -    Result += "nocapture ";
>>   if (Attrs & Attribute::StructRet)
>>     Result += "sret ";     if (Attrs & Attribute::ByVal)
>> @@ -61,11 +59,10 @@
>>     Result += "sspreq ";
>>   if (Attrs & Attribute::Alignment) {
>>     Result += "align ";
>> -    Result += utostr(1ull << (((Attrs & Attribute::Alignment)>>16) - 1));
>> +    Result += utostr((Attrs & Attribute::Alignment) >> 16);
>>     Result += " ";
>>   }
>>   // Trim the trailing space.
>> -  assert(!Result.empty() && "Unknown attribute!");
>>   Result.erase(Result.end()-1);
>>   return Result;
>>  }
>> @@ -79,7 +76,7 @@
>>     if (!isa<PointerType>(Ty))
>>     // Attributes that only apply to pointers.
>> -    Incompatible |= ByVal | Nest | NoAlias | StructRet | NoCapture;
>> +    Incompatible |= ByVal | Nest | NoAlias | StructRet;
>>     return Incompatible;
>>  }
>>
>> Modified: llvm/trunk/test/Analysis/BasicAA/nocapture.ll
>> URL:
>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/BasicAA/nocapture.ll?rev=61094&r1=61093&r2=61094&view=diff
>>
>>
>> ==============================================================================
>> --- llvm/trunk/test/Analysis/BasicAA/nocapture.ll (original)
>> +++ llvm/trunk/test/Analysis/BasicAA/nocapture.ll Tue Dec 16 13:06:48 2008
>> @@ -1,13 +0,0 @@
>> -; RUN: llvm-as < %s | opt -basicaa -gvn -instcombine | llvm-dis | grep
>> {ret i32 0}
>> -
>> -declare i32* @test(i32* nocapture)
>> -
>> -define i32 @test2() {
>> -       %P = alloca i32
>> -       %Q = call i32* @test(i32* %P)
>> -       %a = load i32* %P
>> -       store i32 4, i32* %Q   ;; cannot clobber P since it is nocapture.
>> -       %b = load i32* %P
>> -       %c = sub i32 %a, %b
>> -       ret i32 %c
>> -}
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
>


From dpatel at apple.com  Thu Dec 18 18:17:28 2008
From: dpatel at apple.com (Devang Patel)
Date: Fri, 19 Dec 2008 00:17:28 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61232 -
	/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
Message-ID: <200812190017.mBJ0HSua017295@zion.cs.uiuc.edu>

Author: dpatel
Date: Thu Dec 18 18:17:27 2008
New Revision: 61232

URL: http://llvm.org/viewvc/llvm-project?rev=61232&view=rev
Log:
Record file and directory names for subprogram and composite types.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=61232&r1=61231&r2=61232&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Thu Dec 18 18:17:27 2008
@@ -519,11 +519,14 @@
       llvm::DIArray EltArray =
         DebugFactory.GetOrCreateArray(&Elements[0], Elements.size());
 
-      expanded_location Loc = GetNodeLocation(type, false);
+      expanded_location Loc = GetNodeLocation(TREE_CHAIN(type), false);
+      std::string Filename, Directory;
+      DirectoryAndFile(Loc.file, Directory, Filename);
       Ty = DebugFactory.CreateCompositeType(llvm::dwarf::DW_TAG_enumeration_type,
                                             Unit, TypeName, Unit, Loc.line,
                                             Size, Align, 0, 0,
-                                            llvm::DIType(), EltArray);
+                                            llvm::DIType(), EltArray,
+                                            &Filename, &Directory);
       break;
     }
     
@@ -541,11 +544,14 @@
       // complete type (which may refer to the forward decl if the struct is 
       // recursive) and replace all  uses of the forward declaration with the 
       // final definition. 
-      expanded_location Loc = GetNodeLocation(type, false);
+      expanded_location Loc = GetNodeLocation(TREE_CHAIN(type), false);
+      std::string Filename, Directory;
+      DirectoryAndFile(Loc.file, Directory, Filename);
       llvm::DIType FwdDecl = SlotIsFwdDecl ? Slot :
         DebugFactory.CreateCompositeType(Tag, Unit, TypeName, Unit, Loc.line, 
                                          0, 0, 0, DW_AT_declaration,
-                                         llvm::DIType(), llvm::DIArray());
+                                         llvm::DIType(), llvm::DIArray(),
+                                         &Filename, &Directory);
   
 
       // forward declaration, 
@@ -583,20 +589,22 @@
         // Should we skip.
         if (DECL_P(Member) && DECL_IGNORED_P(Member)) continue;
 
-        // Get the location of the member.
-        expanded_location MemLoc = GetNodeLocation(Member, false);
-        DICompileUnit MemFile = getOrCreateCompileUnit(MemLoc.file);
-
         if (TREE_CODE(Member) == FIELD_DECL) {
           if (DECL_FIELD_OFFSET(Member) == 0 ||
               TREE_CODE(DECL_FIELD_OFFSET(Member)) != INTEGER_CST)
             // FIXME: field with variable position, skip it for now.
             continue;
 
+          // Get the location of the member.
+          expanded_location MemLoc = GetNodeLocation(Member, false);
+          std::string MemFilename, MemDirectory;
+          DirectoryAndFile(MemLoc.file, MemDirectory, MemFilename);
+
           // Field type is the declared type of the field.
           tree FieldNodeType = FieldType(Member);
           DIType MemberType = getOrCreateType(FieldNodeType, Unit);
           const char *MemberName = GetNodeName(Member);
+          DICompileUnit MemFile = getOrCreateCompileUnit(MemLoc.file);
           unsigned Flags = 0;
           if (TREE_PROTECTED(Member))
             Flags = DW_ACCESS_protected;
@@ -609,7 +617,8 @@
                                            Unit, MemLoc.line, NodeSizeInBits(Member),
                                            NodeAlignInBits(FieldNodeType),
                                            int_bit_position(Member), 
-                                           Flags, MemberType);
+                                           Flags, MemberType,
+                                           &MemFilename, &MemDirectory);
           EltTys.push_back(DTy);
         } else {
           DEBUGASSERT(0 && "Unsupported member tree code!");
@@ -621,13 +630,18 @@
                 
         if (DECL_ABSTRACT_ORIGIN (Member)) continue;
 
-        const char *MemberName = GetNodeName(Member);                
+        // Get the location of the member.
         expanded_location MemLoc = GetNodeLocation(Member, false);
+        std::string MemFilename, MemDirectory;
+        DirectoryAndFile(MemLoc.file, MemDirectory, MemFilename);
+        
+        const char *MemberName = GetNodeName(Member);                
         DIType SPTy = getOrCreateType(TREE_TYPE(Member), Unit);
         DISubprogram SP = 
           DebugFactory.CreateSubprogram(Unit, MemberName, MemberName,
                                         MemberName, Unit, MemLoc.line,
-                                        SPTy, false, false);
+                                        SPTy, false, false,
+                                        &MemFilename, &MemDirectory);
 
         EltTys.push_back(SP);
       }
@@ -637,7 +651,8 @@
       
       llvm::DIType RealDecl =
         DebugFactory.CreateCompositeType(Tag, Unit, TypeName, Unit, Loc.line, Size,
-                                         Align, 0, 0, llvm::DIType(), Elements);
+                                         Align, 0, 0, llvm::DIType(), Elements,
+                                         &Filename, &Directory);
 
       // Now that we have a real decl for the struct, replace anything using the
       // old decl with the new one.  This will recursively update the debug info.




From gohman at apple.com  Thu Dec 18 18:34:34 2008
From: gohman at apple.com (Dan Gohman)
Date: Fri, 19 Dec 2008 00:34:34 -0000
Subject: [llvm-commits] [llvm] r61234 -
	/llvm/trunk/include/llvm/CodeGen/RegisterScavenging.h
Message-ID: <200812190034.mBJ0YYrR017809@zion.cs.uiuc.edu>

Author: djg
Date: Thu Dec 18 18:34:32 2008
New Revision: 61234

URL: http://llvm.org/viewvc/llvm-project?rev=61234&view=rev
Log:
Delete the RegScavenging constructor that takes a MachineBasicBlock
argument. Nothing was using it, and it set the MBB member without
calling enterBasicBlock, which was problematic.

Modified:
    llvm/trunk/include/llvm/CodeGen/RegisterScavenging.h

Modified: llvm/trunk/include/llvm/CodeGen/RegisterScavenging.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/RegisterScavenging.h?rev=61234&r1=61233&r2=61234&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/RegisterScavenging.h (original)
+++ llvm/trunk/include/llvm/CodeGen/RegisterScavenging.h Thu Dec 18 18:34:32 2008
@@ -86,10 +86,6 @@
     : MBB(NULL), NumPhysRegs(0), Tracking(false),
       ScavengingFrameIndex(-1), ScavengedReg(0), ScavengedRC(NULL) {}
 
-  explicit RegScavenger(MachineBasicBlock *mbb)
-    : MBB(mbb), NumPhysRegs(0), Tracking(false),
-      ScavengingFrameIndex(-1), ScavengedReg(0), ScavengedRC(NULL) {}
-
   /// enterBasicBlock - Start tracking liveness from the begin of the specific
   /// basic block.
   void enterBasicBlock(MachineBasicBlock *mbb);




From dpatel at apple.com  Thu Dec 18 18:37:46 2008
From: dpatel at apple.com (Devang Patel)
Date: Fri, 19 Dec 2008 00:37:46 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61235 -
	/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
Message-ID: <200812190037.mBJ0blGs017965@zion.cs.uiuc.edu>

Author: dpatel
Date: Thu Dec 18 18:37:45 2008
New Revision: 61235

URL: http://llvm.org/viewvc/llvm-project?rev=61235&view=rev
Log:
Include typedef name and location in debug info.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=61235&r1=61234&r2=61235&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Thu Dec 18 18:37:45 2008
@@ -351,13 +351,17 @@
   // Do we have a typedef?
   if (tree Name = TYPE_NAME(type)) {
     if (TREE_CODE(Name) == TYPE_DECL &&  DECL_ORIGINAL_TYPE(Name)) {
-      Ty = DebugFactory.CreateDerivedType(DW_TAG_typedef, Unit, "", 
-                                          DICompileUnit(), Loc.line,
+      expanded_location TypeDefLoc = GetNodeLocation(Name);
+      std::string Filename, Directory;
+      DirectoryAndFile(TypeDefLoc.file, Directory, Filename);
+      Ty = DebugFactory.CreateDerivedType(DW_TAG_typedef, Unit, 
+                                          GetNodeName(Name), 
+                                          Unit, TypeDefLoc.line,
                                           0 /*size*/,
                                           0 /*align*/,
                                           0 /*offset */, 
                                           0 /*flags*/, 
-                                          MainTy);
+                                          MainTy, &Filename, &Directory);
       // Set the slot early to prevent recursion difficulties.
       TypeCache[type] = Ty;
       return Ty;




From gohman at apple.com  Thu Dec 18 18:45:14 2008
From: gohman at apple.com (Dan Gohman)
Date: Fri, 19 Dec 2008 00:45:14 -0000
Subject: [llvm-commits] [llvm] r61236 -
	/llvm/trunk/include/llvm/CodeGen/RegisterScavenging.h
Message-ID: <200812190045.mBJ0jESC018260@zion.cs.uiuc.edu>

Author: djg
Date: Thu Dec 18 18:45:13 2008
New Revision: 61236

URL: http://llvm.org/viewvc/llvm-project?rev=61236&view=rev
Log:
Fix RegScavenger::forward() to work on basic blocks containing exactly
one instruction.

Modified:
    llvm/trunk/include/llvm/CodeGen/RegisterScavenging.h

Modified: llvm/trunk/include/llvm/CodeGen/RegisterScavenging.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/RegisterScavenging.h?rev=61236&r1=61235&r2=61236&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/RegisterScavenging.h (original)
+++ llvm/trunk/include/llvm/CodeGen/RegisterScavenging.h Thu Dec 18 18:45:13 2008
@@ -98,6 +98,7 @@
   /// forward / backward - Move the internal MBB iterator and update register
   /// states until it has processed the specific iterator.
   void forward(MachineBasicBlock::iterator I) {
+    if (!Tracking && MBB->begin() != I) forward();
     while (MBBI != I) forward();
   }
   void backward(MachineBasicBlock::iterator I) {




From gohman at apple.com  Thu Dec 18 18:46:21 2008
From: gohman at apple.com (Dan Gohman)
Date: Fri, 19 Dec 2008 00:46:21 -0000
Subject: [llvm-commits] [llvm] r61237 -
	/llvm/trunk/lib/CodeGen/RegisterScavenging.cpp
Message-ID: <200812190046.mBJ0kLO0018297@zion.cs.uiuc.edu>

Author: djg
Date: Thu Dec 18 18:46:20 2008
New Revision: 61237

URL: http://llvm.org/viewvc/llvm-project?rev=61237&view=rev
Log:
Initialize the ImplicitDefed member, to avoid getting stale
data from a previous block.

Modified:
    llvm/trunk/lib/CodeGen/RegisterScavenging.cpp

Modified: llvm/trunk/lib/CodeGen/RegisterScavenging.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/RegisterScavenging.cpp?rev=61237&r1=61236&r2=61237&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/RegisterScavenging.cpp (original)
+++ llvm/trunk/lib/CodeGen/RegisterScavenging.cpp Thu Dec 18 18:46:20 2008
@@ -112,6 +112,7 @@
   ScavengeRestore = NULL;
   CurrDist = 0;
   DistanceMap.clear();
+  ImplicitDefed.reset();
 
   // All registers started out unused.
   RegsAvailable.set();




From gohman at apple.com  Thu Dec 18 19:31:13 2008
From: gohman at apple.com (Dan Gohman)
Date: Thu, 18 Dec 2008 17:31:13 -0800
Subject: [llvm-commits] Patch to safely restore optimization to
	testcase	from PR3225 on x86
In-Reply-To: <f5aa3e9b0812162140v6d2db1e7m8a542866af36ab87@mail.gmail.com>
References: <f5aa3e9b0812162140v6d2db1e7m8a542866af36ab87@mail.gmail.com>
Message-ID: <C5BFCA77-FA65-4A43-B527-3491CFDD148D@apple.com>

 > +  if (KnownZero == VTBits) {

If the shift count is known to be all-zero, shouldn't it
have been simplified already by pre-legalize DAGCombine,
if not InstCombine?

Dan

On Dec 16, 2008, at 9:40 PM, Eli Friedman wrote:

> A little while ago, I committed a patch for PR3225 which disables a
> dangerous optimization for expanding double-width shifts (e.g. 64-bit
> shifts on x86).  This significantly pessimized the code generated on
> x86 for the cases which the optimization covered.
>
> The attached performs a similar optimization in x86 platform-specific
> code, which significantly improves code quality for the cases it
> covers; this version is safe because SHLD/SHRD do the right thing for
> shifts with a zero amount.
>
> Any comments?
>
> -Eli
> <x.txt>_______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From isanbard at gmail.com  Thu Dec 18 20:10:03 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 19 Dec 2008 02:10:03 -0000
Subject: [llvm-commits] [llvm] r61238 -
	/llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp
Message-ID: <200812190210.mBJ2A4Vc020832@zion.cs.uiuc.edu>

Author: void
Date: Thu Dec 18 20:09:57 2008
New Revision: 61238

URL: http://llvm.org/viewvc/llvm-project?rev=61238&view=rev
Log:
Perform this loop only when the -debug flag is specified.

Modified:
    llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp

Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp?rev=61238&r1=61237&r2=61238&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp (original)
+++ llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp Thu Dec 18 20:09:57 2008
@@ -2283,11 +2283,13 @@
   // Join (coalesce) intervals if requested.
   if (EnableJoining) {
     joinIntervals();
-    DOUT << "********** INTERVALS POST JOINING **********\n";
-    for (LiveIntervals::iterator I = li_->begin(), E = li_->end(); I != E; ++I){
-      I->second->print(DOUT, tri_);
-      DOUT << "\n";
-    }
+    DEBUG({
+        DOUT << "********** INTERVALS POST JOINING **********\n";
+        for (LiveIntervals::iterator I = li_->begin(), E = li_->end(); I != E; ++I){
+          I->second->print(DOUT, tri_);
+          DOUT << "\n";
+        }
+      });
   }
 
   // Perform a final pass over the instructions and compute spill weights




From baldrick at free.fr  Thu Dec 18 23:49:53 2008
From: baldrick at free.fr (Duncan Sands)
Date: Fri, 19 Dec 2008 06:49:53 +0100
Subject: [llvm-commits]
 =?iso-8859-1?q?Patch_to_safely_restore_optimizatio?=
 =?iso-8859-1?q?n_to_testcase=09from_PR3225_on_x86?=
In-Reply-To: <C5BFCA77-FA65-4A43-B527-3491CFDD148D@apple.com>
References: <f5aa3e9b0812162140v6d2db1e7m8a542866af36ab87@mail.gmail.com>
	<C5BFCA77-FA65-4A43-B527-3491CFDD148D@apple.com>
Message-ID: <200812190649.53303.baldrick@free.fr>

On Friday 19 December 2008 02:31:13 Dan Gohman wrote:
>  > +  if (KnownZero == VTBits) {
> 
> If the shift count is known to be all-zero, shouldn't it
> have been simplified already by pre-legalize DAGCombine,
> if not InstCombine?

What if it was introduced by LegalizeTypes itself?

Ciao,

Duncan.


From nicholas at mxc.ca  Fri Dec 19 00:39:19 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Fri, 19 Dec 2008 06:39:19 -0000
Subject: [llvm-commits] [llvm] r61239 - in /llvm/trunk: docs/LangRef.html
 include/llvm/Attributes.h lib/Analysis/BasicAliasAnalysis.cpp
 test/Analysis/BasicAA/nocapture.ll
Message-ID: <200812190639.mBJ6dMeR028570@zion.cs.uiuc.edu>

Author: nicholas
Date: Fri Dec 19 00:39:12 2008
New Revision: 61239

URL: http://llvm.org/viewvc/llvm-project?rev=61239&view=rev
Log:
Resubmit support for the 'nocapture' attribute.

The problematic part of this patch is that we were out of attribute bits,
requiring some fancy bit hacking to make it fit (by shrinking alignment)
without breaking existing users or the file format.

This change will require users to rebuild llvm-gcc to match llvm.

Added:
    llvm/trunk/test/Analysis/BasicAA/nocapture.ll
Modified:
    llvm/trunk/docs/LangRef.html
    llvm/trunk/include/llvm/Attributes.h
    llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp

Modified: llvm/trunk/docs/LangRef.html
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=61239&r1=61238&r2=61239&view=diff

==============================================================================
--- llvm/trunk/docs/LangRef.html (original)
+++ llvm/trunk/docs/LangRef.html Fri Dec 19 00:39:12 2008
@@ -894,9 +894,15 @@
     parameter.  The caller is responsible for ensuring that this is the
     case. On a function return value, <tt>noalias</tt> additionally indicates
     that the pointer does not alias any other pointers visible to the
-    caller. Note that this applies only to pointers that can be used to actually
-    load/store a value: NULL, unique pointers from malloc(0), and freed pointers
-    are considered to not alias anything.</dd>
+    caller. For further details, please see the discussion of the NoAlias
+    response in
+    <a href="http://llvm.org/docs/AliasAnalysis.html#MustMayNo">alias
+    analysis</a>.</dd>
+
+    <dt><tt>nocapture</tt></dt>
+    <dd>This indicates that the callee does not make any copies of the pointer
+    that outlive the callee itself. This is not a valid attribute for return
+    values.</dd>
 
     <dt><tt>nest</tt></dt>
     <dd>This indicates that the pointer parameter can be excised using the

Modified: llvm/trunk/include/llvm/Attributes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=61239&r1=61238&r2=61239&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Attributes.h (original)
+++ llvm/trunk/include/llvm/Attributes.h Fri Dec 19 00:39:12 2008
@@ -15,6 +15,7 @@
 #ifndef LLVM_ATTRIBUTES_H
 #define LLVM_ATTRIBUTES_H
 
+#include "llvm/Support/MathExtras.h"
 #include <cassert>
 #include <string>
 
@@ -23,7 +24,7 @@
 
 /// Attributes - A bitset of attributes.
 typedef unsigned Attributes;
-  
+
 namespace Attribute {
 
 /// Function parameters and results can have attributes to indicate how they 
@@ -44,16 +45,18 @@
 const Attributes Nest      = 1<<8;  ///< Nested function static chain
 const Attributes ReadNone  = 1<<9;  ///< Function does not access memory
 const Attributes ReadOnly  = 1<<10; ///< Function only reads from memory
-const Attributes NoInline        = 1<<11; // inline=never 
-const Attributes AlwaysInline    = 1<<12; // inline=always
-const Attributes OptimizeForSize = 1<<13; // opt_size
-const Attributes StackProtect    = 1<<14; // Stack protection.
-const Attributes StackProtectReq = 1<<15; // Stack protection required.
-const Attributes Alignment = 0xffff<<16; ///< Alignment of parameter (16 bits)
-                                    // 0 = unknown, else in clear (not log)
-                                    
+const Attributes NoInline        = 1<<11; ///< inline=never 
+const Attributes AlwaysInline    = 1<<12; ///< inline=always
+const Attributes OptimizeForSize = 1<<13; ///< opt_size
+const Attributes StackProtect    = 1<<14; ///< Stack protection.
+const Attributes StackProtectReq = 1<<15; ///< Stack protection required.
+const Attributes Alignment = 31<<16; ///< Alignment of parameter (5 bits)
+                                     // stored as log2 of alignment with +1 bias
+                                     // 0 means unaligned different from align 1
+const Attributes NoCapture = 1<<21; ///< Function creates no aliases of pointer
+
 /// @brief Attributes that only apply to function parameters.
-const Attributes ParameterOnly = ByVal | Nest | StructRet;
+const Attributes ParameterOnly = ByVal | Nest | StructRet | NoCapture;
 
 /// @brief Attributes that only apply to function.
 const Attributes FunctionOnly = NoReturn | NoUnwind | ReadNone | ReadOnly | 
@@ -64,7 +67,7 @@
 
 /// @brief Attributes that are mutually incompatible.
 const Attributes MutuallyIncompatible[4] = {
-  ByVal | InReg | Nest  | StructRet,
+  ByVal | InReg | Nest | StructRet,
   ZExt  | SExt,
   ReadNone | ReadOnly,
   NoInline | AlwaysInline
@@ -76,7 +79,13 @@
 /// This turns an int alignment (a power of 2, normally) into the
 /// form used internally in Attributes.
 inline Attributes constructAlignmentFromInt(unsigned i) {
-  return (i << 16);
+  // Default alignment, allow the target to define how to align it.
+  if (i == 0)
+    return 0;
+
+  assert(isPowerOf2_32(i) && "Alignment must be a power of two.");
+  assert(i <= 0x40000000 && "Alignment too large.");
+  return (Log2_32(i)+1) << 16;
 }
 
 /// The set of Attributes set in Attributes is converted to a
@@ -175,7 +184,11 @@
   /// getParamAlignment - Return the alignment for the specified function
   /// parameter.
   unsigned getParamAlignment(unsigned Idx) const {
-    return (getAttributes(Idx) & Attribute::Alignment) >> 16;
+    Attributes Align = getAttributes(Idx) & Attribute::Alignment;
+    if (Align == 0)
+      return 0;
+
+    return 1ull << ((Align >> 16) - 1);
   }
   
   /// hasAttrSomewhere - Return true if the specified attribute is set for at

Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=61239&r1=61238&r2=61239&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original)
+++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Fri Dec 19 00:39:12 2008
@@ -63,12 +63,23 @@
       // callees could modify it.
       break; // next use
     case Instruction::Call:
-      // If the call is to a few known safe intrinsics, we know that it does
-      // not escape.
-      // TODO: Eventually just check the 'nocapture' attribute.
-      if (!isa<MemIntrinsic>(I))
-        return true;
-      break;  // next use
+      // If the argument to the call has the nocapture attribute, then the call
+      // may store or load to the pointer, but it cannot escape.
+      if (cast<CallInst>(I)->paramHasAttr(UI.getOperandNo(), 
+                                          Attribute::NoCapture))
+        continue;
+
+      // FIXME: MemIntrinsics should have their operands marked nocapture!
+      if (isa<MemIntrinsic>(I))
+        continue;  // next use
+      return true;
+    case Instruction::Invoke:
+      // If the argument to the call has the nocapture attribute, then the call
+      // may store or load to the pointer, but it cannot escape.
+      if (cast<InvokeInst>(I)->paramHasAttr(UI.getOperandNo()-2,
+                                            Attribute::NoCapture))
+        continue;
+      return true;
     default:
       return true;
     }

Added: llvm/trunk/test/Analysis/BasicAA/nocapture.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/BasicAA/nocapture.ll?rev=61239&view=auto

==============================================================================
--- llvm/trunk/test/Analysis/BasicAA/nocapture.ll (added)
+++ llvm/trunk/test/Analysis/BasicAA/nocapture.ll Fri Dec 19 00:39:12 2008
@@ -0,0 +1,14 @@
+; RUN: llvm-as < %s | opt -basicaa -gvn -instcombine | llvm-dis | grep {ret i32 0}
+
+declare i32* @test(i32* nocapture)
+
+define i32 @test2() {
+       %P = alloca i32
+       %Q = call i32* @test(i32* %P)
+       %a = load i32* %P
+       store i32 4, i32* %Q   ;; cannot clobber P since it is nocapture.
+       %b = load i32* %P
+       %c = sub i32 %a, %b
+       ret i32 %c
+}
+




From nicholas at mxc.ca  Fri Dec 19 00:39:54 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Thu, 18 Dec 2008 22:39:54 -0800
Subject: [llvm-commits] [llvm] r61094 - in
 /llvm/trunk:	docs/AliasAnalysis.html
 docs/LangRef.html	include/llvm/Attributes.h
 lib/Analysis/BasicAliasAnalysis.cpp lib/AsmParser/LLLexer.cpp
 lib/AsmParser/llvmAsmParser.y	lib/Bitcode/Reader/BitcodeReader.cpp li
In-Reply-To: <16e5fdf90812181551ub7f3bd1t4790028dae64f2b@mail.gmail.com>
References: <16e5fdf90812181551ub7f3bd1t4790028dae64f2b@mail.gmail.com>
Message-ID: <494B41BA.5070205@mxc.ca>

Bill Wendling wrote:
> Hi Nick,
> 
> I tested this on my PPC machine and it works. Go ahead and submit it.
> Thanks for looking into this!

Done! Thanks for the testing!

Nick

> -bw
> 
> On Wed, Dec 17, 2008 at 9:04 PM, Nick Lewycky <nicholas at mxc.ca> wrote:
>> Hi Bill,
>>
>> I was never able to reproduce the problem, but I think I found the fix by
>> inspection. Would you please test out the attached patch?
>>
>> The bug was that constructAlignmentFromInt was asserting that its input was
>> a power of 2, which 0 is not. Zero is a valid alignment, and is explicitly
>> set by llvm-gcc when passing structs byval on OS X.
>>
>> Nick
>>
>> Bill Wendling wrote:
>>> Author: void
>>> Date: Tue Dec 16 13:06:48 2008
>>> New Revision: 61094
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=61094&view=rev
>>> Log:
>>> Temporarily revert r61019, r61030, and r61040. These were breaking LLVM
>>> Release
>>> builds.
>>>
>>> Modified:
>>>    llvm/trunk/docs/AliasAnalysis.html
>>>    llvm/trunk/docs/LangRef.html
>>>    llvm/trunk/include/llvm/Attributes.h
>>>    llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
>>>    llvm/trunk/lib/AsmParser/LLLexer.cpp
>>>    llvm/trunk/lib/AsmParser/llvmAsmParser.y
>>>    llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
>>>    llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
>>>    llvm/trunk/lib/VMCore/Attributes.cpp
>>>    llvm/trunk/test/Analysis/BasicAA/nocapture.ll
>>>
>>> Modified: llvm/trunk/docs/AliasAnalysis.html
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/AliasAnalysis.html?rev=61094&r1=61093&r2=61094&view=diff
>>>
>>>
>>> ==============================================================================
>>> --- llvm/trunk/docs/AliasAnalysis.html (original)
>>> +++ llvm/trunk/docs/AliasAnalysis.html Tue Dec 16 13:06:48 2008
>>> @@ -192,11 +192,11 @@
>>>   <div class="doc_text">
>>>  <p>The NoAlias response is used when the two pointers refer to distinct
>>> objects,
>>> -regardless of whether the pointers compare equal.  For example, freed
>>> pointers
>>> -don't alias any pointers that were allocated afterwards.  As a degenerate
>>> case,
>>> -pointers returned by malloc(0) have no bytes for an object, and are
>>> considered
>>> -NoAlias even when malloc returns the same pointer.  The same rule applies
>>> to
>>> -NULL pointers.</p>
>>> +even regardless of whether the pointers compare equal.  For example,
>>> freed
>>> +pointers don't alias any pointers that were allocated afterwards.  As a
>>> +degenerate case, pointers returned by malloc(0) have no bytes for an
>>> object,
>>> +and are considered NoAlias even when malloc returns the same pointer.
>>>  The same
>>> +rule applies to NULL pointers.</p>
>>>   <p>The MayAlias response is used whenever the two pointers might refer
>>> to the
>>>  same object.  If the two memory objects overlap, but do not start at the
>>> same
>>>
>>> Modified: llvm/trunk/docs/LangRef.html
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=61094&r1=61093&r2=61094&view=diff
>>>
>>>
>>> ==============================================================================
>>> --- llvm/trunk/docs/LangRef.html (original)
>>> +++ llvm/trunk/docs/LangRef.html Tue Dec 16 13:06:48 2008
>>> @@ -894,15 +894,9 @@
>>>     parameter.  The caller is responsible for ensuring that this is the
>>>     case. On a function return value, <tt>noalias</tt> additionally
>>> indicates
>>>     that the pointer does not alias any other pointers visible to the
>>> -    caller. For further details, please see the discussion of the NoAlias
>>> -    response in
>>> -    <a href="http://llvm.org/docs/AliasAnalysis.html#MustMayNo">alias
>>> -    analysis</a>.</dd>
>>> -
>>> -    <dt><tt>nocapture</tt></dt>
>>> -    <dd>This indicates that the callee does not make any copies of the
>>> pointer
>>> -    that outlive the callee itself. This is not a valid attribute for
>>> return
>>> -    values.</dd>
>>> +    caller. Note that this applies only to pointers that can be used to
>>> actually
>>> +    load/store a value: NULL, unique pointers from malloc(0), and freed
>>> pointers
>>> +    are considered to not alias anything.</dd>
>>>       <dt><tt>nest</tt></dt>
>>>     <dd>This indicates that the pointer parameter can be excised using the
>>>
>>> Modified: llvm/trunk/include/llvm/Attributes.h
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=61094&r1=61093&r2=61094&view=diff
>>>
>>>
>>> ==============================================================================
>>> --- llvm/trunk/include/llvm/Attributes.h (original)
>>> +++ llvm/trunk/include/llvm/Attributes.h Tue Dec 16 13:06:48 2008
>>> @@ -15,7 +15,6 @@
>>>  #ifndef LLVM_ATTRIBUTES_H
>>>  #define LLVM_ATTRIBUTES_H
>>>  -#include "llvm/Support/MathExtras.h"
>>>  #include <cassert>
>>>  #include <string>
>>>  @@ -24,7 +23,7 @@
>>>   /// Attributes - A bitset of attributes.
>>>  typedef unsigned Attributes;
>>> -
>>> +   namespace Attribute {
>>>   /// Function parameters and results can have attributes to indicate how
>>> they @@ -45,18 +44,16 @@
>>>  const Attributes Nest      = 1<<8;  ///< Nested function static chain
>>>  const Attributes ReadNone  = 1<<9;  ///< Function does not access memory
>>>  const Attributes ReadOnly  = 1<<10; ///< Function only reads from memory
>>> -const Attributes NoInline        = 1<<11; ///< inline=never -const
>>> Attributes AlwaysInline    = 1<<12; ///< inline=always
>>> -const Attributes OptimizeForSize = 1<<13; ///< opt_size
>>> -const Attributes StackProtect    = 1<<14; ///< Stack protection.
>>> -const Attributes StackProtectReq = 1<<15; ///< Stack protection required.
>>> -const Attributes Alignment = 31<<16; ///< Alignment of parameter (5 bits)
>>> -                                     // stored as log2 of alignment with
>>> +1 bias
>>> -                                     // 0 means unaligned different from
>>> align 1
>>> -const Attributes NoCapture = 1<<21; ///< Function creates no aliases of
>>> pointer
>>> -
>>> +const Attributes NoInline        = 1<<11; // inline=never +const
>>> Attributes AlwaysInline    = 1<<12; // inline=always
>>> +const Attributes OptimizeForSize = 1<<13; // opt_size
>>> +const Attributes StackProtect    = 1<<14; // Stack protection.
>>> +const Attributes StackProtectReq = 1<<15; // Stack protection required.
>>> +const Attributes Alignment = 0xffff<<16; ///< Alignment of parameter (16
>>> bits)
>>> +                                    // 0 = unknown, else in clear (not
>>> log)
>>> +                                     /// @brief Attributes that only
>>> apply to function parameters.
>>> -const Attributes ParameterOnly = ByVal | Nest | StructRet | NoCapture;
>>> +const Attributes ParameterOnly = ByVal | Nest | StructRet;
>>>   /// @brief Attributes that only apply to function.
>>>  const Attributes FunctionOnly = NoReturn | NoUnwind | ReadNone | ReadOnly
>>> | @@ -67,7 +64,7 @@
>>>   /// @brief Attributes that are mutually incompatible.
>>>  const Attributes MutuallyIncompatible[4] = {
>>> -  ByVal | InReg | Nest | StructRet,
>>> +  ByVal | InReg | Nest  | StructRet,
>>>   ZExt  | SExt,
>>>   ReadNone | ReadOnly,
>>>   NoInline | AlwaysInline
>>> @@ -79,9 +76,7 @@
>>>  /// This turns an int alignment (a power of 2, normally) into the
>>>  /// form used internally in Attributes.
>>>  inline Attributes constructAlignmentFromInt(unsigned i) {
>>> -  assert(isPowerOf2_32(i) && "Alignment must be a power of two.");
>>> -  assert(i <= 0x40000000 && "Alignment too large.");
>>> -  return (Log2_32(i)+1) << 16;
>>> +  return (i << 16);
>>>  }
>>>   /// The set of Attributes set in Attributes is converted to a
>>> @@ -180,7 +175,7 @@
>>>   /// getParamAlignment - Return the alignment for the specified function
>>>   /// parameter.
>>>   unsigned getParamAlignment(unsigned Idx) const {
>>> -    return 1ull << (((getAttributes(Idx) & Attribute::Alignment) >> 16) -
>>> 1);
>>> +    return (getAttributes(Idx) & Attribute::Alignment) >> 16;
>>>   }
>>>     /// hasAttrSomewhere - Return true if the specified attribute is set
>>> for at
>>>
>>> Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=61094&r1=61093&r2=61094&view=diff
>>>
>>>
>>> ==============================================================================
>>> --- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original)
>>> +++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Tue Dec 16 13:06:48
>>> 2008
>>> @@ -63,23 +63,12 @@
>>>       // callees could modify it.
>>>       break; // next use
>>>     case Instruction::Call:
>>> -      // If the argument to the call has the nocapture attribute, then
>>> the call
>>> -      // may store or load to the pointer, but it cannot escape.
>>> -      if (cast<CallInst>(I)->paramHasAttr(UI.getOperandNo(), -
>>>                                Attribute::NoCapture))
>>> -        continue;
>>> -
>>> -      // FIXME: MemIntrinsics should have their operands marked
>>> nocapture!
>>> -      if (isa<MemIntrinsic>(I))
>>> -        continue;  // next use
>>> -      return true;
>>> -    case Instruction::Invoke:
>>> -      // If the argument to the call has the nocapture attribute, then
>>> the call
>>> -      // may store or load to the pointer, but it cannot escape.
>>> -      if (cast<InvokeInst>(I)->paramHasAttr(UI.getOperandNo()-2,
>>> -                                            Attribute::NoCapture))
>>> -        continue;
>>> -      return true;
>>> +      // If the call is to a few known safe intrinsics, we know that it
>>> does
>>> +      // not escape.
>>> +      // TODO: Eventually just check the 'nocapture' attribute.
>>> +      if (!isa<MemIntrinsic>(I))
>>> +        return true;
>>> +      break;  // next use
>>>     default:
>>>       return true;
>>>     }
>>>
>>> Modified: llvm/trunk/lib/AsmParser/LLLexer.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLLexer.cpp?rev=61094&r1=61093&r2=61094&view=diff
>>>
>>>
>>> ==============================================================================
>>> --- llvm/trunk/lib/AsmParser/LLLexer.cpp (original)
>>> +++ llvm/trunk/lib/AsmParser/LLLexer.cpp Tue Dec 16 13:06:48 2008
>>> @@ -491,7 +491,6 @@
>>>   KEYWORD("nounwind", NOUNWIND);
>>>   KEYWORD("noreturn", NORETURN);
>>>   KEYWORD("noalias", NOALIAS);
>>> -  KEYWORD("nocapture", NOCAPTURE);
>>>   KEYWORD("byval", BYVAL);
>>>   KEYWORD("nest", NEST);
>>>   KEYWORD("readnone", READNONE);
>>>
>>> Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=61094&r1=61093&r2=61094&view=diff
>>>
>>>
>>> ==============================================================================
>>> --- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
>>> +++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Tue Dec 16 13:06:48 2008
>>> @@ -1136,8 +1136,8 @@
>>>  %token <OtherOpVal> EXTRACTVALUE INSERTVALUE
>>>   // Function Attributes
>>> -%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS NOCAPTURE
>>> BYVAL
>>> -%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ NEST
>>> +%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST
>>> +%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ
>>>   // Visibility Styles
>>>  %token DEFAULT HIDDEN PROTECTED
>>> @@ -1265,16 +1265,15 @@
>>>                   CHECK_FOR_ERROR
>>>                  };
>>>  -Attribute     : ZEROEXT   { $$ = Attribute::ZExt;      }
>>> -              | ZEXT      { $$ = Attribute::ZExt;      }
>>> -              | SIGNEXT   { $$ = Attribute::SExt;      }
>>> -              | SEXT      { $$ = Attribute::SExt;      }
>>> -              | INREG     { $$ = Attribute::InReg;     }
>>> -              | SRET      { $$ = Attribute::StructRet; }
>>> -              | NOALIAS   { $$ = Attribute::NoAlias;   }
>>> -              | NOCAPTURE { $$ = Attribute::NoCapture; }
>>> -              | BYVAL     { $$ = Attribute::ByVal;     }
>>> -              | NEST      { $$ = Attribute::Nest;      }
>>> +Attribute     : ZEROEXT { $$ = Attribute::ZExt;      }
>>> +              | ZEXT    { $$ = Attribute::ZExt;      }
>>> +              | SIGNEXT { $$ = Attribute::SExt;      }
>>> +              | SEXT    { $$ = Attribute::SExt;      }
>>> +              | INREG   { $$ = Attribute::InReg;     }
>>> +              | SRET    { $$ = Attribute::StructRet; }
>>> +              | NOALIAS { $$ = Attribute::NoAlias;   }
>>> +              | BYVAL   { $$ = Attribute::ByVal;     }
>>> +              | NEST    { $$ = Attribute::Nest;      }
>>>               | ALIGN EUINT64VAL { $$ =
>>>                           Attribute::constructAlignmentFromInt($2);    }
>>>               ;
>>> @@ -1332,8 +1331,6 @@
>>>   $$ = $2;
>>>   if ($$ != 0 && !isPowerOf2_32($$))
>>>     GEN_ERROR("Alignment must be a power of two");
>>> -  if ($$ > 0x40000000)
>>> -    GEN_ERROR("Alignment too large");
>>>   CHECK_FOR_ERROR
>>>  };
>>>  OptCAlign : /*empty*/            { $$ = 0; } |
>>> @@ -1341,8 +1338,6 @@
>>>   $$ = $3;
>>>   if ($$ != 0 && !isPowerOf2_32($$))
>>>     GEN_ERROR("Alignment must be a power of two");
>>> -  if ($$ > 0x40000000)
>>> -    GEN_ERROR("Alignment too large");
>>>   CHECK_FOR_ERROR
>>>  };
>>>  @@ -1372,8 +1367,6 @@
>>>   | ALIGN EUINT64VAL {
>>>     if ($2 != 0 && !isPowerOf2_32($2))
>>>       GEN_ERROR("Alignment must be a power of two");
>>> -    if ($2 > 0x40000000)
>>> -      GEN_ERROR("Alignment too large");
>>>     CurGV->setAlignment($2);
>>>     CHECK_FOR_ERROR
>>>   };
>>>
>>> Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=61094&r1=61093&r2=61094&view=diff
>>>
>>>
>>> ==============================================================================
>>> --- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
>>> +++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Tue Dec 16 13:06:48
>>> 2008
>>> @@ -362,20 +362,6 @@
>>>       Attributes RetAttribute = Attribute::None;
>>>       Attributes FnAttribute = Attribute::None;
>>>       for (unsigned i = 0, e = Record.size(); i != e; i += 2) {
>>> -        // FIXME: remove in LLVM 3.0
>>> -        // The alignment is stored as a 16-bit raw value from bits
>>> 31--16.
>>> -        // We shift the bits above 31 down by 11 bits.
>>> -
>>> -        unsigned Alignment = (Record[i+1] & (0xffffull << 16)) >> 16;
>>> -        if (Alignment && !isPowerOf2_32(Alignment))
>>> -          return Error("Alignment is not a power of two.");
>>> -
>>> -        Attributes ReconstitutedAttr = Record[i+1] & 0xffff;
>>> -        if (Alignment)
>>> -          ReconstitutedAttr |=
>>> Attribute::constructAlignmentFromInt(Alignment);
>>> -        ReconstitutedAttr |= (Record[i+1] & (0xffffull << 32)) >> 11;
>>> -        Record[i+1] = ReconstitutedAttr;
>>> -
>>>         if (Record[i] == 0)
>>>           RetAttribute = Record[i+1];
>>>         else if (Record[i] == ~0U)
>>>
>>> Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=61094&r1=61093&r2=61094&view=diff
>>>
>>>
>>> ==============================================================================
>>> --- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
>>> +++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Tue Dec 16 13:06:48
>>> 2008
>>> @@ -122,17 +122,7 @@
>>>     for (unsigned i = 0, e = A.getNumSlots(); i != e; ++i) {
>>>       const AttributeWithIndex &PAWI = A.getSlot(i);
>>>       Record.push_back(PAWI.Index);
>>> -
>>> -      // FIXME: remove in LLVM 3.0
>>> -      // Store the alignment in the bitcode as a 16-bit raw value instead
>>> of a
>>> -      // 5-bit log2 encoded value. Shift the bits above the alignment up
>>> by
>>> -      // 11 bits.
>>> -      uint64_t FauxAttr = PAWI.Attrs & 0xffff;
>>> -      if (PAWI.Attrs & Attribute::Alignment)
>>> -        FauxAttr |= (1ull<<16)<<(((PAWI.Attrs & Attribute::Alignment)-1)
>>>>> 16);
>>> -      FauxAttr |= (PAWI.Attrs & (0x3FFull << 21)) << 11;
>>> -
>>> -      Record.push_back(FauxAttr);
>>> +      Record.push_back(PAWI.Attrs);
>>>     }
>>>         Stream.EmitRecord(bitc::PARAMATTR_CODE_ENTRY, Record);
>>>
>>> Modified: llvm/trunk/lib/VMCore/Attributes.cpp
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?rev=61094&r1=61093&r2=61094&view=diff
>>>
>>>
>>> ==============================================================================
>>> --- llvm/trunk/lib/VMCore/Attributes.cpp (original)
>>> +++ llvm/trunk/lib/VMCore/Attributes.cpp Tue Dec 16 13:06:48 2008
>>> @@ -37,8 +37,6 @@
>>>     Result += "inreg ";
>>>   if (Attrs & Attribute::NoAlias)
>>>     Result += "noalias ";
>>> -  if (Attrs & Attribute::NoCapture)
>>> -    Result += "nocapture ";
>>>   if (Attrs & Attribute::StructRet)
>>>     Result += "sret ";     if (Attrs & Attribute::ByVal)
>>> @@ -61,11 +59,10 @@
>>>     Result += "sspreq ";
>>>   if (Attrs & Attribute::Alignment) {
>>>     Result += "align ";
>>> -    Result += utostr(1ull << (((Attrs & Attribute::Alignment)>>16) - 1));
>>> +    Result += utostr((Attrs & Attribute::Alignment) >> 16);
>>>     Result += " ";
>>>   }
>>>   // Trim the trailing space.
>>> -  assert(!Result.empty() && "Unknown attribute!");
>>>   Result.erase(Result.end()-1);
>>>   return Result;
>>>  }
>>> @@ -79,7 +76,7 @@
>>>     if (!isa<PointerType>(Ty))
>>>     // Attributes that only apply to pointers.
>>> -    Incompatible |= ByVal | Nest | NoAlias | StructRet | NoCapture;
>>> +    Incompatible |= ByVal | Nest | NoAlias | StructRet;
>>>     return Incompatible;
>>>  }
>>>
>>> Modified: llvm/trunk/test/Analysis/BasicAA/nocapture.ll
>>> URL:
>>> http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/BasicAA/nocapture.ll?rev=61094&r1=61093&r2=61094&view=diff
>>>
>>>
>>> ==============================================================================
>>> --- llvm/trunk/test/Analysis/BasicAA/nocapture.ll (original)
>>> +++ llvm/trunk/test/Analysis/BasicAA/nocapture.ll Tue Dec 16 13:06:48 2008
>>> @@ -1,13 +0,0 @@
>>> -; RUN: llvm-as < %s | opt -basicaa -gvn -instcombine | llvm-dis | grep
>>> {ret i32 0}
>>> -
>>> -declare i32* @test(i32* nocapture)
>>> -
>>> -define i32 @test2() {
>>> -       %P = alloca i32
>>> -       %Q = call i32* @test(i32* %P)
>>> -       %a = load i32* %P
>>> -       store i32 4, i32* %Q   ;; cannot clobber P since it is nocapture.
>>> -       %b = load i32* %P
>>> -       %c = sub i32 %a, %b
>>> -       ret i32 %c
>>> -}
>>>
>>>
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at cs.uiuc.edu
>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> 



From eli.friedman at gmail.com  Fri Dec 19 01:42:24 2008
From: eli.friedman at gmail.com (Eli Friedman)
Date: Thu, 18 Dec 2008 23:42:24 -0800
Subject: [llvm-commits] Patch to safely restore optimization to testcase
	from PR3225 on x86
In-Reply-To: <C5BFCA77-FA65-4A43-B527-3491CFDD148D@apple.com>
References: <f5aa3e9b0812162140v6d2db1e7m8a542866af36ab87@mail.gmail.com>
	<C5BFCA77-FA65-4A43-B527-3491CFDD148D@apple.com>
Message-ID: <f5aa3e9b0812182342m635fd228j63658d0fc1722877@mail.gmail.com>

On Thu, Dec 18, 2008 at 5:31 PM, Dan Gohman <gohman at apple.com> wrote:
>  > +  if (KnownZero == VTBits) {
>
> If the shift count is known to be all-zero, shouldn't it
> have been simplified already by pre-legalize DAGCombine,
> if not InstCombine?

The masked bits check is only checking the top bit, i.e. whether the
shift amount is < 32 or >= 32.

-Eli


From isanbard at gmail.com  Fri Dec 19 02:02:46 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 19 Dec 2008 00:02:46 -0800
Subject: [llvm-commits] [llvm] r61239 - in /llvm/trunk:
	docs/LangRef.html include/llvm/Attributes.h
	lib/Analysis/BasicAliasAnalysis.cpp
	test/Analysis/BasicAA/nocapture.ll
In-Reply-To: <200812190639.mBJ6dMeR028570@zion.cs.uiuc.edu>
References: <200812190639.mBJ6dMeR028570@zion.cs.uiuc.edu>
Message-ID: <AE697877-5150-4AA1-A0D5-157F870D83A3@gmail.com>

Nicholas,

This is causing more failures:

Running /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/ 
Analysis/BasicAA/dg.exp ...
FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/ 
Analysis/BasicAA/nocapture.ll
Failed with exit(1) at line 1
while running:  llvm-as < /Volumes/Sandbox/Buildbot/llvm/full-llvm/ 
build/llvmCore/test/Analysis/BasicAA/nocapture.ll |  opt -basicaa -gvn  
-instcombine |  llvm-dis | /usr/bin/grep {ret i32 0}
llvm-as: <stdin>:3,0: <stdin>:3: error: syntax error, unexpected  
$undefined, expecting ')' while reading token: 'n'
opt: Invalid bitcode signature
llvm-dis: Invalid bitcode signature

Running /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/ 
FrontendC/dg.exp ...
FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/ 
FrontendC/2002-02-13-UnnamedLocal.c
Failed with signal(SIGABRT) at line 1
while running: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/ 
llvmgcc42.roots/llvmgcc42~dst/Developer/usr/bin/llvm-gcc-4.2 -fstrict- 
aliasing -Wstrict-aliasing -I/usr/include/c++/4.0.0/i686-apple-darwin9  
-I/usr/include/c++/4.0.0 -emit-llvm -w -S /Volumes/Sandbox/Buildbot/ 
llvm/full-llvm/build/llvmCore/test/FrontendC/2002-02-13-UnnamedLocal.c  
-o - |  llvm-as -f -o /dev/null
Assertion failed: (isPowerOf2_32(i) && "Alignment must be a power of  
two."), function constructAlignmentFromInt, file /Volumes/Sandbox/ 
Buildbot/llvm/full-llvm/build/llvmCore/include/llvm/Attributes.h, line  
86.
0   llvm-as           0x0017999f llvm::sys::SetInterruptFunction(void  
(*)()) + 591
1   libSystem.B.dylib 0x91e592bb _sigtramp + 43
2   libSystem.B.dylib 0xffffffff _sigtramp + 1847225711
3   libSystem.B.dylib 0x91ecd23a raise + 26
4   libSystem.B.dylib 0x91ed9679 abort + 73
5   libSystem.Bmake[1]: *** [check-local] Error 1
make: *** [check] Error 2

This is on Darwin x86.

-bw

On Dec 18, 2008, at 10:39 PM, Nick Lewycky wrote:

> Author: nicholas
> Date: Fri Dec 19 00:39:12 2008
> New Revision: 61239
>
> URL: http://llvm.org/viewvc/llvm-project?rev=61239&view=rev
> Log:
> Resubmit support for the 'nocapture' attribute.
>
> The problematic part of this patch is that we were out of attribute  
> bits,
> requiring some fancy bit hacking to make it fit (by shrinking  
> alignment)
> without breaking existing users or the file format.
>
> This change will require users to rebuild llvm-gcc to match llvm.
>
> Added:
>    llvm/trunk/test/Analysis/BasicAA/nocapture.ll
> Modified:
>    llvm/trunk/docs/LangRef.html
>    llvm/trunk/include/llvm/Attributes.h
>    llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
>
> Modified: llvm/trunk/docs/LangRef.html
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=61239&r1=61238&r2=61239&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/docs/LangRef.html (original)
> +++ llvm/trunk/docs/LangRef.html Fri Dec 19 00:39:12 2008
> @@ -894,9 +894,15 @@
>     parameter.  The caller is responsible for ensuring that this is  
> the
>     case. On a function return value, <tt>noalias</tt> additionally  
> indicates
>     that the pointer does not alias any other pointers visible to the
> -    caller. Note that this applies only to pointers that can be  
> used to actually
> -    load/store a value: NULL, unique pointers from malloc(0), and  
> freed pointers
> -    are considered to not alias anything.</dd>
> +    caller. For further details, please see the discussion of the  
> NoAlias
> +    response in
> +    <a href="http://llvm.org/docs/AliasAnalysis.html#MustMayNo">alias
> +    analysis</a>.</dd>
> +
> +    <dt><tt>nocapture</tt></dt>
> +    <dd>This indicates that the callee does not make any copies of  
> the pointer
> +    that outlive the callee itself. This is not a valid attribute  
> for return
> +    values.</dd>
>
>     <dt><tt>nest</tt></dt>
>     <dd>This indicates that the pointer parameter can be excised  
> using the
>
> Modified: llvm/trunk/include/llvm/Attributes.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=61239&r1=61238&r2=61239&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/include/llvm/Attributes.h (original)
> +++ llvm/trunk/include/llvm/Attributes.h Fri Dec 19 00:39:12 2008
> @@ -15,6 +15,7 @@
> #ifndef LLVM_ATTRIBUTES_H
> #define LLVM_ATTRIBUTES_H
>
> +#include "llvm/Support/MathExtras.h"
> #include <cassert>
> #include <string>
>
> @@ -23,7 +24,7 @@
>
> /// Attributes - A bitset of attributes.
> typedef unsigned Attributes;
> -
> +
> namespace Attribute {
>
> /// Function parameters and results can have attributes to indicate  
> how they
> @@ -44,16 +45,18 @@
> const Attributes Nest      = 1<<8;  ///< Nested function static chain
> const Attributes ReadNone  = 1<<9;  ///< Function does not access  
> memory
> const Attributes ReadOnly  = 1<<10; ///< Function only reads from  
> memory
> -const Attributes NoInline        = 1<<11; // inline=never
> -const Attributes AlwaysInline    = 1<<12; // inline=always
> -const Attributes OptimizeForSize = 1<<13; // opt_size
> -const Attributes StackProtect    = 1<<14; // Stack protection.
> -const Attributes StackProtectReq = 1<<15; // Stack protection  
> required.
> -const Attributes Alignment = 0xffff<<16; ///< Alignment of  
> parameter (16 bits)
> -                                    // 0 = unknown, else in clear  
> (not log)
> -
> +const Attributes NoInline        = 1<<11; ///< inline=never
> +const Attributes AlwaysInline    = 1<<12; ///< inline=always
> +const Attributes OptimizeForSize = 1<<13; ///< opt_size
> +const Attributes StackProtect    = 1<<14; ///< Stack protection.
> +const Attributes StackProtectReq = 1<<15; ///< Stack protection  
> required.
> +const Attributes Alignment = 31<<16; ///< Alignment of parameter (5  
> bits)
> +                                     // stored as log2 of alignment  
> with +1 bias
> +                                     // 0 means unaligned different  
> from align 1
> +const Attributes NoCapture = 1<<21; ///< Function creates no  
> aliases of pointer
> +
> /// @brief Attributes that only apply to function parameters.
> -const Attributes ParameterOnly = ByVal | Nest | StructRet;
> +const Attributes ParameterOnly = ByVal | Nest | StructRet |  
> NoCapture;
>
> /// @brief Attributes that only apply to function.
> const Attributes FunctionOnly = NoReturn | NoUnwind | ReadNone |  
> ReadOnly |
> @@ -64,7 +67,7 @@
>
> /// @brief Attributes that are mutually incompatible.
> const Attributes MutuallyIncompatible[4] = {
> -  ByVal | InReg | Nest  | StructRet,
> +  ByVal | InReg | Nest | StructRet,
>   ZExt  | SExt,
>   ReadNone | ReadOnly,
>   NoInline | AlwaysInline
> @@ -76,7 +79,13 @@
> /// This turns an int alignment (a power of 2, normally) into the
> /// form used internally in Attributes.
> inline Attributes constructAlignmentFromInt(unsigned i) {
> -  return (i << 16);
> +  // Default alignment, allow the target to define how to align it.
> +  if (i == 0)
> +    return 0;
> +
> +  assert(isPowerOf2_32(i) && "Alignment must be a power of two.");
> +  assert(i <= 0x40000000 && "Alignment too large.");
> +  return (Log2_32(i)+1) << 16;
> }
>
> /// The set of Attributes set in Attributes is converted to a
> @@ -175,7 +184,11 @@
>   /// getParamAlignment - Return the alignment for the specified  
> function
>   /// parameter.
>   unsigned getParamAlignment(unsigned Idx) const {
> -    return (getAttributes(Idx) & Attribute::Alignment) >> 16;
> +    Attributes Align = getAttributes(Idx) & Attribute::Alignment;
> +    if (Align == 0)
> +      return 0;
> +
> +    return 1ull << ((Align >> 16) - 1);
>   }
>
>   /// hasAttrSomewhere - Return true if the specified attribute is  
> set for at
>
> Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=61239&r1=61238&r2=61239&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original)
> +++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Fri Dec 19  
> 00:39:12 2008
> @@ -63,12 +63,23 @@
>       // callees could modify it.
>       break; // next use
>     case Instruction::Call:
> -      // If the call is to a few known safe intrinsics, we know  
> that it does
> -      // not escape.
> -      // TODO: Eventually just check the 'nocapture' attribute.
> -      if (!isa<MemIntrinsic>(I))
> -        return true;
> -      break;  // next use
> +      // If the argument to the call has the nocapture attribute,  
> then the call
> +      // may store or load to the pointer, but it cannot escape.
> +      if (cast<CallInst>(I)->paramHasAttr(UI.getOperandNo(),
> +                                          Attribute::NoCapture))
> +        continue;
> +
> +      // FIXME: MemIntrinsics should have their operands marked  
> nocapture!
> +      if (isa<MemIntrinsic>(I))
> +        continue;  // next use
> +      return true;
> +    case Instruction::Invoke:
> +      // If the argument to the call has the nocapture attribute,  
> then the call
> +      // may store or load to the pointer, but it cannot escape.
> +      if (cast<InvokeInst>(I)->paramHasAttr(UI.getOperandNo()-2,
> +                                            Attribute::NoCapture))
> +        continue;
> +      return true;
>     default:
>       return true;
>     }
>
> Added: llvm/trunk/test/Analysis/BasicAA/nocapture.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/BasicAA/nocapture.ll?rev=61239&view=auto
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/test/Analysis/BasicAA/nocapture.ll (added)
> +++ llvm/trunk/test/Analysis/BasicAA/nocapture.ll Fri Dec 19  
> 00:39:12 2008
> @@ -0,0 +1,14 @@
> +; RUN: llvm-as < %s | opt -basicaa -gvn -instcombine | llvm-dis |  
> grep {ret i32 0}
> +
> +declare i32* @test(i32* nocapture)
> +
> +define i32 @test2() {
> +       %P = alloca i32
> +       %Q = call i32* @test(i32* %P)
> +       %a = load i32* %P
> +       store i32 4, i32* %Q   ;; cannot clobber P since it is  
> nocapture.
> +       %b = load i32* %P
> +       %c = sub i32 %a, %b
> +       ret i32 %c
> +}
> +
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From isanbard at gmail.com  Fri Dec 19 02:03:41 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 19 Dec 2008 00:03:41 -0800
Subject: [llvm-commits] [llvm] r61094 - in
	/llvm/trunk:	docs/AliasAnalysis.html
	docs/LangRef.html	include/llvm/Attributes.h
	lib/Analysis/BasicAliasAnalysis.cpp lib/AsmParser/LLLexer.cpp
	lib/AsmParser/llvmAsmParser.y	lib/Bitcode/Reader/BitcodeReader.cpp
	li
In-Reply-To: <494B41BA.5070205@mxc.ca>
References: <16e5fdf90812181551ub7f3bd1t4790028dae64f2b@mail.gmail.com>
	<494B41BA.5070205@mxc.ca>
Message-ID: <01575DF7-B9A1-407D-9E09-3447F9D189D2@gmail.com>

On Dec 18, 2008, at 10:39 PM, Nick Lewycky wrote:

> Bill Wendling wrote:
>> Hi Nick,
>>
>> I tested this on my PPC machine and it works. Go ahead and submit it.
>> Thanks for looking into this!
>
> Done! Thanks for the testing!
>
I spoke too soon. (-_-) It bootstrapped, but I didn't run "make check".

-bw



From monping at apple.com  Fri Dec 19 02:09:43 2008
From: monping at apple.com (Mon Ping Wang)
Date: Fri, 19 Dec 2008 00:09:43 -0800
Subject: [llvm-commits] Patch: x86 shuffle patch for v8i16 and v16i8
Message-ID: <A7AE7E6C-A80C-45F5-8F8C-71EAB8632DB6@apple.com>

Hi,

This patch is to fix two issues
   - PromoteSplat generate the same code for splats of an element  to  
v8i16 and v16i8 irregardless of which element to splat.  We should  
generate slightly different sequences depending on which element to  
splat.

  - In LowerVECTOR_SHUFFLEv8i16, if we have a shuffle that requires  
lowering to extract and insert between two different vectors, we can  
an assert in the compiler.  We were accessing a non existent mask  
element.

Please let me know if you have any comments,

Thanks,
   -- Mon Ping

-------------- next part --------------
A non-text attachment was scrubbed...
Name: splat.patch
Type: application/octet-stream
Size: 12493 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081219/466d4c2a/attachment.obj 

From nicholas at mxc.ca  Fri Dec 19 03:34:12 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Fri, 19 Dec 2008 01:34:12 -0800
Subject: [llvm-commits] [llvm] r61239 - in /llvm/trunk:	docs/LangRef.html
 include/llvm/Attributes.h	lib/Analysis/BasicAliasAnalysis.cpp	test/Analysis/BasicAA/nocapture.ll
In-Reply-To: <AE697877-5150-4AA1-A0D5-157F870D83A3@gmail.com>
References: <200812190639.mBJ6dMeR028570@zion.cs.uiuc.edu>
	<AE697877-5150-4AA1-A0D5-157F870D83A3@gmail.com>
Message-ID: <494B6A94.3010504@mxc.ca>

I just forgot to commit the parser changes, somehow. Should be easy to 
fix. Sorry!!

Nick

Bill Wendling wrote:
> Nicholas,
> 
> This is causing more failures:
> 
> Running /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/ 
> Analysis/BasicAA/dg.exp ...
> FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/ 
> Analysis/BasicAA/nocapture.ll
> Failed with exit(1) at line 1
> while running:  llvm-as < /Volumes/Sandbox/Buildbot/llvm/full-llvm/ 
> build/llvmCore/test/Analysis/BasicAA/nocapture.ll |  opt -basicaa -gvn  
> -instcombine |  llvm-dis | /usr/bin/grep {ret i32 0}
> llvm-as: <stdin>:3,0: <stdin>:3: error: syntax error, unexpected  
> $undefined, expecting ')' while reading token: 'n'
> opt: Invalid bitcode signature
> llvm-dis: Invalid bitcode signature
> 
> Running /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/ 
> FrontendC/dg.exp ...
> FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/ 
> FrontendC/2002-02-13-UnnamedLocal.c
> Failed with signal(SIGABRT) at line 1
> while running: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/ 
> llvmgcc42.roots/llvmgcc42~dst/Developer/usr/bin/llvm-gcc-4.2 -fstrict- 
> aliasing -Wstrict-aliasing -I/usr/include/c++/4.0.0/i686-apple-darwin9  
> -I/usr/include/c++/4.0.0 -emit-llvm -w -S /Volumes/Sandbox/Buildbot/ 
> llvm/full-llvm/build/llvmCore/test/FrontendC/2002-02-13-UnnamedLocal.c  
> -o - |  llvm-as -f -o /dev/null
> Assertion failed: (isPowerOf2_32(i) && "Alignment must be a power of  
> two."), function constructAlignmentFromInt, file /Volumes/Sandbox/ 
> Buildbot/llvm/full-llvm/build/llvmCore/include/llvm/Attributes.h, line  
> 86.
> 0   llvm-as           0x0017999f llvm::sys::SetInterruptFunction(void  
> (*)()) + 591
> 1   libSystem.B.dylib 0x91e592bb _sigtramp + 43
> 2   libSystem.B.dylib 0xffffffff _sigtramp + 1847225711
> 3   libSystem.B.dylib 0x91ecd23a raise + 26
> 4   libSystem.B.dylib 0x91ed9679 abort + 73
> 5   libSystem.Bmake[1]: *** [check-local] Error 1
> make: *** [check] Error 2
> 
> This is on Darwin x86.
> 
> -bw
> 
> On Dec 18, 2008, at 10:39 PM, Nick Lewycky wrote:
> 
>> Author: nicholas
>> Date: Fri Dec 19 00:39:12 2008
>> New Revision: 61239
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=61239&view=rev
>> Log:
>> Resubmit support for the 'nocapture' attribute.
>>
>> The problematic part of this patch is that we were out of attribute  
>> bits,
>> requiring some fancy bit hacking to make it fit (by shrinking  
>> alignment)
>> without breaking existing users or the file format.
>>
>> This change will require users to rebuild llvm-gcc to match llvm.
>>
>> Added:
>>    llvm/trunk/test/Analysis/BasicAA/nocapture.ll
>> Modified:
>>    llvm/trunk/docs/LangRef.html
>>    llvm/trunk/include/llvm/Attributes.h
>>    llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
>>
>> Modified: llvm/trunk/docs/LangRef.html
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=61239&r1=61238&r2=61239&view=diff
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> ======================================================================
>> --- llvm/trunk/docs/LangRef.html (original)
>> +++ llvm/trunk/docs/LangRef.html Fri Dec 19 00:39:12 2008
>> @@ -894,9 +894,15 @@
>>     parameter.  The caller is responsible for ensuring that this is  
>> the
>>     case. On a function return value, <tt>noalias</tt> additionally  
>> indicates
>>     that the pointer does not alias any other pointers visible to the
>> -    caller. Note that this applies only to pointers that can be  
>> used to actually
>> -    load/store a value: NULL, unique pointers from malloc(0), and  
>> freed pointers
>> -    are considered to not alias anything.</dd>
>> +    caller. For further details, please see the discussion of the  
>> NoAlias
>> +    response in
>> +    <a href="http://llvm.org/docs/AliasAnalysis.html#MustMayNo">alias
>> +    analysis</a>.</dd>
>> +
>> +    <dt><tt>nocapture</tt></dt>
>> +    <dd>This indicates that the callee does not make any copies of  
>> the pointer
>> +    that outlive the callee itself. This is not a valid attribute  
>> for return
>> +    values.</dd>
>>
>>     <dt><tt>nest</tt></dt>
>>     <dd>This indicates that the pointer parameter can be excised  
>> using the
>>
>> Modified: llvm/trunk/include/llvm/Attributes.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=61239&r1=61238&r2=61239&view=diff
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> ======================================================================
>> --- llvm/trunk/include/llvm/Attributes.h (original)
>> +++ llvm/trunk/include/llvm/Attributes.h Fri Dec 19 00:39:12 2008
>> @@ -15,6 +15,7 @@
>> #ifndef LLVM_ATTRIBUTES_H
>> #define LLVM_ATTRIBUTES_H
>>
>> +#include "llvm/Support/MathExtras.h"
>> #include <cassert>
>> #include <string>
>>
>> @@ -23,7 +24,7 @@
>>
>> /// Attributes - A bitset of attributes.
>> typedef unsigned Attributes;
>> -
>> +
>> namespace Attribute {
>>
>> /// Function parameters and results can have attributes to indicate  
>> how they
>> @@ -44,16 +45,18 @@
>> const Attributes Nest      = 1<<8;  ///< Nested function static chain
>> const Attributes ReadNone  = 1<<9;  ///< Function does not access  
>> memory
>> const Attributes ReadOnly  = 1<<10; ///< Function only reads from  
>> memory
>> -const Attributes NoInline        = 1<<11; // inline=never
>> -const Attributes AlwaysInline    = 1<<12; // inline=always
>> -const Attributes OptimizeForSize = 1<<13; // opt_size
>> -const Attributes StackProtect    = 1<<14; // Stack protection.
>> -const Attributes StackProtectReq = 1<<15; // Stack protection  
>> required.
>> -const Attributes Alignment = 0xffff<<16; ///< Alignment of  
>> parameter (16 bits)
>> -                                    // 0 = unknown, else in clear  
>> (not log)
>> -
>> +const Attributes NoInline        = 1<<11; ///< inline=never
>> +const Attributes AlwaysInline    = 1<<12; ///< inline=always
>> +const Attributes OptimizeForSize = 1<<13; ///< opt_size
>> +const Attributes StackProtect    = 1<<14; ///< Stack protection.
>> +const Attributes StackProtectReq = 1<<15; ///< Stack protection  
>> required.
>> +const Attributes Alignment = 31<<16; ///< Alignment of parameter (5  
>> bits)
>> +                                     // stored as log2 of alignment  
>> with +1 bias
>> +                                     // 0 means unaligned different  
>> from align 1
>> +const Attributes NoCapture = 1<<21; ///< Function creates no  
>> aliases of pointer
>> +
>> /// @brief Attributes that only apply to function parameters.
>> -const Attributes ParameterOnly = ByVal | Nest | StructRet;
>> +const Attributes ParameterOnly = ByVal | Nest | StructRet |  
>> NoCapture;
>>
>> /// @brief Attributes that only apply to function.
>> const Attributes FunctionOnly = NoReturn | NoUnwind | ReadNone |  
>> ReadOnly |
>> @@ -64,7 +67,7 @@
>>
>> /// @brief Attributes that are mutually incompatible.
>> const Attributes MutuallyIncompatible[4] = {
>> -  ByVal | InReg | Nest  | StructRet,
>> +  ByVal | InReg | Nest | StructRet,
>>   ZExt  | SExt,
>>   ReadNone | ReadOnly,
>>   NoInline | AlwaysInline
>> @@ -76,7 +79,13 @@
>> /// This turns an int alignment (a power of 2, normally) into the
>> /// form used internally in Attributes.
>> inline Attributes constructAlignmentFromInt(unsigned i) {
>> -  return (i << 16);
>> +  // Default alignment, allow the target to define how to align it.
>> +  if (i == 0)
>> +    return 0;
>> +
>> +  assert(isPowerOf2_32(i) && "Alignment must be a power of two.");
>> +  assert(i <= 0x40000000 && "Alignment too large.");
>> +  return (Log2_32(i)+1) << 16;
>> }
>>
>> /// The set of Attributes set in Attributes is converted to a
>> @@ -175,7 +184,11 @@
>>   /// getParamAlignment - Return the alignment for the specified  
>> function
>>   /// parameter.
>>   unsigned getParamAlignment(unsigned Idx) const {
>> -    return (getAttributes(Idx) & Attribute::Alignment) >> 16;
>> +    Attributes Align = getAttributes(Idx) & Attribute::Alignment;
>> +    if (Align == 0)
>> +      return 0;
>> +
>> +    return 1ull << ((Align >> 16) - 1);
>>   }
>>
>>   /// hasAttrSomewhere - Return true if the specified attribute is  
>> set for at
>>
>> Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=61239&r1=61238&r2=61239&view=diff
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> ======================================================================
>> --- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original)
>> +++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Fri Dec 19  
>> 00:39:12 2008
>> @@ -63,12 +63,23 @@
>>       // callees could modify it.
>>       break; // next use
>>     case Instruction::Call:
>> -      // If the call is to a few known safe intrinsics, we know  
>> that it does
>> -      // not escape.
>> -      // TODO: Eventually just check the 'nocapture' attribute.
>> -      if (!isa<MemIntrinsic>(I))
>> -        return true;
>> -      break;  // next use
>> +      // If the argument to the call has the nocapture attribute,  
>> then the call
>> +      // may store or load to the pointer, but it cannot escape.
>> +      if (cast<CallInst>(I)->paramHasAttr(UI.getOperandNo(),
>> +                                          Attribute::NoCapture))
>> +        continue;
>> +
>> +      // FIXME: MemIntrinsics should have their operands marked  
>> nocapture!
>> +      if (isa<MemIntrinsic>(I))
>> +        continue;  // next use
>> +      return true;
>> +    case Instruction::Invoke:
>> +      // If the argument to the call has the nocapture attribute,  
>> then the call
>> +      // may store or load to the pointer, but it cannot escape.
>> +      if (cast<InvokeInst>(I)->paramHasAttr(UI.getOperandNo()-2,
>> +                                            Attribute::NoCapture))
>> +        continue;
>> +      return true;
>>     default:
>>       return true;
>>     }
>>
>> Added: llvm/trunk/test/Analysis/BasicAA/nocapture.ll
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/BasicAA/nocapture.ll?rev=61239&view=auto
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> ======================================================================
>> --- llvm/trunk/test/Analysis/BasicAA/nocapture.ll (added)
>> +++ llvm/trunk/test/Analysis/BasicAA/nocapture.ll Fri Dec 19  
>> 00:39:12 2008
>> @@ -0,0 +1,14 @@
>> +; RUN: llvm-as < %s | opt -basicaa -gvn -instcombine | llvm-dis |  
>> grep {ret i32 0}
>> +
>> +declare i32* @test(i32* nocapture)
>> +
>> +define i32 @test2() {
>> +       %P = alloca i32
>> +       %Q = call i32* @test(i32* %P)
>> +       %a = load i32* %P
>> +       store i32 4, i32* %Q   ;; cannot clobber P since it is  
>> nocapture.
>> +       %b = load i32* %P
>> +       %c = sub i32 %a, %b
>> +       ret i32 %c
>> +}
>> +
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> 



From isanbard at gmail.com  Fri Dec 19 03:37:10 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 19 Dec 2008 01:37:10 -0800
Subject: [llvm-commits] [llvm] r61239 - in /llvm/trunk:	docs/LangRef.html
	include/llvm/Attributes.h	lib/Analysis/BasicAliasAnalysis.cpp
	test/Analysis/BasicAA/nocapture.ll
In-Reply-To: <494B6A94.3010504@mxc.ca>
References: <200812190639.mBJ6dMeR028570@zion.cs.uiuc.edu>
	<AE697877-5150-4AA1-A0D5-157F870D83A3@gmail.com>
	<494B6A94.3010504@mxc.ca>
Message-ID: <D4DB42AD-58C4-48FF-B9A0-3BD88BFD159B@gmail.com>

Great! Thanks, Nick.

-bw

On Dec 19, 2008, at 1:34 AM, Nick Lewycky <nicholas at mxc.ca> wrote:

> I just forgot to commit the parser changes, somehow. Should be easy to
> fix. Sorry!!
>
> Nick
>
> Bill Wendling wrote:
>> Nicholas,
>>
>> This is causing more failures:
>>
>> Running /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/
>> Analysis/BasicAA/dg.exp ...
>> FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/
>> Analysis/BasicAA/nocapture.ll
>> Failed with exit(1) at line 1
>> while running:  llvm-as < /Volumes/Sandbox/Buildbot/llvm/full-llvm/
>> build/llvmCore/test/Analysis/BasicAA/nocapture.ll |  opt -basicaa - 
>> gvn
>> -instcombine |  llvm-dis | /usr/bin/grep {ret i32 0}
>> llvm-as: <stdin>:3,0: <stdin>:3: error: syntax error, unexpected
>> $undefined, expecting ')' while reading token: 'n'
>> opt: Invalid bitcode signature
>> llvm-dis: Invalid bitcode signature
>>
>> Running /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/
>> FrontendC/dg.exp ...
>> FAIL: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvmCore/test/
>> FrontendC/2002-02-13-UnnamedLocal.c
>> Failed with signal(SIGABRT) at line 1
>> while running: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/
>> llvmgcc42.roots/llvmgcc42~dst/Developer/usr/bin/llvm-gcc-4.2 - 
>> fstrict-
>> aliasing -Wstrict-aliasing -I/usr/include/c++/4.0.0/i686-apple- 
>> darwin9
>> -I/usr/include/c++/4.0.0 -emit-llvm -w -S /Volumes/Sandbox/Buildbot/
>> llvm/full-llvm/build/llvmCore/test/FrontendC/2002-02-13- 
>> UnnamedLocal.c
>> -o - |  llvm-as -f -o /dev/null
>> Assertion failed: (isPowerOf2_32(i) && "Alignment must be a power of
>> two."), function constructAlignmentFromInt, file /Volumes/Sandbox/
>> Buildbot/llvm/full-llvm/build/llvmCore/include/llvm/Attributes.h,  
>> line
>> 86.
>> 0   llvm-as           0x0017999f llvm::sys::SetInterruptFunction(void
>> (*)()) + 591
>> 1   libSystem.B.dylib 0x91e592bb _sigtramp + 43
>> 2   libSystem.B.dylib 0xffffffff _sigtramp + 1847225711
>> 3   libSystem.B.dylib 0x91ecd23a raise + 26
>> 4   libSystem.B.dylib 0x91ed9679 abort + 73
>> 5   libSystem.Bmake[1]: *** [check-local] Error 1
>> make: *** [check] Error 2
>>
>> This is on Darwin x86.
>>
>> -bw
>>
>> On Dec 18, 2008, at 10:39 PM, Nick Lewycky wrote:
>>
>>> Author: nicholas
>>> Date: Fri Dec 19 00:39:12 2008
>>> New Revision: 61239
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=61239&view=rev
>>> Log:
>>> Resubmit support for the 'nocapture' attribute.
>>>
>>> The problematic part of this patch is that we were out of attribute
>>> bits,
>>> requiring some fancy bit hacking to make it fit (by shrinking
>>> alignment)
>>> without breaking existing users or the file format.
>>>
>>> This change will require users to rebuild llvm-gcc to match llvm.
>>>
>>> Added:
>>>   llvm/trunk/test/Analysis/BasicAA/nocapture.ll
>>> Modified:
>>>   llvm/trunk/docs/LangRef.html
>>>   llvm/trunk/include/llvm/Attributes.h
>>>   llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
>>>
>>> Modified: llvm/trunk/docs/LangRef.html
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=61239&r1=61238&r2=61239&view=diff
>>>
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> === 
>>> ===================================================================
>>> --- llvm/trunk/docs/LangRef.html (original)
>>> +++ llvm/trunk/docs/LangRef.html Fri Dec 19 00:39:12 2008
>>> @@ -894,9 +894,15 @@
>>>    parameter.  The caller is responsible for ensuring that this is
>>> the
>>>    case. On a function return value, <tt>noalias</tt> additionally
>>> indicates
>>>    that the pointer does not alias any other pointers visible to the
>>> -    caller. Note that this applies only to pointers that can be
>>> used to actually
>>> -    load/store a value: NULL, unique pointers from malloc(0), and
>>> freed pointers
>>> -    are considered to not alias anything.</dd>
>>> +    caller. For further details, please see the discussion of the
>>> NoAlias
>>> +    response in
>>> +    <a href="http://llvm.org/docs/ 
>>> AliasAnalysis.html#MustMayNo">alias
>>> +    analysis</a>.</dd>
>>> +
>>> +    <dt><tt>nocapture</tt></dt>
>>> +    <dd>This indicates that the callee does not make any copies of
>>> the pointer
>>> +    that outlive the callee itself. This is not a valid attribute
>>> for return
>>> +    values.</dd>
>>>
>>>    <dt><tt>nest</tt></dt>
>>>    <dd>This indicates that the pointer parameter can be excised
>>> using the
>>>
>>> Modified: llvm/trunk/include/llvm/Attributes.h
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Attributes.h?rev=61239&r1=61238&r2=61239&view=diff
>>>
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> === 
>>> ===================================================================
>>> --- llvm/trunk/include/llvm/Attributes.h (original)
>>> +++ llvm/trunk/include/llvm/Attributes.h Fri Dec 19 00:39:12 2008
>>> @@ -15,6 +15,7 @@
>>> #ifndef LLVM_ATTRIBUTES_H
>>> #define LLVM_ATTRIBUTES_H
>>>
>>> +#include "llvm/Support/MathExtras.h"
>>> #include <cassert>
>>> #include <string>
>>>
>>> @@ -23,7 +24,7 @@
>>>
>>> /// Attributes - A bitset of attributes.
>>> typedef unsigned Attributes;
>>> -
>>> +
>>> namespace Attribute {
>>>
>>> /// Function parameters and results can have attributes to indicate
>>> how they
>>> @@ -44,16 +45,18 @@
>>> const Attributes Nest      = 1<<8;  ///< Nested function static  
>>> chain
>>> const Attributes ReadNone  = 1<<9;  ///< Function does not access
>>> memory
>>> const Attributes ReadOnly  = 1<<10; ///< Function only reads from
>>> memory
>>> -const Attributes NoInline        = 1<<11; // inline=never
>>> -const Attributes AlwaysInline    = 1<<12; // inline=always
>>> -const Attributes OptimizeForSize = 1<<13; // opt_size
>>> -const Attributes StackProtect    = 1<<14; // Stack protection.
>>> -const Attributes StackProtectReq = 1<<15; // Stack protection
>>> required.
>>> -const Attributes Alignment = 0xffff<<16; ///< Alignment of
>>> parameter (16 bits)
>>> -                                    // 0 = unknown, else in clear
>>> (not log)
>>> -
>>> +const Attributes NoInline        = 1<<11; ///< inline=never
>>> +const Attributes AlwaysInline    = 1<<12; ///< inline=always
>>> +const Attributes OptimizeForSize = 1<<13; ///< opt_size
>>> +const Attributes StackProtect    = 1<<14; ///< Stack protection.
>>> +const Attributes StackProtectReq = 1<<15; ///< Stack protection
>>> required.
>>> +const Attributes Alignment = 31<<16; ///< Alignment of parameter (5
>>> bits)
>>> +                                     // stored as log2 of alignment
>>> with +1 bias
>>> +                                     // 0 means unaligned different
>>> from align 1
>>> +const Attributes NoCapture = 1<<21; ///< Function creates no
>>> aliases of pointer
>>> +
>>> /// @brief Attributes that only apply to function parameters.
>>> -const Attributes ParameterOnly = ByVal | Nest | StructRet;
>>> +const Attributes ParameterOnly = ByVal | Nest | StructRet |
>>> NoCapture;
>>>
>>> /// @brief Attributes that only apply to function.
>>> const Attributes FunctionOnly = NoReturn | NoUnwind | ReadNone |
>>> ReadOnly |
>>> @@ -64,7 +67,7 @@
>>>
>>> /// @brief Attributes that are mutually incompatible.
>>> const Attributes MutuallyIncompatible[4] = {
>>> -  ByVal | InReg | Nest  | StructRet,
>>> +  ByVal | InReg | Nest | StructRet,
>>>  ZExt  | SExt,
>>>  ReadNone | ReadOnly,
>>>  NoInline | AlwaysInline
>>> @@ -76,7 +79,13 @@
>>> /// This turns an int alignment (a power of 2, normally) into the
>>> /// form used internally in Attributes.
>>> inline Attributes constructAlignmentFromInt(unsigned i) {
>>> -  return (i << 16);
>>> +  // Default alignment, allow the target to define how to align it.
>>> +  if (i == 0)
>>> +    return 0;
>>> +
>>> +  assert(isPowerOf2_32(i) && "Alignment must be a power of two.");
>>> +  assert(i <= 0x40000000 && "Alignment too large.");
>>> +  return (Log2_32(i)+1) << 16;
>>> }
>>>
>>> /// The set of Attributes set in Attributes is converted to a
>>> @@ -175,7 +184,11 @@
>>>  /// getParamAlignment - Return the alignment for the specified
>>> function
>>>  /// parameter.
>>>  unsigned getParamAlignment(unsigned Idx) const {
>>> -    return (getAttributes(Idx) & Attribute::Alignment) >> 16;
>>> +    Attributes Align = getAttributes(Idx) & Attribute::Alignment;
>>> +    if (Align == 0)
>>> +      return 0;
>>> +
>>> +    return 1ull << ((Align >> 16) - 1);
>>>  }
>>>
>>>  /// hasAttrSomewhere - Return true if the specified attribute is
>>> set for at
>>>
>>> Modified: llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp?rev=61239&r1=61238&r2=61239&view=diff
>>>
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> === 
>>> ===================================================================
>>> --- llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp (original)
>>> +++ llvm/trunk/lib/Analysis/BasicAliasAnalysis.cpp Fri Dec 19
>>> 00:39:12 2008
>>> @@ -63,12 +63,23 @@
>>>      // callees could modify it.
>>>      break; // next use
>>>    case Instruction::Call:
>>> -      // If the call is to a few known safe intrinsics, we know
>>> that it does
>>> -      // not escape.
>>> -      // TODO: Eventually just check the 'nocapture' attribute.
>>> -      if (!isa<MemIntrinsic>(I))
>>> -        return true;
>>> -      break;  // next use
>>> +      // If the argument to the call has the nocapture attribute,
>>> then the call
>>> +      // may store or load to the pointer, but it cannot escape.
>>> +      if (cast<CallInst>(I)->paramHasAttr(UI.getOperandNo(),
>>> +                                          Attribute::NoCapture))
>>> +        continue;
>>> +
>>> +      // FIXME: MemIntrinsics should have their operands marked
>>> nocapture!
>>> +      if (isa<MemIntrinsic>(I))
>>> +        continue;  // next use
>>> +      return true;
>>> +    case Instruction::Invoke:
>>> +      // If the argument to the call has the nocapture attribute,
>>> then the call
>>> +      // may store or load to the pointer, but it cannot escape.
>>> +      if (cast<InvokeInst>(I)->paramHasAttr(UI.getOperandNo()-2,
>>> +                                            Attribute::NoCapture))
>>> +        continue;
>>> +      return true;
>>>    default:
>>>      return true;
>>>    }
>>>
>>> Added: llvm/trunk/test/Analysis/BasicAA/nocapture.ll
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Analysis/BasicAA/nocapture.ll?rev=61239&view=auto
>>>
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> =
>>> === 
>>> ===================================================================
>>> --- llvm/trunk/test/Analysis/BasicAA/nocapture.ll (added)
>>> +++ llvm/trunk/test/Analysis/BasicAA/nocapture.ll Fri Dec 19
>>> 00:39:12 2008
>>> @@ -0,0 +1,14 @@
>>> +; RUN: llvm-as < %s | opt -basicaa -gvn -instcombine | llvm-dis |
>>> grep {ret i32 0}
>>> +
>>> +declare i32* @test(i32* nocapture)
>>> +
>>> +define i32 @test2() {
>>> +       %P = alloca i32
>>> +       %Q = call i32* @test(i32* %P)
>>> +       %a = load i32* %P
>>> +       store i32 4, i32* %Q   ;; cannot clobber P since it is
>>> nocapture.
>>> +       %b = load i32* %P
>>> +       %c = sub i32 %a, %b
>>> +       ret i32 %c
>>> +}
>>> +
>>>
>>>
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at cs.uiuc.edu
>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


From nicholas at mxc.ca  Fri Dec 19 03:38:47 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Fri, 19 Dec 2008 09:38:47 -0000
Subject: [llvm-commits] [llvm] r61240 - in /llvm/trunk/lib:
 AsmParser/LLLexer.cpp AsmParser/llvmAsmParser.y
 Bitcode/Reader/BitcodeReader.cpp Bitcode/Writer/BitcodeWriter.cpp
 VMCore/Attributes.cpp
Message-ID: <200812190938.mBJ9cpwb003886@zion.cs.uiuc.edu>

Author: nicholas
Date: Fri Dec 19 03:38:31 2008
New Revision: 61240

URL: http://llvm.org/viewvc/llvm-project?rev=61240&view=rev
Log:
Commit missed files from nocapture change.

Modified:
    llvm/trunk/lib/AsmParser/LLLexer.cpp
    llvm/trunk/lib/AsmParser/llvmAsmParser.y
    llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
    llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
    llvm/trunk/lib/VMCore/Attributes.cpp

Modified: llvm/trunk/lib/AsmParser/LLLexer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLLexer.cpp?rev=61240&r1=61239&r2=61240&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/LLLexer.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLLexer.cpp Fri Dec 19 03:38:31 2008
@@ -491,6 +491,7 @@
   KEYWORD("nounwind", NOUNWIND);
   KEYWORD("noreturn", NORETURN);
   KEYWORD("noalias", NOALIAS);
+  KEYWORD("nocapture", NOCAPTURE);
   KEYWORD("byval", BYVAL);
   KEYWORD("nest", NEST);
   KEYWORD("readnone", READNONE);

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y?rev=61240&r1=61239&r2=61240&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y Fri Dec 19 03:38:31 2008
@@ -1136,8 +1136,8 @@
 %token <OtherOpVal> EXTRACTVALUE INSERTVALUE
 
 // Function Attributes
-%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST
-%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ
+%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS NOCAPTURE BYVAL
+%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ NEST
 
 // Visibility Styles
 %token DEFAULT HIDDEN PROTECTED
@@ -1265,15 +1265,16 @@
                   CHECK_FOR_ERROR
                  };
 
-Attribute     : ZEROEXT { $$ = Attribute::ZExt;      }
-              | ZEXT    { $$ = Attribute::ZExt;      }
-              | SIGNEXT { $$ = Attribute::SExt;      }
-              | SEXT    { $$ = Attribute::SExt;      }
-              | INREG   { $$ = Attribute::InReg;     }
-              | SRET    { $$ = Attribute::StructRet; }
-              | NOALIAS { $$ = Attribute::NoAlias;   }
-              | BYVAL   { $$ = Attribute::ByVal;     }
-              | NEST    { $$ = Attribute::Nest;      }
+Attribute     : ZEROEXT   { $$ = Attribute::ZExt;      }
+              | ZEXT      { $$ = Attribute::ZExt;      }
+              | SIGNEXT   { $$ = Attribute::SExt;      }
+              | SEXT      { $$ = Attribute::SExt;      }
+              | INREG     { $$ = Attribute::InReg;     }
+              | SRET      { $$ = Attribute::StructRet; }
+              | NOALIAS   { $$ = Attribute::NoAlias;   }
+              | NOCAPTURE { $$ = Attribute::NoCapture; }
+              | BYVAL     { $$ = Attribute::ByVal;     }
+              | NEST      { $$ = Attribute::Nest;      }
               | ALIGN EUINT64VAL { $$ =
                           Attribute::constructAlignmentFromInt($2);    }
               ;
@@ -1331,6 +1332,8 @@
   $$ = $2;
   if ($$ != 0 && !isPowerOf2_32($$))
     GEN_ERROR("Alignment must be a power of two");
+  if ($$ > 0x40000000)
+    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 };
 OptCAlign : /*empty*/            { $$ = 0; } |
@@ -1338,6 +1341,8 @@
   $$ = $3;
   if ($$ != 0 && !isPowerOf2_32($$))
     GEN_ERROR("Alignment must be a power of two");
+  if ($$ > 0x40000000)
+    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 };
 
@@ -1367,6 +1372,8 @@
   | ALIGN EUINT64VAL {
     if ($2 != 0 && !isPowerOf2_32($2))
       GEN_ERROR("Alignment must be a power of two");
+    if ($2 > 0x40000000)
+      GEN_ERROR("Alignment too large");
     CurGV->setAlignment($2);
     CHECK_FOR_ERROR
   };

Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=61240&r1=61239&r2=61240&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
+++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Fri Dec 19 03:38:31 2008
@@ -362,6 +362,20 @@
       Attributes RetAttribute = Attribute::None;
       Attributes FnAttribute = Attribute::None;
       for (unsigned i = 0, e = Record.size(); i != e; i += 2) {
+        // FIXME: remove in LLVM 3.0
+        // The alignment is stored as a 16-bit raw value from bits 31--16.
+        // We shift the bits above 31 down by 11 bits.
+
+        unsigned Alignment = (Record[i+1] & (0xffffull << 16)) >> 16;
+        if (Alignment && !isPowerOf2_32(Alignment))
+          return Error("Alignment is not a power of two.");
+
+        Attributes ReconstitutedAttr = Record[i+1] & 0xffff;
+        if (Alignment)
+          ReconstitutedAttr |= Attribute::constructAlignmentFromInt(Alignment);
+        ReconstitutedAttr |= (Record[i+1] & (0xffffull << 32)) >> 11;
+        Record[i+1] = ReconstitutedAttr;
+
         if (Record[i] == 0)
           RetAttribute = Record[i+1];
         else if (Record[i] == ~0U)

Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=61240&r1=61239&r2=61240&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
+++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Fri Dec 19 03:38:31 2008
@@ -122,7 +122,17 @@
     for (unsigned i = 0, e = A.getNumSlots(); i != e; ++i) {
       const AttributeWithIndex &PAWI = A.getSlot(i);
       Record.push_back(PAWI.Index);
-      Record.push_back(PAWI.Attrs);
+
+      // FIXME: remove in LLVM 3.0
+      // Store the alignment in the bitcode as a 16-bit raw value instead of a
+      // 5-bit log2 encoded value. Shift the bits above the alignment up by
+      // 11 bits.
+      uint64_t FauxAttr = PAWI.Attrs & 0xffff;
+      if (PAWI.Attrs & Attribute::Alignment)
+        FauxAttr |= (1ull<<16)<<(((PAWI.Attrs & Attribute::Alignment)-1) >> 16);
+      FauxAttr |= (PAWI.Attrs & (0x3FFull << 21)) << 11;
+
+      Record.push_back(FauxAttr);
     }
     
     Stream.EmitRecord(bitc::PARAMATTR_CODE_ENTRY, Record);

Modified: llvm/trunk/lib/VMCore/Attributes.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Attributes.cpp?rev=61240&r1=61239&r2=61240&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Attributes.cpp (original)
+++ llvm/trunk/lib/VMCore/Attributes.cpp Fri Dec 19 03:38:31 2008
@@ -37,6 +37,8 @@
     Result += "inreg ";
   if (Attrs & Attribute::NoAlias)
     Result += "noalias ";
+  if (Attrs & Attribute::NoCapture)
+    Result += "nocapture ";
   if (Attrs & Attribute::StructRet)
     Result += "sret ";  
   if (Attrs & Attribute::ByVal)
@@ -59,10 +61,11 @@
     Result += "sspreq ";
   if (Attrs & Attribute::Alignment) {
     Result += "align ";
-    Result += utostr((Attrs & Attribute::Alignment) >> 16);
+    Result += utostr(1ull << (((Attrs & Attribute::Alignment)>>16) - 1));
     Result += " ";
   }
   // Trim the trailing space.
+  assert(!Result.empty() && "Unknown attribute!");
   Result.erase(Result.end()-1);
   return Result;
 }
@@ -76,7 +79,7 @@
   
   if (!isa<PointerType>(Ty))
     // Attributes that only apply to pointers.
-    Incompatible |= ByVal | Nest | NoAlias | StructRet;
+    Incompatible |= ByVal | Nest | NoAlias | StructRet | NoCapture;
   
   return Incompatible;
 }




From nicholas at mxc.ca  Fri Dec 19 03:42:05 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Fri, 19 Dec 2008 09:42:05 -0000
Subject: [llvm-commits] [llvm] r61241 - in /llvm/trunk/lib/AsmParser:
 llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y.cvs
Message-ID: <200812190942.mBJ9g9oc004145@zion.cs.uiuc.edu>

Author: nicholas
Date: Fri Dec 19 03:41:54 2008
New Revision: 61241

URL: http://llvm.org/viewvc/llvm-project?rev=61241&view=rev
Log:
Update the .cvs files for nocapture.

Modified:
    llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs
    llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs?rev=61241&r1=61240&r2=61241&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.cpp.cvs Fri Dec 19 03:41:54 2008
@@ -219,8 +219,8 @@
      SRET = 400,
      NOUNWIND = 401,
      NOALIAS = 402,
-     BYVAL = 403,
-     NEST = 404,
+     NOCAPTURE = 403,
+     BYVAL = 404,
      READNONE = 405,
      READONLY = 406,
      GC = 407,
@@ -229,9 +229,10 @@
      ALWAYSINLINE = 410,
      SSP = 411,
      SSPREQ = 412,
-     DEFAULT = 413,
-     HIDDEN = 414,
-     PROTECTED = 415
+     NEST = 413,
+     DEFAULT = 414,
+     HIDDEN = 415,
+     PROTECTED = 416
    };
 #endif
 /* Tokens.  */
@@ -380,8 +381,8 @@
 #define SRET 400
 #define NOUNWIND 401
 #define NOALIAS 402
-#define BYVAL 403
-#define NEST 404
+#define NOCAPTURE 403
+#define BYVAL 404
 #define READNONE 405
 #define READONLY 406
 #define GC 407
@@ -390,9 +391,10 @@
 #define ALWAYSINLINE 410
 #define SSP 411
 #define SSPREQ 412
-#define DEFAULT 413
-#define HIDDEN 414
-#define PROTECTED 415
+#define NEST 413
+#define DEFAULT 414
+#define HIDDEN 415
+#define PROTECTED 416
 
 
 
@@ -1440,7 +1442,7 @@
   llvm::FCmpInst::Predicate         FPredicate;
 }
 /* Line 187 of yacc.c.  */
-#line 1444 "llvmAsmParser.tab.c"
+#line 1446 "llvmAsmParser.tab.c"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -1453,7 +1455,7 @@
 
 
 /* Line 216 of yacc.c.  */
-#line 1457 "llvmAsmParser.tab.c"
+#line 1459 "llvmAsmParser.tab.c"
 
 #ifdef short
 # undef short
@@ -1668,20 +1670,20 @@
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  44
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   2434
+#define YYLAST   2372
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  175
+#define YYNTOKENS  176
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  87
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  351
+#define YYNRULES  352
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  711
+#define YYNSTATES  712
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   415
+#define YYMAXUTOK   416
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -1693,15 +1695,15 @@
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     161,   162,   165,     2,   164,     2,     2,     2,     2,     2,
+     162,   163,   166,     2,   165,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     170,   163,   171,     2,     2,     2,     2,     2,     2,     2,
+     171,   164,   172,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,   167,   166,   169,     2,     2,     2,     2,     2,   174,
+       2,   168,   167,   170,     2,     2,     2,     2,     2,   175,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     168,     2,     2,   172,     2,   173,     2,     2,     2,     2,
+     169,     2,     2,   173,     2,   174,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -1730,7 +1732,7 @@
      125,   126,   127,   128,   129,   130,   131,   132,   133,   134,
      135,   136,   137,   138,   139,   140,   141,   142,   143,   144,
      145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
-     155,   156,   157,   158,   159,   160
+     155,   156,   157,   158,   159,   160,   161
 };
 
 #if YYDEBUG
@@ -1749,37 +1751,37 @@
      160,   162,   164,   166,   167,   169,   171,   172,   174,   176,
      178,   180,   181,   183,   185,   186,   188,   190,   192,   194,
      196,   199,   201,   203,   205,   207,   209,   211,   213,   215,
-     217,   220,   221,   224,   226,   228,   230,   232,   233,   236,
+     217,   219,   222,   223,   226,   228,   230,   232,   234,   235,
      238,   240,   242,   244,   246,   248,   250,   252,   254,   256,
-     258,   260,   261,   264,   265,   268,   269,   272,   273,   277,
-     280,   281,   283,   284,   288,   290,   293,   295,   297,   299,
-     301,   303,   305,   307,   309,   311,   315,   317,   320,   326,
-     332,   338,   344,   348,   351,   357,   362,   365,   367,   369,
-     371,   375,   377,   381,   383,   384,   386,   390,   395,   399,
-     403,   408,   413,   417,   424,   430,   433,   436,   439,   442,
-     445,   448,   451,   454,   457,   460,   463,   466,   473,   479,
-     488,   495,   502,   510,   518,   526,   534,   541,   550,   559,
-     565,   573,   577,   579,   581,   583,   585,   586,   589,   596,
-     598,   599,   601,   604,   605,   609,   610,   614,   618,   622,
-     626,   627,   636,   637,   647,   648,   658,   664,   667,   671,
-     673,   677,   681,   685,   689,   691,   692,   698,   702,   704,
-     708,   710,   711,   723,   725,   727,   732,   734,   736,   739,
-     743,   744,   746,   748,   750,   752,   754,   756,   758,   760,
-     762,   764,   766,   770,   774,   777,   780,   784,   787,   793,
-     798,   800,   806,   808,   810,   812,   814,   816,   818,   821,
-     823,   827,   830,   833,   837,   841,   844,   845,   847,   850,
-     853,   857,   867,   877,   886,   902,   904,   906,   913,   919,
-     922,   925,   932,   940,   945,   950,   957,   964,   965,   966,
-     970,   973,   977,   980,   982,   988,   994,  1001,  1008,  1015,
-    1022,  1027,  1034,  1039,  1044,  1051,  1058,  1061,  1071,  1073,
-    1075,  1076,  1080,  1087,  1091,  1098,  1101,  1107,  1115,  1121,
-    1126,  1131
+     258,   260,   262,   263,   266,   267,   270,   271,   274,   275,
+     279,   282,   283,   285,   286,   290,   292,   295,   297,   299,
+     301,   303,   305,   307,   309,   311,   313,   317,   319,   322,
+     328,   334,   340,   346,   350,   353,   359,   364,   367,   369,
+     371,   373,   377,   379,   383,   385,   386,   388,   392,   397,
+     401,   405,   410,   415,   419,   426,   432,   435,   438,   441,
+     444,   447,   450,   453,   456,   459,   462,   465,   468,   475,
+     481,   490,   497,   504,   512,   520,   528,   536,   543,   552,
+     561,   567,   575,   579,   581,   583,   585,   587,   588,   591,
+     598,   600,   601,   603,   606,   607,   611,   612,   616,   620,
+     624,   628,   629,   638,   639,   649,   650,   660,   666,   669,
+     673,   675,   679,   683,   687,   691,   693,   694,   700,   704,
+     706,   710,   712,   713,   725,   727,   729,   734,   736,   738,
+     741,   745,   746,   748,   750,   752,   754,   756,   758,   760,
+     762,   764,   766,   768,   772,   776,   779,   782,   786,   789,
+     795,   800,   802,   808,   810,   812,   814,   816,   818,   820,
+     823,   825,   829,   832,   835,   839,   843,   846,   847,   849,
+     852,   855,   859,   869,   879,   888,   904,   906,   908,   915,
+     921,   924,   927,   934,   942,   947,   952,   959,   966,   967,
+     968,   972,   975,   979,   982,   984,   990,   996,  1003,  1010,
+    1017,  1024,  1029,  1036,  1041,  1046,  1053,  1060,  1063,  1073,
+    1075,  1077,  1078,  1082,  1089,  1093,  1100,  1103,  1109,  1117,
+    1123,  1128,  1133
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int16 yyrhs[] =
 {
-     222,     0,    -1,    75,    -1,    76,    -1,    77,    -1,    78,
+     223,     0,    -1,    75,    -1,    76,    -1,    77,    -1,    78,
       -1,    79,    -1,    80,    -1,    81,    -1,    82,    -1,    83,
       -1,    87,    -1,    88,    -1,    89,    -1,    84,    -1,    85,
       -1,    86,    -1,   120,    -1,   121,    -1,   122,    -1,   123,
@@ -1790,109 +1792,110 @@
       -1,   106,    -1,   107,    -1,   108,    -1,   109,    -1,   110,
       -1,   111,    -1,   112,    -1,   113,    -1,   100,    -1,   101,
       -1,   102,    -1,   103,    -1,    26,    -1,    27,    -1,    19,
-      -1,    22,    -1,    24,    -1,   181,    -1,    -1,    55,   161,
-       4,   162,    -1,    -1,   181,   163,    -1,    -1,     7,   163,
-      -1,    20,    -1,    23,    -1,   188,    -1,    -1,   186,   163,
+      -1,    22,    -1,    24,    -1,   182,    -1,    -1,    55,   162,
+       4,   163,    -1,    -1,   182,   164,    -1,    -1,     7,   164,
+      -1,    20,    -1,    23,    -1,   189,    -1,    -1,   187,   164,
       -1,    42,    -1,    44,    -1,    43,    -1,    45,    -1,    47,
       -1,    49,    -1,    46,    -1,    48,    -1,    51,    -1,    -1,
-     158,    -1,   159,    -1,   160,    -1,    -1,    46,    -1,    48,
+     159,    -1,   160,    -1,   161,    -1,    -1,    46,    -1,    48,
       -1,    -1,    42,    -1,    43,    -1,    44,    -1,    47,    -1,
       -1,    44,    -1,    42,    -1,    -1,    63,    -1,    64,    -1,
       65,    -1,    66,    -1,    67,    -1,    62,     4,    -1,   142,
       -1,   121,    -1,   141,    -1,   122,    -1,   144,    -1,   145,
-      -1,   147,    -1,   148,    -1,   149,    -1,    54,     4,    -1,
-      -1,   197,   196,    -1,   144,    -1,   142,    -1,   141,    -1,
-     147,    -1,    -1,   199,   198,    -1,   143,    -1,   146,    -1,
-     144,    -1,   142,    -1,   141,    -1,   150,    -1,   151,    -1,
-     154,    -1,   155,    -1,   153,    -1,   156,    -1,   157,    -1,
-      -1,   201,   200,    -1,    -1,   152,    22,    -1,    -1,    54,
-       4,    -1,    -1,   164,    54,     4,    -1,    34,    22,    -1,
-      -1,   205,    -1,    -1,   164,   208,   207,    -1,   205,    -1,
-      54,     4,    -1,    11,    -1,    12,    -1,    13,    -1,    16,
-      -1,    15,    -1,    14,    -1,    17,    -1,    50,    -1,   209,
-      -1,   210,   183,   165,    -1,   244,    -1,   166,     4,    -1,
-     210,   161,   214,   162,   201,    -1,    10,   161,   214,   162,
-     201,    -1,   167,     4,   168,   210,   169,    -1,   170,     4,
-     168,   210,   171,    -1,   172,   215,   173,    -1,   172,   173,
-      -1,   170,   172,   215,   173,   171,    -1,   170,   172,   173,
-     171,    -1,   210,   197,    -1,   210,    -1,    10,    -1,   211,
-      -1,   213,   164,   211,    -1,   213,    -1,   213,   164,    39,
-      -1,    39,    -1,    -1,   210,    -1,   215,   164,   210,    -1,
-     210,   167,   218,   169,    -1,   210,   167,   169,    -1,   210,
-     174,    22,    -1,   210,   170,   218,   171,    -1,   210,   172,
-     218,   173,    -1,   210,   172,   173,    -1,   210,   170,   172,
-     218,   173,   171,    -1,   210,   170,   172,   173,   171,    -1,
-     210,    40,    -1,   210,    41,    -1,   210,   244,    -1,   210,
-     217,    -1,   210,    25,    -1,   210,     3,    -1,   210,     5,
-      -1,   210,     4,    -1,   210,     6,    -1,   210,    26,    -1,
-     210,    27,    -1,   210,     9,    -1,   178,   161,   216,    38,
-     210,   162,    -1,   119,   161,   216,   256,   162,    -1,   133,
-     161,   216,   164,   216,   164,   216,   162,    -1,   176,   161,
-     216,   164,   216,   162,    -1,   177,   161,   216,   164,   216,
-     162,    -1,    90,   179,   161,   216,   164,   216,   162,    -1,
-      91,   180,   161,   216,   164,   216,   162,    -1,    92,   179,
-     161,   216,   164,   216,   162,    -1,    93,   180,   161,   216,
-     164,   216,   162,    -1,   135,   161,   216,   164,   216,   162,
-      -1,   136,   161,   216,   164,   216,   164,   216,   162,    -1,
-     137,   161,   216,   164,   216,   164,   216,   162,    -1,   139,
-     161,   216,   257,   162,    -1,   140,   161,   216,   164,   216,
-     257,   162,    -1,   218,   164,   216,    -1,   216,    -1,    32,
-      -1,    33,    -1,    37,    -1,    -1,   212,   244,    -1,   125,
-     161,   221,    38,   210,   162,    -1,   223,    -1,    -1,   224,
-      -1,   223,   224,    -1,    -1,    31,   225,   240,    -1,    -1,
-      30,   226,   241,    -1,    60,    59,   230,    -1,   184,    18,
-     210,    -1,   184,    18,    10,    -1,    -1,   187,   191,   220,
-     219,   216,   183,   227,   207,    -1,    -1,   187,   189,   191,
-     220,   219,   216,   183,   228,   207,    -1,    -1,   187,   190,
-     191,   220,   219,   210,   183,   229,   207,    -1,   187,   191,
-      35,   194,   221,    -1,    52,   231,    -1,    56,   163,   232,
-      -1,    22,    -1,    53,   163,    22,    -1,    68,   163,    22,
-      -1,   167,   233,   169,    -1,   233,   164,    22,    -1,    22,
-      -1,    -1,   234,   164,   210,   197,   182,    -1,   210,   197,
-     182,    -1,   234,    -1,   234,   164,    39,    -1,    39,    -1,
-      -1,   195,   199,   212,   186,   161,   235,   162,   201,   206,
-     203,   202,    -1,    28,    -1,   172,    -1,   193,   191,   236,
-     237,    -1,    29,    -1,   173,    -1,   248,   239,    -1,   192,
-     191,   236,    -1,    -1,    61,    -1,     3,    -1,     4,    -1,
-       5,    -1,     6,    -1,     9,    -1,    26,    -1,    27,    -1,
-      40,    -1,    41,    -1,    25,    -1,   170,   218,   171,    -1,
-     167,   218,   169,    -1,   167,   169,    -1,   174,    22,    -1,
-     172,   218,   173,    -1,   172,   173,    -1,   170,   172,   218,
-     173,   171,    -1,   170,   172,   173,   171,    -1,   217,    -1,
-      59,   242,    22,   164,    22,    -1,     7,    -1,     8,    -1,
-     181,    -1,   186,    -1,   244,    -1,   243,    -1,   210,   245,
-      -1,   246,    -1,   247,   164,   246,    -1,   248,   249,    -1,
-     238,   249,    -1,   250,   184,   251,    -1,   250,   185,   251,
-      -1,   250,   253,    -1,    -1,    21,    -1,    69,   247,    -1,
-      69,    10,    -1,    70,    17,   245,    -1,    70,    11,   245,
-     164,    17,   245,   164,    17,   245,    -1,    71,    11,   245,
-     164,    17,   245,   167,   252,   169,    -1,    71,    11,   245,
-     164,    17,   245,   167,   169,    -1,    72,   195,   199,   212,
-     245,   161,   255,   162,   201,    38,    17,   245,    73,    17,
-     245,    -1,    73,    -1,    74,    -1,   252,    11,   243,   164,
-      17,   245,    -1,    11,   243,   164,    17,   245,    -1,   184,
-     259,    -1,   185,   259,    -1,   210,   167,   245,   164,   245,
-     169,    -1,   254,   164,   167,   245,   164,   245,   169,    -1,
-     210,   197,   245,   197,    -1,    17,   197,   245,   197,    -1,
-     255,   164,   210,   197,   245,   197,    -1,   255,   164,    17,
-     197,   245,   197,    -1,    -1,    -1,   256,   164,   246,    -1,
-     164,     4,    -1,   257,   164,     4,    -1,    58,    57,    -1,
-      57,    -1,   176,   210,   245,   164,   245,    -1,   177,   210,
-     245,   164,   245,    -1,    90,   179,   210,   245,   164,   245,
-      -1,    91,   180,   210,   245,   164,   245,    -1,    92,   179,
-     210,   245,   164,   245,    -1,    93,   180,   210,   245,   164,
-     245,    -1,   178,   246,    38,   210,    -1,   133,   246,   164,
-     246,   164,   246,    -1,   134,   246,   164,   210,    -1,   135,
-     246,   164,   246,    -1,   136,   246,   164,   246,   164,   246,
-      -1,   137,   246,   164,   246,   164,   246,    -1,   132,   254,
-      -1,   258,   195,   199,   212,   245,   161,   255,   162,   201,
-      -1,   261,    -1,    36,    -1,    -1,   114,   210,   204,    -1,
-     114,   210,   164,    11,   245,   204,    -1,   115,   210,   204,
-      -1,   115,   210,   164,    11,   245,   204,    -1,   116,   246,
-      -1,   260,   117,   210,   245,   204,    -1,   260,   118,   246,
-     164,   210,   245,   204,    -1,   138,   210,   245,   164,     4,
-      -1,   119,   210,   245,   256,    -1,   139,   210,   245,   257,
-      -1,   140,   210,   245,   164,   210,   245,   257,    -1
+      -1,   147,    -1,   148,    -1,   149,    -1,   158,    -1,    54,
+       4,    -1,    -1,   198,   197,    -1,   144,    -1,   142,    -1,
+     141,    -1,   147,    -1,    -1,   200,   199,    -1,   143,    -1,
+     146,    -1,   144,    -1,   142,    -1,   141,    -1,   150,    -1,
+     151,    -1,   154,    -1,   155,    -1,   153,    -1,   156,    -1,
+     157,    -1,    -1,   202,   201,    -1,    -1,   152,    22,    -1,
+      -1,    54,     4,    -1,    -1,   165,    54,     4,    -1,    34,
+      22,    -1,    -1,   206,    -1,    -1,   165,   209,   208,    -1,
+     206,    -1,    54,     4,    -1,    11,    -1,    12,    -1,    13,
+      -1,    16,    -1,    15,    -1,    14,    -1,    17,    -1,    50,
+      -1,   210,    -1,   211,   184,   166,    -1,   245,    -1,   167,
+       4,    -1,   211,   162,   215,   163,   202,    -1,    10,   162,
+     215,   163,   202,    -1,   168,     4,   169,   211,   170,    -1,
+     171,     4,   169,   211,   172,    -1,   173,   216,   174,    -1,
+     173,   174,    -1,   171,   173,   216,   174,   172,    -1,   171,
+     173,   174,   172,    -1,   211,   198,    -1,   211,    -1,    10,
+      -1,   212,    -1,   214,   165,   212,    -1,   214,    -1,   214,
+     165,    39,    -1,    39,    -1,    -1,   211,    -1,   216,   165,
+     211,    -1,   211,   168,   219,   170,    -1,   211,   168,   170,
+      -1,   211,   175,    22,    -1,   211,   171,   219,   172,    -1,
+     211,   173,   219,   174,    -1,   211,   173,   174,    -1,   211,
+     171,   173,   219,   174,   172,    -1,   211,   171,   173,   174,
+     172,    -1,   211,    40,    -1,   211,    41,    -1,   211,   245,
+      -1,   211,   218,    -1,   211,    25,    -1,   211,     3,    -1,
+     211,     5,    -1,   211,     4,    -1,   211,     6,    -1,   211,
+      26,    -1,   211,    27,    -1,   211,     9,    -1,   179,   162,
+     217,    38,   211,   163,    -1,   119,   162,   217,   257,   163,
+      -1,   133,   162,   217,   165,   217,   165,   217,   163,    -1,
+     177,   162,   217,   165,   217,   163,    -1,   178,   162,   217,
+     165,   217,   163,    -1,    90,   180,   162,   217,   165,   217,
+     163,    -1,    91,   181,   162,   217,   165,   217,   163,    -1,
+      92,   180,   162,   217,   165,   217,   163,    -1,    93,   181,
+     162,   217,   165,   217,   163,    -1,   135,   162,   217,   165,
+     217,   163,    -1,   136,   162,   217,   165,   217,   165,   217,
+     163,    -1,   137,   162,   217,   165,   217,   165,   217,   163,
+      -1,   139,   162,   217,   258,   163,    -1,   140,   162,   217,
+     165,   217,   258,   163,    -1,   219,   165,   217,    -1,   217,
+      -1,    32,    -1,    33,    -1,    37,    -1,    -1,   213,   245,
+      -1,   125,   162,   222,    38,   211,   163,    -1,   224,    -1,
+      -1,   225,    -1,   224,   225,    -1,    -1,    31,   226,   241,
+      -1,    -1,    30,   227,   242,    -1,    60,    59,   231,    -1,
+     185,    18,   211,    -1,   185,    18,    10,    -1,    -1,   188,
+     192,   221,   220,   217,   184,   228,   208,    -1,    -1,   188,
+     190,   192,   221,   220,   217,   184,   229,   208,    -1,    -1,
+     188,   191,   192,   221,   220,   211,   184,   230,   208,    -1,
+     188,   192,    35,   195,   222,    -1,    52,   232,    -1,    56,
+     164,   233,    -1,    22,    -1,    53,   164,    22,    -1,    68,
+     164,    22,    -1,   168,   234,   170,    -1,   234,   165,    22,
+      -1,    22,    -1,    -1,   235,   165,   211,   198,   183,    -1,
+     211,   198,   183,    -1,   235,    -1,   235,   165,    39,    -1,
+      39,    -1,    -1,   196,   200,   213,   187,   162,   236,   163,
+     202,   207,   204,   203,    -1,    28,    -1,   173,    -1,   194,
+     192,   237,   238,    -1,    29,    -1,   174,    -1,   249,   240,
+      -1,   193,   192,   237,    -1,    -1,    61,    -1,     3,    -1,
+       4,    -1,     5,    -1,     6,    -1,     9,    -1,    26,    -1,
+      27,    -1,    40,    -1,    41,    -1,    25,    -1,   171,   219,
+     172,    -1,   168,   219,   170,    -1,   168,   170,    -1,   175,
+      22,    -1,   173,   219,   174,    -1,   173,   174,    -1,   171,
+     173,   219,   174,   172,    -1,   171,   173,   174,   172,    -1,
+     218,    -1,    59,   243,    22,   165,    22,    -1,     7,    -1,
+       8,    -1,   182,    -1,   187,    -1,   245,    -1,   244,    -1,
+     211,   246,    -1,   247,    -1,   248,   165,   247,    -1,   249,
+     250,    -1,   239,   250,    -1,   251,   185,   252,    -1,   251,
+     186,   252,    -1,   251,   254,    -1,    -1,    21,    -1,    69,
+     248,    -1,    69,    10,    -1,    70,    17,   246,    -1,    70,
+      11,   246,   165,    17,   246,   165,    17,   246,    -1,    71,
+      11,   246,   165,    17,   246,   168,   253,   170,    -1,    71,
+      11,   246,   165,    17,   246,   168,   170,    -1,    72,   196,
+     200,   213,   246,   162,   256,   163,   202,    38,    17,   246,
+      73,    17,   246,    -1,    73,    -1,    74,    -1,   253,    11,
+     244,   165,    17,   246,    -1,    11,   244,   165,    17,   246,
+      -1,   185,   260,    -1,   186,   260,    -1,   211,   168,   246,
+     165,   246,   170,    -1,   255,   165,   168,   246,   165,   246,
+     170,    -1,   211,   198,   246,   198,    -1,    17,   198,   246,
+     198,    -1,   256,   165,   211,   198,   246,   198,    -1,   256,
+     165,    17,   198,   246,   198,    -1,    -1,    -1,   257,   165,
+     247,    -1,   165,     4,    -1,   258,   165,     4,    -1,    58,
+      57,    -1,    57,    -1,   177,   211,   246,   165,   246,    -1,
+     178,   211,   246,   165,   246,    -1,    90,   180,   211,   246,
+     165,   246,    -1,    91,   181,   211,   246,   165,   246,    -1,
+      92,   180,   211,   246,   165,   246,    -1,    93,   181,   211,
+     246,   165,   246,    -1,   179,   247,    38,   211,    -1,   133,
+     247,   165,   247,   165,   247,    -1,   134,   247,   165,   211,
+      -1,   135,   247,   165,   247,    -1,   136,   247,   165,   247,
+     165,   247,    -1,   137,   247,   165,   247,   165,   247,    -1,
+     132,   255,    -1,   259,   196,   200,   213,   246,   162,   256,
+     163,   202,    -1,   262,    -1,    36,    -1,    -1,   114,   211,
+     205,    -1,   114,   211,   165,    11,   246,   205,    -1,   115,
+     211,   205,    -1,   115,   211,   165,    11,   246,   205,    -1,
+     116,   247,    -1,   261,   117,   211,   246,   205,    -1,   261,
+     118,   247,   165,   211,   246,   205,    -1,   138,   211,   246,
+     165,     4,    -1,   119,   211,   246,   257,    -1,   139,   211,
+     246,   258,    -1,   140,   211,   246,   165,   211,   246,   258,
+      -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -1909,31 +1912,31 @@
     1230,  1231,  1232,  1236,  1237,  1238,  1242,  1243,  1244,  1245,
     1246,  1250,  1251,  1252,  1255,  1256,  1257,  1258,  1259,  1260,
     1261,  1268,  1269,  1270,  1271,  1272,  1273,  1274,  1275,  1276,
-    1277,  1281,  1282,  1287,  1288,  1289,  1290,  1293,  1294,  1300,
+    1277,  1278,  1282,  1283,  1288,  1289,  1290,  1291,  1294,  1295,
     1301,  1302,  1303,  1304,  1305,  1306,  1307,  1308,  1309,  1310,
-    1311,  1314,  1315,  1321,  1322,  1329,  1330,  1336,  1337,  1346,
-    1354,  1355,  1360,  1361,  1362,  1367,  1380,  1380,  1380,  1380,
-    1380,  1380,  1380,  1383,  1387,  1391,  1398,  1403,  1411,  1446,
-    1477,  1482,  1492,  1502,  1506,  1516,  1523,  1532,  1539,  1544,
-    1549,  1556,  1557,  1564,  1571,  1579,  1585,  1597,  1625,  1641,
-    1668,  1696,  1722,  1742,  1768,  1788,  1800,  1807,  1873,  1883,
-    1893,  1904,  1917,  1928,  1942,  1949,  1956,  1974,  1986,  2007,
-    2015,  2021,  2032,  2037,  2042,  2047,  2052,  2058,  2064,  2070,
-    2078,  2089,  2093,  2101,  2101,  2104,  2104,  2107,  2119,  2140,
-    2145,  2153,  2154,  2158,  2158,  2162,  2162,  2165,  2168,  2192,
-    2204,  2203,  2215,  2214,  2224,  2223,  2234,  2274,  2277,  2283,
-    2293,  2297,  2302,  2304,  2309,  2314,  2323,  2333,  2344,  2348,
-    2357,  2366,  2371,  2520,  2520,  2522,  2531,  2531,  2533,  2538,
-    2550,  2554,  2559,  2563,  2567,  2572,  2577,  2581,  2585,  2589,
-    2593,  2597,  2601,  2623,  2645,  2651,  2664,  2676,  2681,  2693,
-    2699,  2703,  2713,  2717,  2721,  2726,  2733,  2733,  2739,  2748,
-    2753,  2758,  2762,  2771,  2780,  2793,  2802,  2806,  2814,  2834,
-    2838,  2843,  2854,  2873,  2882,  2986,  2990,  2997,  3008,  3021,
-    3030,  3043,  3054,  3064,  3075,  3083,  3093,  3100,  3103,  3104,
-    3112,  3118,  3127,  3131,  3136,  3152,  3169,  3181,  3193,  3207,
-    3221,  3233,  3254,  3261,  3267,  3273,  3279,  3294,  3404,  3409,
-    3413,  3420,  3427,  3437,  3444,  3454,  3462,  3476,  3493,  3507,
-    3522,  3537
+    1311,  1312,  1315,  1316,  1322,  1323,  1330,  1331,  1339,  1340,
+    1351,  1359,  1360,  1365,  1366,  1367,  1372,  1387,  1387,  1387,
+    1387,  1387,  1387,  1387,  1390,  1394,  1398,  1405,  1410,  1418,
+    1453,  1484,  1489,  1499,  1509,  1513,  1523,  1530,  1539,  1546,
+    1551,  1556,  1563,  1564,  1571,  1578,  1586,  1592,  1604,  1632,
+    1648,  1675,  1703,  1729,  1749,  1775,  1795,  1807,  1814,  1880,
+    1890,  1900,  1911,  1924,  1935,  1949,  1956,  1963,  1981,  1993,
+    2014,  2022,  2028,  2039,  2044,  2049,  2054,  2059,  2065,  2071,
+    2077,  2085,  2096,  2100,  2108,  2108,  2111,  2111,  2114,  2126,
+    2147,  2152,  2160,  2161,  2165,  2165,  2169,  2169,  2172,  2175,
+    2199,  2211,  2210,  2222,  2221,  2231,  2230,  2241,  2281,  2284,
+    2290,  2300,  2304,  2309,  2311,  2316,  2321,  2330,  2340,  2351,
+    2355,  2364,  2373,  2378,  2527,  2527,  2529,  2538,  2538,  2540,
+    2545,  2557,  2561,  2566,  2570,  2574,  2579,  2584,  2588,  2592,
+    2596,  2600,  2604,  2608,  2630,  2652,  2658,  2671,  2683,  2688,
+    2700,  2706,  2710,  2720,  2724,  2728,  2733,  2740,  2740,  2746,
+    2755,  2760,  2765,  2769,  2778,  2787,  2800,  2809,  2813,  2821,
+    2841,  2845,  2850,  2861,  2880,  2889,  2993,  2997,  3004,  3015,
+    3028,  3037,  3050,  3061,  3071,  3082,  3090,  3100,  3107,  3110,
+    3111,  3119,  3125,  3134,  3138,  3143,  3159,  3176,  3188,  3200,
+    3214,  3228,  3240,  3261,  3268,  3274,  3280,  3286,  3301,  3411,
+    3416,  3420,  3427,  3434,  3444,  3451,  3461,  3469,  3483,  3500,
+    3514,  3529,  3544
 };
 #endif
 
@@ -1964,11 +1967,11 @@
   "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR", "PTRTOINT", "PHI_TOK",
   "SELECT", "VAARG", "EXTRACTELEMENT", "INSERTELEMENT", "SHUFFLEVECTOR",
   "GETRESULT", "EXTRACTVALUE", "INSERTVALUE", "SIGNEXT", "ZEROEXT",
-  "NORETURN", "INREG", "SRET", "NOUNWIND", "NOALIAS", "BYVAL", "NEST",
+  "NORETURN", "INREG", "SRET", "NOUNWIND", "NOALIAS", "NOCAPTURE", "BYVAL",
   "READNONE", "READONLY", "GC", "OPTSIZE", "NOINLINE", "ALWAYSINLINE",
-  "SSP", "SSPREQ", "DEFAULT", "HIDDEN", "PROTECTED", "'('", "')'", "'='",
-  "','", "'*'", "'\\\\'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'",
-  "'c'", "$accept", "ArithmeticOps", "LogicalOps", "CastOps",
+  "SSP", "SSPREQ", "NEST", "DEFAULT", "HIDDEN", "PROTECTED", "'('", "')'",
+  "'='", "','", "'*'", "'\\\\'", "'['", "'x'", "']'", "'<'", "'>'", "'{'",
+  "'}'", "'c'", "$accept", "ArithmeticOps", "LogicalOps", "CastOps",
   "IPredicates", "FPredicates", "LocalName", "OptLocalName",
   "OptAddrSpace", "OptLocalAssign", "LocalNumber", "GlobalName",
   "OptGlobalAssign", "GlobalAssign", "GVInternalLinkage",
@@ -2012,50 +2015,50 @@
      385,   386,   387,   388,   389,   390,   391,   392,   393,   394,
      395,   396,   397,   398,   399,   400,   401,   402,   403,   404,
      405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
-     415,    40,    41,    61,    44,    42,    92,    91,   120,    93,
-      60,    62,   123,   125,    99
+     415,   416,    40,    41,    61,    44,    42,    92,    91,   120,
+      93,    60,    62,   123,   125,    99
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   175,   176,   176,   176,   176,   176,   176,   176,   176,
-     176,   177,   177,   177,   177,   177,   177,   178,   178,   178,
-     178,   178,   178,   178,   178,   178,   178,   178,   178,   179,
+       0,   176,   177,   177,   177,   177,   177,   177,   177,   177,
+     177,   178,   178,   178,   178,   178,   178,   179,   179,   179,
      179,   179,   179,   179,   179,   179,   179,   179,   179,   180,
-     180,   180,   180,   180,   180,   180,   180,   180,   180,   180,
-     180,   180,   180,   180,   180,   181,   181,   181,   182,   182,
-     183,   183,   184,   184,   185,   186,   186,   187,   187,   188,
-     189,   189,   189,   189,   189,   189,   190,   190,   190,   191,
-     191,   191,   191,   192,   192,   192,   193,   193,   193,   193,
-     193,   194,   194,   194,   195,   195,   195,   195,   195,   195,
-     195,   196,   196,   196,   196,   196,   196,   196,   196,   196,
-     196,   197,   197,   198,   198,   198,   198,   199,   199,   200,
-     200,   200,   200,   200,   200,   200,   200,   200,   200,   200,
-     200,   201,   201,   202,   202,   203,   203,   204,   204,   205,
-     206,   206,   207,   207,   208,   208,   209,   209,   209,   209,
-     209,   209,   209,   210,   210,   210,   210,   210,   210,   210,
-     210,   210,   210,   210,   210,   210,   211,   212,   212,   213,
-     213,   214,   214,   214,   214,   215,   215,   216,   216,   216,
-     216,   216,   216,   216,   216,   216,   216,   216,   216,   216,
-     216,   216,   216,   216,   216,   216,   216,   217,   217,   217,
+     180,   180,   180,   180,   180,   180,   180,   180,   180,   181,
+     181,   181,   181,   181,   181,   181,   181,   181,   181,   181,
+     181,   181,   181,   181,   181,   182,   182,   182,   183,   183,
+     184,   184,   185,   185,   186,   187,   187,   188,   188,   189,
+     190,   190,   190,   190,   190,   190,   191,   191,   191,   192,
+     192,   192,   192,   193,   193,   193,   194,   194,   194,   194,
+     194,   195,   195,   195,   196,   196,   196,   196,   196,   196,
+     196,   197,   197,   197,   197,   197,   197,   197,   197,   197,
+     197,   197,   198,   198,   199,   199,   199,   199,   200,   200,
+     201,   201,   201,   201,   201,   201,   201,   201,   201,   201,
+     201,   201,   202,   202,   203,   203,   204,   204,   205,   205,
+     206,   207,   207,   208,   208,   209,   209,   210,   210,   210,
+     210,   210,   210,   210,   211,   211,   211,   211,   211,   211,
+     211,   211,   211,   211,   211,   211,   211,   212,   213,   213,
+     214,   214,   215,   215,   215,   215,   216,   216,   217,   217,
      217,   217,   217,   217,   217,   217,   217,   217,   217,   217,
-     217,   218,   218,   219,   219,   220,   220,   221,   221,   222,
-     222,   223,   223,   225,   224,   226,   224,   224,   224,   224,
-     227,   224,   228,   224,   229,   224,   224,   224,   224,   230,
-     231,   231,   232,   233,   233,   233,   234,   234,   235,   235,
-     235,   235,   236,   237,   237,   238,   239,   239,   240,   241,
-     242,   242,   243,   243,   243,   243,   243,   243,   243,   243,
-     243,   243,   243,   243,   243,   243,   243,   243,   243,   243,
-     243,   243,   244,   244,   244,   244,   245,   245,   246,   247,
-     247,   248,   248,   249,   249,   250,   250,   250,   251,   251,
-     251,   251,   251,   251,   251,   251,   251,   252,   252,   253,
-     253,   254,   254,   255,   255,   255,   255,   255,   256,   256,
-     257,   257,   258,   258,   259,   259,   259,   259,   259,   259,
-     259,   259,   259,   259,   259,   259,   259,   259,   259,   260,
-     260,   261,   261,   261,   261,   261,   261,   261,   261,   261,
-     261,   261
+     217,   217,   217,   217,   217,   217,   217,   217,   218,   218,
+     218,   218,   218,   218,   218,   218,   218,   218,   218,   218,
+     218,   218,   219,   219,   220,   220,   221,   221,   222,   222,
+     223,   223,   224,   224,   226,   225,   227,   225,   225,   225,
+     225,   228,   225,   229,   225,   230,   225,   225,   225,   225,
+     231,   232,   232,   233,   234,   234,   234,   235,   235,   236,
+     236,   236,   236,   237,   238,   238,   239,   240,   240,   241,
+     242,   243,   243,   244,   244,   244,   244,   244,   244,   244,
+     244,   244,   244,   244,   244,   244,   244,   244,   244,   244,
+     244,   244,   244,   245,   245,   245,   245,   246,   246,   247,
+     248,   248,   249,   249,   250,   250,   251,   251,   251,   252,
+     252,   252,   252,   252,   252,   252,   252,   252,   253,   253,
+     254,   254,   255,   255,   256,   256,   256,   256,   256,   257,
+     257,   258,   258,   259,   259,   260,   260,   260,   260,   260,
+     260,   260,   260,   260,   260,   260,   260,   260,   260,   260,
+     261,   261,   262,   262,   262,   262,   262,   262,   262,   262,
+     262,   262,   262
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -2072,31 +2075,31 @@
        1,     1,     1,     0,     1,     1,     0,     1,     1,     1,
        1,     0,     1,     1,     0,     1,     1,     1,     1,     1,
        2,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       2,     0,     2,     1,     1,     1,     1,     0,     2,     1,
+       1,     2,     0,     2,     1,     1,     1,     1,     0,     2,
        1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     0,     2,     0,     2,     0,     2,     0,     3,     2,
-       0,     1,     0,     3,     1,     2,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     3,     1,     2,     5,     5,
-       5,     5,     3,     2,     5,     4,     2,     1,     1,     1,
-       3,     1,     3,     1,     0,     1,     3,     4,     3,     3,
-       4,     4,     3,     6,     5,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     6,     5,     8,
-       6,     6,     7,     7,     7,     7,     6,     8,     8,     5,
-       7,     3,     1,     1,     1,     1,     0,     2,     6,     1,
-       0,     1,     2,     0,     3,     0,     3,     3,     3,     3,
-       0,     8,     0,     9,     0,     9,     5,     2,     3,     1,
-       3,     3,     3,     3,     1,     0,     5,     3,     1,     3,
-       1,     0,    11,     1,     1,     4,     1,     1,     2,     3,
-       0,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     3,     3,     2,     2,     3,     2,     5,     4,
-       1,     5,     1,     1,     1,     1,     1,     1,     2,     1,
-       3,     2,     2,     3,     3,     2,     0,     1,     2,     2,
-       3,     9,     9,     8,    15,     1,     1,     6,     5,     2,
-       2,     6,     7,     4,     4,     6,     6,     0,     0,     3,
-       2,     3,     2,     1,     5,     5,     6,     6,     6,     6,
-       4,     6,     4,     4,     6,     6,     2,     9,     1,     1,
-       0,     3,     6,     3,     6,     2,     5,     7,     5,     4,
-       4,     7
+       1,     1,     0,     2,     0,     2,     0,     2,     0,     3,
+       2,     0,     1,     0,     3,     1,     2,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     3,     1,     2,     5,
+       5,     5,     5,     3,     2,     5,     4,     2,     1,     1,
+       1,     3,     1,     3,     1,     0,     1,     3,     4,     3,
+       3,     4,     4,     3,     6,     5,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     6,     5,
+       8,     6,     6,     7,     7,     7,     7,     6,     8,     8,
+       5,     7,     3,     1,     1,     1,     1,     0,     2,     6,
+       1,     0,     1,     2,     0,     3,     0,     3,     3,     3,
+       3,     0,     8,     0,     9,     0,     9,     5,     2,     3,
+       1,     3,     3,     3,     3,     1,     0,     5,     3,     1,
+       3,     1,     0,    11,     1,     1,     4,     1,     1,     2,
+       3,     0,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     3,     3,     2,     2,     3,     2,     5,
+       4,     1,     5,     1,     1,     1,     1,     1,     1,     2,
+       1,     3,     2,     2,     3,     3,     2,     0,     1,     2,
+       2,     3,     9,     9,     8,    15,     1,     1,     6,     5,
+       2,     2,     6,     7,     4,     4,     6,     6,     0,     0,
+       3,     2,     3,     2,     1,     5,     5,     6,     6,     6,
+       6,     4,     6,     4,     4,     6,     6,     2,     9,     1,
+       1,     0,     3,     6,     3,     6,     2,     5,     7,     5,
+       4,     4,     7
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -2104,310 +2107,314 @@
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
-      68,    55,    65,    56,    66,    57,   225,   223,     0,     0,
-       0,     0,     0,     0,    79,    67,     0,    68,   221,    83,
-      86,     0,     0,   237,     0,     0,    62,     0,    69,    70,
+      68,    55,    65,    56,    66,    57,   226,   224,     0,     0,
+       0,     0,     0,     0,    79,    67,     0,    68,   222,    83,
+      86,     0,     0,   238,     0,     0,    62,     0,    69,    70,
       72,    71,    73,    76,    74,    77,    75,    78,    80,    81,
-      82,    79,    79,   216,     1,   222,    84,    85,    79,   226,
-      87,    88,    89,    90,    79,   296,   224,   296,     0,     0,
-     245,   238,   239,   227,   282,   283,   229,   146,   147,   148,
-     151,   150,   149,   152,   153,     0,     0,     0,     0,   284,
-     285,   154,   228,   156,   216,   216,    91,   215,     0,    94,
-      94,   297,   292,    63,   256,   257,   258,   291,   240,   241,
-     244,     0,   174,   157,     0,     0,     0,     0,   163,   175,
-       0,     0,   174,     0,     0,     0,    93,    92,     0,   213,
-     214,     0,     0,    95,    96,    97,    98,    99,   117,   259,
-       0,     0,   340,   340,   295,     0,   242,   173,   111,   169,
-     171,     0,     0,     0,     0,     0,     0,   162,     0,     0,
-     155,     0,     0,   168,     0,   167,     0,   236,    61,    61,
-     100,     0,   253,   254,   255,    64,   339,   323,     0,     0,
-       0,     0,    94,   305,   306,     2,     3,     4,     5,     6,
+      82,    79,    79,   217,     1,   223,    84,    85,    79,   227,
+      87,    88,    89,    90,    79,   297,   225,   297,     0,     0,
+     246,   239,   240,   228,   283,   284,   230,   147,   148,   149,
+     152,   151,   150,   153,   154,     0,     0,     0,     0,   285,
+     286,   155,   229,   157,   217,   217,    91,   216,     0,    94,
+      94,   298,   293,    63,   257,   258,   259,   292,   241,   242,
+     245,     0,   175,   158,     0,     0,     0,     0,   164,   176,
+       0,     0,   175,     0,     0,     0,    93,    92,     0,   214,
+     215,     0,     0,    95,    96,    97,    98,    99,   118,   260,
+       0,     0,   341,   341,   296,     0,   243,   174,   112,   170,
+     172,     0,     0,     0,     0,     0,     0,   163,     0,     0,
+     156,     0,     0,   169,     0,   168,     0,   237,    61,    61,
+     100,     0,   254,   255,   256,    64,   340,   324,     0,     0,
+       0,     0,    94,   306,   307,     2,     3,     4,     5,     6,
        7,     8,     9,    10,    14,    15,    16,    11,    12,    13,
        0,     0,     0,     0,     0,     0,     0,     0,    17,    18,
       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   293,    94,   309,     0,   338,   294,   310,   243,
-     166,     0,   131,    61,    61,   165,     0,   176,     0,   131,
-      61,    61,     0,   217,   190,   192,   191,   193,   196,   189,
-     194,   195,   185,   186,     0,     0,     0,     0,     0,     0,
+       0,     0,   294,    94,   310,     0,   339,   295,   311,   244,
+     167,     0,   132,    61,    61,   166,     0,   177,     0,   132,
+      61,    61,     0,   218,   191,   193,   192,   194,   197,   190,
+     195,   196,   186,   187,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   188,   187,   230,   115,   114,   113,   116,   118,
-       0,   322,   299,    61,   289,   298,     0,     0,     0,   117,
+       0,     0,   189,   188,   231,   116,   115,   114,   117,   119,
+       0,   323,   300,    61,   290,   299,     0,     0,     0,   118,
       29,    30,    31,    32,    33,    34,    35,    36,    37,    38,
        0,    53,    54,    49,    50,    51,    52,    39,    40,    41,
       42,    43,    44,    45,    46,    47,    48,     0,     0,     0,
-     137,   137,   345,    61,    61,   336,     0,     0,     0,     0,
-       0,    61,    61,    61,    61,    61,     0,   117,     0,     0,
+     138,   138,   346,    61,    61,   337,     0,     0,     0,     0,
+       0,    61,    61,    61,    61,    61,     0,   118,     0,     0,
        0,   102,   104,   103,   101,   105,   106,   107,   108,   109,
-     112,   172,   170,   159,   160,   161,   164,    60,   158,   232,
-     234,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   178,   212,     0,     0,     0,   182,     0,
-     179,     0,     0,     0,   142,     0,   262,   263,   264,   265,
-     266,   271,   267,   268,   269,   270,   260,     0,     0,     0,
-       0,   280,   287,   286,   288,     0,     0,   300,     0,     0,
-      61,    61,    61,    61,     0,   341,     0,   343,   318,     0,
+     110,   113,   173,   171,   160,   161,   162,   165,    60,   159,
+     233,   235,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   179,   213,     0,     0,     0,   183,
+       0,   180,     0,     0,     0,   143,     0,   263,   264,   265,
+     266,   267,   272,   268,   269,   270,   271,   261,     0,     0,
+       0,     0,   281,   288,   287,   289,     0,     0,   301,     0,
+       0,    61,    61,    61,    61,     0,   342,     0,   344,   319,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    61,     0,   110,   123,   122,   119,   121,
-     120,   124,   125,   128,   126,   127,   129,   130,   132,   142,
-     142,     0,     0,     0,     0,     0,   318,     0,     0,     0,
-       0,     0,     0,     0,   177,   163,   175,     0,   180,   181,
-       0,     0,     0,     0,   231,   251,   261,     0,   274,     0,
-       0,     0,   277,     0,   275,   290,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   349,     0,     0,     0,
-     332,   333,     0,     0,     0,     0,   350,     0,     0,     0,
-     330,     0,   137,     0,   233,   235,    61,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   211,   184,
-       0,     0,     0,     0,     0,     0,   144,   142,   250,   111,
-     248,     0,     0,   273,   163,     0,   272,   276,     0,     0,
-       0,     0,     0,     0,     0,   137,   138,   137,     0,     0,
-       0,     0,     0,     0,   348,   320,     0,    61,   324,   325,
-       0,     0,   346,    61,   218,     0,     0,     0,     0,   198,
-       0,     0,     0,     0,   209,     0,   183,     0,     0,    61,
-     139,   145,   143,    59,     0,   131,     0,   279,     0,     0,
-       0,   317,   326,   327,   328,   329,   342,   344,   319,     0,
-       0,   331,   334,   335,   321,     0,   317,   137,     0,     0,
-       0,     0,     0,   206,     0,     0,     0,   200,   201,   197,
-      58,   247,   249,   111,   140,   281,   278,     0,     0,   111,
-     111,     0,   311,     0,   351,     0,   347,   202,   203,   204,
-     205,     0,     0,     0,   210,    59,   141,   135,     0,     0,
-     303,     0,     0,     0,   131,     0,   312,   131,   199,   207,
-     208,   246,     0,   133,   301,     0,     0,   302,   102,   104,
-     111,   111,     0,   111,   111,   337,   136,     0,   252,     0,
-       0,   314,   313,     0,     0,     0,   134,     0,     0,     0,
-     111,   111,   308,     0,     0,   316,   315,   307,     0,     0,
-     304
+       0,     0,     0,     0,    61,     0,   111,   124,   123,   120,
+     122,   121,   125,   126,   129,   127,   128,   130,   131,   133,
+     143,   143,     0,     0,     0,     0,     0,   319,     0,     0,
+       0,     0,     0,     0,     0,   178,   164,   176,     0,   181,
+     182,     0,     0,     0,     0,   232,   252,   262,     0,   275,
+       0,     0,     0,   278,     0,   276,   291,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   350,     0,     0,
+       0,   333,   334,     0,     0,     0,     0,   351,     0,     0,
+       0,   331,     0,   138,     0,   234,   236,    61,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   212,
+     185,     0,     0,     0,     0,     0,     0,   145,   143,   251,
+     112,   249,     0,     0,   274,   164,     0,   273,   277,     0,
+       0,     0,     0,     0,     0,     0,   138,   139,   138,     0,
+       0,     0,     0,     0,     0,   349,   321,     0,    61,   325,
+     326,     0,     0,   347,    61,   219,     0,     0,     0,     0,
+     199,     0,     0,     0,     0,   210,     0,   184,     0,     0,
+      61,   140,   146,   144,    59,     0,   132,     0,   280,     0,
+       0,     0,   318,   327,   328,   329,   330,   343,   345,   320,
+       0,     0,   332,   335,   336,   322,     0,   318,   138,     0,
+       0,     0,     0,     0,   207,     0,     0,     0,   201,   202,
+     198,    58,   248,   250,   112,   141,   282,   279,     0,     0,
+     112,   112,     0,   312,     0,   352,     0,   348,   203,   204,
+     205,   206,     0,     0,     0,   211,    59,   142,   136,     0,
+       0,   304,     0,     0,     0,   132,     0,   313,   132,   200,
+     208,   209,   247,     0,   134,   302,     0,     0,   303,   102,
+     104,   112,   112,     0,   112,   112,   338,   137,     0,   253,
+       0,     0,   315,   314,     0,     0,     0,   135,     0,     0,
+       0,   112,   112,   309,     0,     0,   317,   316,   308,     0,
+       0,   305
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,   269,   270,   271,   300,   317,    79,   631,   113,    12,
+      -1,   269,   270,   271,   300,   317,    79,   632,   113,    12,
      133,    80,    14,    15,    41,    42,    43,    48,    54,   118,
-     128,   350,   230,   279,   161,   448,   353,   688,   673,   415,
-     536,   657,   474,   537,    81,   158,   139,   156,   140,   141,
-     110,   374,   401,   375,   121,    88,   157,    16,    17,    18,
-      20,    19,   384,   449,   450,    63,    23,    61,   101,   540,
-     541,   129,   164,    55,    96,    56,    49,   477,   402,    83,
-     404,   284,   285,    57,    92,    93,   222,   661,   134,   325,
-     641,   496,   506,   223,   224,   225,   226
+     128,   351,   230,   279,   161,   449,   354,   689,   674,   416,
+     537,   658,   475,   538,    81,   158,   139,   156,   140,   141,
+     110,   375,   402,   376,   121,    88,   157,    16,    17,    18,
+      20,    19,   385,   450,   451,    63,    23,    61,   101,   541,
+     542,   129,   164,    55,    96,    56,    49,   478,   403,    83,
+     405,   284,   285,    57,    92,    93,   222,   662,   134,   325,
+     642,   497,   507,   223,   224,   225,   226
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -619
+#define YYPACT_NINF -611
 static const yytype_int16 yypact[] =
 {
-     790,  -619,  -619,  -619,  -619,  -619,  -619,  -619,    10,   -86,
-      53,   -45,   136,    38,    62,  -619,    49,  1492,  -619,   117,
-     167,    39,    43,  -619,    45,   151,  -619,  1999,  -619,  -619,
-    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    -619,   -27,   -27,   146,  -619,  -619,  -619,  -619,   -27,  -619,
-    -619,  -619,  -619,  -619,   -27,   197,  -619,     9,   216,   224,
-     228,  -619,  -619,  -619,  -619,  -619,   105,  -619,  -619,  -619,
-    -619,  -619,  -619,  -619,  -619,   266,   269,     2,   481,  -619,
-    -619,  -619,   -37,  -619,   244,   244,   156,  -619,    69,   213,
-     213,  -619,  -619,    40,  -619,  -619,  -619,  -619,  -619,  -619,
-    -619,   -70,  1724,  -619,   118,   119,   550,   105,  -619,   -37,
-    -118,   124,  1724,   125,    69,    69,  -619,  -619,  1768,  -619,
-    -619,  2024,   285,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-     -16,   131,  2294,  2294,  -619,   273,  -619,  -619,   -37,  -619,
-     132,   135,  2024,  2024,   127,   -83,  2024,  -619,   295,   138,
-    -619,  2024,  2024,   105,   145,   -37,    46,  -619,  1278,   252,
-    -619,  1679,  -619,  -619,  -619,  -619,  -619,  -619,   251,  2065,
-      78,   298,   213,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-     630,   660,   630,   660,  2024,  2024,  2024,  2024,  -619,  -619,
-    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    2024,  2024,  2024,  2024,  2024,  2024,  2024,  2024,  2024,  2024,
-    2024,  2024,  -619,   213,  -619,    59,  -619,  -619,  -619,  -619,
-     335,  1817,  -619,   -39,   -42,  -619,   147,   -37,   158,  -619,
-     252,   -10,  1768,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    -619,  -619,  -619,  -619,   630,   660,   630,   660,   160,   161,
-     170,   171,   172,   174,   175,  1858,  2124,   984,   312,   176,
-     181,   182,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-      64,  -619,   105,   934,  -619,   180,  1450,  1450,  1450,  -619,
-    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    2024,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    -619,  -619,  -619,  -619,  -619,  -619,  -619,  2024,  2024,  2024,
-     -24,   -19,  -619,   934,   -40,   183,   184,   187,   188,   189,
-     190,   934,   934,   934,   934,   934,   307,  -619,  2024,  2024,
-     342,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    -619,  -619,  -619,   557,  -619,  -619,  -619,  -619,   557,  -619,
-     125,   317,   195,   196,   200,   201,  2024,  2024,  2024,  2024,
-    2024,  2024,  2024,  -619,  -619,    -9,  1155,  -120,  -619,   -76,
-    -619,  2024,  2024,  2024,   203,   202,  -619,  -619,  -619,  -619,
-    -619,  -619,  -619,  -619,  -619,  -619,   299,  1899,  2165,  1327,
-     343,  -619,  -619,  -619,  -619,  2024,   204,  -619,   208,  1679,
-     934,   934,   934,   934,    17,  -619,    28,  -619,  -619,  1450,
-     206,  2024,  2024,  2024,  2024,  2024,   210,   211,   212,   214,
-     217,  2024,  1679,   934,   218,  -619,  -619,  -619,  -619,  -619,
-    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,   203,
-     203,  2024,  2024,  2024,  2024,  2024,  -619,   220,   222,   227,
-     229,   211,   230,  2024,  -619,   193,  1106,   -73,  -619,  -619,
-     238,   240,   339,     6,  -619,  1940,  -619,   366,  -619,    -3,
-    1638,   -97,  -619,   -11,  -619,  -619,   375,   390,  1450,   248,
-     250,   255,   256,  1450,   411,  1450,   257,   258,  1450,   259,
-     -37,  -619,   260,   262,   412,   423,   265,  2024,  1450,  1450,
-     -37,  1450,   268,  2024,  -619,  -619,   -23,   270,   271,   272,
-     274,    55,  2024,  2024,  2024,  2024,    66,  2024,  -619,  -619,
-     276,  2024,  2024,  2024,   408,   429,  -619,   203,  -619,   -37,
-     275,   280,   284,  -619,   279,    35,  -619,  -619,  1450,  1450,
-     291,  1450,  1450,  1450,  1450,   268,  -619,   268,  2024,  1450,
-     289,  2024,  2024,  2024,  -619,  -619,   433,   934,  -619,  -619,
-     294,   404,  -619,   934,  -619,  2024,  2024,  2024,  2024,  -619,
-     296,   304,   303,   305,  -619,   211,  -619,   306,   308,   -12,
-    -619,  -619,  -619,   522,  1958,  -619,   449,  -619,   314,   311,
-     319,  2190,  -619,  -619,  -619,  -619,  -619,  -619,  -619,   309,
-    1450,  -619,  -619,  -619,  -619,   211,  2190,   268,   328,   337,
-     344,   351,  2024,  -619,  2024,  2024,    72,  -619,  -619,  -619,
-    -619,  -619,  -619,   -37,   173,  -619,  -619,   497,    -2,   -13,
-     -37,    73,  -619,   346,   265,    87,  -619,  -619,  -619,  -619,
-    -619,   354,   360,   361,  -619,   522,  -619,   470,  1450,  1588,
-    -619,     3,   778,   778,  -619,  2231,  -619,  -619,  -619,  -619,
-    -619,  -619,   521,   374,  -619,   363,  1588,  -619,   367,   368,
-    -619,  -619,   474,   -13,   -37,   557,  -619,   508,  -619,   516,
-     370,   335,   335,   523,   778,   778,  -619,  1450,   525,  1450,
-    -619,  -619,  -619,  1450,   465,   335,   335,  -619,   526,  1450,
-    -619
+     828,  -611,  -611,  -611,  -611,  -611,  -611,  -611,    -5,   -90,
+      68,   -25,   113,   -20,    -9,  -611,   153,  1107,  -611,   173,
+      15,    36,    48,  -611,    -3,   196,  -611,  1950,  -611,  -611,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    -611,   137,   137,   190,  -611,  -611,  -611,  -611,   137,  -611,
+    -611,  -611,  -611,  -611,   137,   203,  -611,     3,   212,   215,
+     229,  -611,  -611,  -611,  -611,  -611,    83,  -611,  -611,  -611,
+    -611,  -611,  -611,  -611,  -611,   252,   268,     7,    87,  -611,
+    -611,  -611,    73,  -611,   238,   238,   186,  -611,    22,   200,
+     200,  -611,  -611,    42,  -611,  -611,  -611,  -611,  -611,  -611,
+    -611,     8,  1765,  -611,   110,   121,   573,    83,  -611,    73,
+    -114,   138,  1765,   142,    22,    22,  -611,  -611,  1368,  -611,
+    -611,  1991,   298,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+     -16,   168,  2181,  2181,  -611,   311,  -611,  -611,    73,  -611,
+     169,   174,  1991,  1991,   164,   -95,  1991,  -611,   334,   178,
+    -611,  1991,  1991,    83,   182,    73,   287,  -611,  1319,   293,
+    -611,  1680,  -611,  -611,  -611,  -611,  -611,  -611,   295,  2032,
+     119,   339,   200,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+     465,   412,   465,   412,  1991,  1991,  1991,  1991,  -611,  -611,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    1991,  1991,  1991,  1991,  1991,  1991,  1991,  1991,  1991,  1991,
+    1991,  1991,  -611,   200,  -611,   -33,  -611,  -611,  -611,  -611,
+     271,  1818,  -611,    -8,   -39,  -611,   181,    73,   191,  -611,
+     293,    -2,  1368,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    -611,  -611,  -611,  -611,   465,   412,   465,   412,   193,   195,
+     199,   201,   202,   205,   206,  1721,  2061,   659,   336,   210,
+     211,   213,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+     187,  -611,    83,   973,  -611,   197,  1492,  1492,  1492,  -611,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    1991,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,  1991,  1991,  1991,
+       1,    17,  -611,   973,   -30,   214,   216,   218,   220,   221,
+     224,   973,   973,   973,   973,   973,   322,  -611,  1991,  1991,
+     361,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    -611,  -611,  -611,  -611,   657,  -611,  -611,  -611,  -611,   657,
+    -611,   142,   338,   226,   228,   232,   233,  1991,  1991,  1991,
+    1991,  1991,  1991,  1991,  -611,  -611,    41,   743,    32,  -611,
+     -83,  -611,  1991,  1991,  1991,   236,   240,  -611,  -611,  -611,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,   313,  1859,  2117,
+    1023,   355,  -611,  -611,  -611,  -611,  1991,   243,  -611,   245,
+    1680,   973,   973,   973,   973,    33,  -611,    35,  -611,  -611,
+    1492,   235,  1991,  1991,  1991,  1991,  1991,   256,   257,   258,
+     265,   267,  1991,  1680,   973,   269,  -611,  -611,  -611,  -611,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+     236,   236,  1991,  1991,  1991,  1991,  1991,  -611,   270,   272,
+     275,   276,   257,   284,  1991,  -611,   219,  1146,   -69,  -611,
+    -611,   286,   288,   340,    11,  -611,  1891,  -611,   383,  -611,
+      44,  1195,    43,  -611,   -53,  -611,  -611,   400,   416,  1492,
+     289,   291,   296,   297,  1492,   432,  1492,   301,   306,  1492,
+     307,    73,  -611,   308,   309,   448,   456,   312,  1991,  1492,
+    1492,    73,  1492,   314,  1991,  -611,  -611,   -14,   315,   316,
+     319,   320,    78,  1991,  1991,  1991,  1991,    94,  1991,  -611,
+    -611,   304,  1991,  1991,  1991,   441,   474,  -611,   236,  -611,
+      73,   321,   324,   329,  -611,   325,   -52,  -611,  -611,  1492,
+    1492,   345,  1492,  1492,  1492,  1492,   314,  -611,   314,  1991,
+    1492,   331,  1991,  1991,  1991,  -611,  -611,   494,   973,  -611,
+    -611,   365,   447,  -611,   973,  -611,  1991,  1991,  1991,  1991,
+    -611,   367,   371,   370,   375,  -611,   257,  -611,   378,   379,
+     126,  -611,  -611,  -611,   198,  1932,  -611,   521,  -611,   372,
+     380,   381,  2158,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+     377,  1492,  -611,  -611,  -611,  -611,   257,  2158,   314,   385,
+     387,   388,   389,  1991,  -611,  1991,  1991,   122,  -611,  -611,
+    -611,  -611,  -611,  -611,    73,   127,  -611,  -611,   536,     2,
+      74,    73,   136,  -611,   401,   312,   140,  -611,  -611,  -611,
+    -611,  -611,   407,   409,   410,  -611,   198,  -611,   523,  1492,
+    1630,  -611,     4,   816,   816,  -611,  2199,  -611,  -611,  -611,
+    -611,  -611,  -611,   571,   430,  -611,   437,  1630,  -611,   442,
+     443,  -611,  -611,   349,    74,    73,   657,  -611,   584,  -611,
+     592,   449,   271,   271,   595,   816,   816,  -611,  1492,   599,
+    1492,  -611,  -611,  -611,  1492,   544,   271,   271,  -611,   601,
+    1492,  -611
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-    -619,   110,   128,   130,  -158,  -132,     0,  -116,  -126,   452,
-    -619,     8,  -619,  -619,  -619,  -619,    31,  -619,  -619,  -619,
-    -148,  -619,  -436,  -619,  -254,  -619,  -236,  -619,  -619,  -316,
-     -87,  -619,  -393,  -619,  -619,   -26,   318,  -150,  -619,   436,
-     445,  -114,  -156,  -240,   157,   199,   310,  -619,  -619,   536,
-    -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,  -619,
-    -619,   466,  -619,  -619,  -619,  -619,  -619,  -619,  -618,  -108,
-     186,  -192,  -619,  -619,   502,  -619,   438,  -619,  -619,  -619,
-     -38,   121,  -451,  -619,   446,  -619,  -619
+    -611,   183,   185,   189,  -166,  -110,     0,   -36,  -116,   528,
+    -611,     6,  -611,  -611,  -611,  -611,    27,  -611,  -611,  -611,
+    -145,  -611,  -526,  -611,  -260,  -611,  -237,  -611,  -611,  -314,
+     -13,  -611,  -420,  -611,  -611,   -26,   393,  -157,  -611,   514,
+     522,    75,  -153,  -258,   209,   246,   390,  -611,  -611,   610,
+    -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,  -611,
+    -611,   539,  -611,  -611,  -611,  -611,  -611,  -611,  -610,   -85,
+     223,  -193,  -611,  -611,   574,  -611,   497,  -611,  -611,  -611,
+      16,   184,  -452,  -611,   505,  -611,  -611
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
    number is the opposite.  If zero, do what YYDEFACT says.
    If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -221
+#define YYTABLE_NINF -222
 static const yytype_int16 yytable[] =
 {
-      11,    82,   272,   358,   322,   417,   105,   159,    13,   659,
-     526,   280,   162,   111,   676,   111,   111,    11,   111,   326,
-     327,   328,   329,   330,   289,    13,   377,   379,   493,   336,
-      91,   111,   111,   274,   318,   409,   111,   240,    94,   495,
-     534,   675,  -152,   111,   463,   111,   146,   131,   243,    44,
-     273,   468,   109,    64,    65,   147,   514,   515,   690,     1,
-     535,   319,     3,    21,     5,     1,     2,   463,     3,     4,
-       5,   494,    84,    85,   546,   337,   138,    24,    22,    89,
-     109,   146,   494,   432,     2,    90,   138,     4,   463,   286,
-     236,   463,   155,    11,   135,   287,   362,   469,   364,   136,
-     530,   119,   120,   593,    29,    30,    31,    32,    33,    34,
-      35,    36,    25,    37,   359,   360,   233,   234,    26,   112,
-     237,   112,   112,   363,   112,   365,   241,   419,   -61,   355,
-     354,    38,    39,    40,   626,   155,   467,   112,   112,   574,
-     414,   -61,   112,   283,   592,   416,   -61,   434,  -152,   112,
-     629,   112,  -152,   463,    27,   463,   163,   479,   481,   483,
-     464,   463,   547,    46,   644,    47,   543,   660,   320,   321,
-     283,   323,   677,    62,   106,   403,   338,   339,   403,   403,
-     403,    86,    95,    87,   324,   283,   283,   283,   283,   283,
-     331,   332,   333,   334,   335,   283,   572,   655,   116,   463,
-     117,    28,    58,   662,   663,   138,    59,   534,   598,    50,
-      51,    52,    60,   485,    53,   403,   155,   579,    91,   558,
-      38,    39,    40,   403,   403,   403,   403,   403,   584,   499,
-     566,   501,   502,   503,   654,   664,   566,   665,    98,   606,
-     545,   607,   219,   219,   691,   692,    99,   694,   695,   667,
-     100,   665,   456,   457,   458,   459,   460,   461,   462,   488,
-     220,   220,   221,   221,   705,   706,   102,   470,   471,   472,
-     103,   151,   152,   104,   410,   122,   123,   124,   125,   126,
-     127,    87,   511,   114,   115,   148,   142,   143,   385,   160,
-     150,   411,   412,   413,   165,   229,   231,   232,   235,   238,
-     239,   646,   403,   403,   403,   403,   242,   111,   281,   288,
-     272,   403,   433,   283,   436,   437,   438,   439,   356,   440,
-     357,   366,   367,   441,   442,   403,   443,   444,   445,   446,
-     447,   368,   369,   370,   380,   371,   372,   381,   517,   518,
-     519,   520,   382,   383,   405,   431,   435,   420,   421,   528,
-     466,   422,   423,   424,   425,   451,   452,   453,   273,   634,
-     476,   454,   455,   475,   529,   484,   608,   473,   486,   611,
-     612,   613,   487,   498,   504,   505,   507,   533,   508,   283,
-     403,   509,   513,   155,   522,   403,   523,   403,   542,   340,
-     403,   524,   548,   525,   527,   283,   500,   283,   283,   283,
-     403,   403,   531,   403,   532,   510,   155,   549,   580,   581,
-     582,   583,   551,   585,   552,   556,   564,   587,   588,   553,
-     554,   558,   559,   561,   562,   516,   563,   565,   682,   566,
-     590,   685,   571,   591,   575,   576,   577,   614,   578,   594,
-     403,   403,   595,   403,   403,   403,   403,   586,   596,   539,
-     597,   403,   601,   610,   466,   616,   341,   342,   494,   403,
-     622,   618,   619,   620,   621,   403,   623,   624,   627,   625,
-     628,   635,   406,   407,   408,   637,   343,   344,   642,   345,
-     346,   567,   347,   348,   349,   636,   638,   573,    64,    65,
-     647,   107,    67,    68,    69,    70,    71,    72,    73,   648,
-       1,     2,   403,     3,     4,     5,   649,   589,   651,   418,
-     652,   653,   693,   650,   658,   666,   668,   426,   427,   428,
-     429,   430,   669,   670,   672,   686,   687,   689,   -18,   -19,
-     696,    74,   283,   697,   698,   283,   283,   283,   708,   671,
-     699,     1,   703,   709,     3,   132,     5,   656,   149,   352,
-     403,   145,   361,    45,   403,   403,   130,    64,    65,    97,
-     107,    67,    68,    69,    70,    71,    72,    73,   633,     1,
-       2,   227,     3,     4,     5,   640,   340,   521,   645,   228,
-       0,     0,     0,     0,     0,     0,   403,   403,     0,   403,
-     640,   403,     0,   630,     0,   403,   489,   490,   491,   492,
-      74,   403,     0,     0,     0,   497,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   436,   437,   438,   439,   512,
-     440,     0,     0,     0,   441,   442,     0,   443,   444,   445,
-     446,   447,     0,     0,     0,     0,     0,     0,     0,   684,
-       0,     0,     0,   341,   342,     0,     0,    75,    76,     0,
-       0,    77,     0,    78,   108,   630,     0,     0,     0,     0,
-       0,     0,     0,   343,   344,     0,   345,   346,     0,   347,
-     348,   349,     0,     0,   550,     0,     0,     0,     0,   555,
-       0,   557,     0,     0,   560,     0,   301,   302,     0,     0,
-       0,     0,     0,     0,   568,   569,     0,   570,   436,   437,
-     438,   439,     0,   440,     0,     0,     0,   441,   442,     0,
-     443,   444,   445,   446,   447,     0,    75,    76,     0,     0,
-      77,     0,    78,   144,   290,   291,   292,   293,   294,   295,
-     296,   297,   298,   299,   599,   600,     0,   602,   603,   604,
-     605,     0,     0,     0,     0,   609,     0,     0,     0,     0,
-       0,     0,     0,   615,     0,     0,     0,     0,     0,   617,
-     303,   304,   305,   306,   307,   308,   309,   310,   311,   312,
-     313,   314,   315,   316,     0,     0,     0,     0,     0,     0,
-       0,   386,   387,   388,   389,    64,    65,   390,     0,     0,
-    -220,     0,     0,     0,     0,     0,   643,     1,     2,     0,
-       3,     4,     5,   391,   392,   393,     0,     0,   -63,     1,
-       2,     0,     3,     4,     5,     0,     0,     0,   394,   395,
-       6,     7,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   340,     0,     0,     0,     0,   396,     0,     0,
-       0,     0,     8,     0,   674,     0,     9,     0,   680,   681,
-      10,     0,     0,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,   189,   254,   255,
-     256,   257,     0,     0,     0,     0,     0,     0,     0,     0,
-     700,   701,     0,   702,     0,   704,     0,     0,     0,   707,
-       0,     0,     0,     0,     0,   710,     0,   258,   198,   678,
-     679,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-       0,   259,     0,   260,   261,   262,     0,   263,   264,   343,
-     344,     0,   345,   346,     0,   347,   348,   349,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   386,   387,   388,
-     389,    64,    65,   390,     0,   397,     0,     0,   398,     0,
-     399,     0,   400,     1,     2,     0,     3,     4,     5,   391,
-     392,   393,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   394,   395,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   111,
-       0,    64,    65,   396,   107,    67,    68,    69,    70,    71,
-      72,    73,     0,     1,     2,     0,     3,     4,     5,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
-     186,   187,   188,   189,   254,   255,   256,   257,     0,     0,
-       0,     0,     0,     0,    74,     0,     0,     0,     0,     0,
+      11,    82,   359,   322,   280,   272,    13,   418,   378,   380,
+     527,   105,   162,   660,   594,   677,   111,    11,   326,   327,
+     328,   329,   330,    13,    91,   111,   318,   289,   336,   410,
+     515,   516,    94,    29,    30,    31,    32,    33,    34,    35,
+      36,   111,    37,   274,   494,   535,   496,   111,    21,   131,
+     676,   146,   109,   111,   119,   120,   111,    50,    51,    52,
+     147,     1,    53,    22,     3,   536,     5,   691,    84,    85,
+     146,   243,   111,   273,    24,    89,   138,   433,   337,   236,
+     109,    90,   464,   319,   338,   339,   138,   495,   363,   495,
+     365,   470,   155,    11,    64,    65,   464,   107,    67,    68,
+      69,    70,    71,    72,    73,   531,     1,     2,   656,     3,
+       4,     5,   464,   464,   663,   664,   233,   234,   593,   468,
+     237,   548,   599,   112,   360,   361,   241,    25,   111,  -153,
+     286,    27,   112,   356,   627,   155,   287,    74,   420,    26,
+     480,   482,   484,   283,    28,   364,   435,   366,   112,   575,
+      38,    39,    40,    44,   112,   692,   693,   163,   695,   696,
+     112,   535,   355,   112,   645,    60,   415,   -61,   320,   321,
+     283,   323,   661,   135,   678,   706,   707,    95,   136,   112,
+     106,   111,   417,   -61,   324,   283,   283,   283,   283,   283,
+     331,   332,   333,   334,   335,   283,   159,   464,   404,   573,
+      58,   404,   404,   404,   469,   138,   464,     2,   464,   464,
+       4,   465,    59,   486,   544,   547,   155,     1,    62,    46,
+       3,    47,     5,   546,    91,    86,   240,    87,   116,   500,
+     117,   502,   503,   504,    98,   112,  -153,    99,   404,   -61,
+    -153,   580,   607,   559,   608,   102,   404,   404,   404,   404,
+     404,   100,   340,   489,    75,    76,   103,   585,    77,   567,
+      78,   108,   122,   123,   124,   125,   126,   127,   437,   438,
+     439,   440,   104,   441,   411,    87,   512,   442,   443,   142,
+     444,   445,   446,   447,   448,   655,   386,   567,   112,   630,
+     143,   412,   413,   414,    64,    65,    38,    39,    40,   665,
+     148,   666,   160,   668,   647,   666,     1,     2,   150,     3,
+       4,     5,   434,   283,   272,   219,   219,   220,   220,   341,
+     342,   221,   221,   151,   152,   340,   404,   404,   404,   404,
+     114,   115,   165,   229,   231,   404,   235,   232,   238,   343,
+     344,   239,   345,   346,   242,   347,   348,   349,   111,   404,
+     288,   467,   281,   357,   358,   367,   350,   368,   381,   635,
+     432,   369,   406,   370,   371,   436,   609,   372,   373,   612,
+     613,   614,   382,   383,   477,   384,   452,   485,   534,   421,
+     283,   422,   273,   423,   155,   424,   425,   694,   453,   426,
+     454,   530,   341,   342,   455,   456,   283,   501,   283,   283,
+     283,   474,   476,   499,   404,   543,   511,   155,   487,   404,
+     488,   404,   343,   344,   404,   345,   346,   549,   347,   348,
+     349,   505,   506,   508,   404,   404,   517,   404,   683,   350,
+     509,   686,   510,   550,   514,   523,   557,   524,   301,   302,
+     525,   526,   457,   458,   459,   460,   461,   462,   463,   528,
+     540,   532,   565,   533,   552,   467,   553,   471,   472,   473,
+     566,   554,   555,   591,   404,   404,   559,   404,   404,   404,
+     404,   560,   562,   563,   564,   404,   587,   567,   592,   572,
+     576,   577,   568,   404,   578,   579,   595,   596,   574,   404,
+     437,   438,   439,   440,   597,   441,   611,   598,   615,   442,
+     443,   495,   444,   445,   446,   447,   448,   602,   590,   407,
+     408,   409,   303,   304,   305,   306,   307,   308,   309,   310,
+     311,   312,   313,   314,   315,   316,   404,   617,   518,   519,
+     520,   521,   623,   283,   624,   625,   283,   283,   283,   529,
+     626,   628,   629,   636,   637,   638,   419,   643,   648,   639,
+     649,   650,   651,   659,   427,   428,   429,   430,   431,   290,
+     291,   292,   293,   294,   295,   296,   297,   298,   299,   634,
+     669,   667,   670,   671,   404,   687,   641,   673,   404,   404,
+      64,    65,   688,   107,    67,    68,    69,    70,    71,    72,
+      73,   641,     1,     2,   631,     3,     4,     5,   581,   582,
+     583,   584,   690,   586,   -18,   -19,   697,   588,   589,   698,
+     404,   404,   700,   404,   699,   404,   704,   709,   710,   404,
+     672,   132,   657,    74,   353,   404,   149,    45,   145,   130,
+     227,    97,   362,   646,   490,   491,   492,   493,   228,     0,
+     685,   522,     0,   498,     0,     0,     0,     0,     0,     0,
+       0,   619,   620,   621,   622,     0,   631,   513,     0,     0,
+       0,     0,     0,     0,     0,     0,    64,    65,     0,   107,
+      67,    68,    69,    70,    71,    72,    73,     0,     1,     2,
+       0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   652,     0,
+     653,   654,     0,     0,     0,     0,     0,     0,     0,    74,
+       0,     0,   551,     0,     0,     0,     0,   556,     0,   558,
+       0,     0,   561,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   569,   570,     0,   571,     0,     0,     0,     0,
+      75,    76,     0,     0,    77,     0,    78,   144,     0,     0,
+      64,    65,     0,   107,    67,    68,    69,    70,    71,    72,
+      73,     0,     1,     2,     0,     3,     4,     5,     0,     0,
+       0,     0,   600,   601,     0,   603,   604,   605,   606,     0,
+       0,     0,     0,   610,     0,     0,     0,     0,     0,     0,
+       0,   616,     0,    74,     0,     0,     0,   618,   437,   438,
+     439,   440,     0,   441,     0,     0,     0,   442,   443,     0,
+     444,   445,   446,   447,   448,     0,     0,     0,     0,   387,
+     388,   389,   390,    64,    65,   391,    75,    76,  -221,     0,
+      77,     0,    78,   379,   644,     1,     2,     0,     3,     4,
+       5,   392,   393,   394,     0,     0,   -63,     1,     2,     0,
+       3,     4,     5,     0,     0,     0,   395,   396,     6,     7,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   258,   198,   199,   200,   201,   202,   203,
-     204,   205,   206,   207,   208,   209,     0,   259,     0,   260,
-     261,   262,     0,   263,   264,     0,     0,     0,     0,     0,
+     340,     0,     0,     0,     0,   397,     0,     0,     0,     0,
+       8,     0,   675,     0,     9,     0,   681,   682,    10,     0,
+       0,   175,   176,   177,   178,   179,   180,   181,   182,   183,
+     184,   185,   186,   187,   188,   189,   254,   255,   256,   257,
+      75,    76,     0,     0,    77,     0,    78,   466,   701,   702,
+       0,   703,     0,   705,     0,     0,     0,   708,     0,     0,
+       0,     0,     0,   711,     0,   258,   198,   679,   680,   201,
+     202,   203,   204,   205,   206,   207,   208,   209,     0,   259,
+       0,   260,   261,   262,     0,   263,   264,   343,   344,     0,
+     345,   346,     0,   347,   348,   349,     0,     0,     0,     0,
+       0,     0,     0,     0,   350,     0,   387,   388,   389,   390,
+      64,    65,   391,     0,   398,     0,     0,   399,     0,   400,
+       0,   401,     1,     2,     0,     3,     4,     5,   392,   393,
+     394,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   395,   396,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   111,     0,
+      64,    65,   397,   107,    67,    68,    69,    70,    71,    72,
+      73,     0,     1,     2,     0,     3,     4,     5,   175,   176,
+     177,   178,   179,   180,   181,   182,   183,   184,   185,   186,
+     187,   188,   189,   254,   255,   256,   257,     0,     0,     0,
+       0,     0,     0,    74,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   112,     0,     0,     0,     0,
-       0,   397,     0,     0,   398,     0,   399,     0,   400,   244,
-     245,   246,   247,    64,    65,   248,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     1,     2,     0,     3,     4,
+       0,     0,   258,   198,   199,   200,   201,   202,   203,   204,
+     205,   206,   207,   208,   209,     0,   259,  -220,   260,   261,
+     262,     0,   263,   264,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   -63,     1,     2,     0,     3,
+       4,     5,     0,     0,     0,   112,     0,     6,     7,     0,
+       0,   398,     0,     0,   399,     0,   400,     0,   401,   244,
+     245,   246,   247,    64,    65,   248,     0,     0,     0,     8,
+       0,     0,     0,     9,     0,     1,     2,    10,     3,     4,
        5,   249,   250,   251,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,   252,   253,     0,     0,
-      75,    76,     0,     0,    77,     0,    78,   378,     0,     0,
+      75,    76,     0,     0,    77,     0,    78,   483,     0,     0,
        0,   111,    64,    65,     0,   107,    67,    68,    69,    70,
       71,    72,    73,     0,     1,     2,     0,     3,     4,     5,
        0,   175,   176,   177,   178,   179,   180,   181,   182,   183,
@@ -2418,244 +2425,238 @@
      202,   203,   204,   205,   206,   207,   208,   209,     0,   259,
        0,   260,   261,   262,     0,   263,   264,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   112,     0,     0,
-       0,   -61,     0,   265,     0,     0,   266,     0,   267,     0,
-     268,   244,   245,   246,   247,    64,    65,   248,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     1,     2,     0,
-       3,     4,     5,   249,   250,   251,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   252,   253,
-       0,    75,    76,     0,     0,    77,     0,    78,   465,     0,
-       0,     0,     0,   111,    64,    65,     0,   107,    67,    68,
-      69,    70,    71,    72,    73,     0,     1,     2,     0,     3,
-       4,     5,     0,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,   189,   254,   255,
-     256,   257,     0,     0,     0,     0,     0,    74,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   112,     0,
+       0,     0,   -61,     0,   265,     0,     0,   266,     0,   267,
+       0,   268,   244,   245,   246,   247,    64,    65,   248,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     1,     2,
+       0,     3,     4,     5,   249,   250,   251,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   252,
+     253,     0,    75,    76,     0,     0,    77,     0,    78,   545,
+       0,     0,     0,     0,   111,    64,    65,     0,   153,    67,
+      68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
+       3,     4,     5,     0,   175,   176,   177,   178,   179,   180,
+     181,   182,   183,   184,   185,   186,   187,   188,   189,   254,
+     255,   256,   257,     0,     0,     0,     0,     0,    74,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   258,   198,
+     199,   200,   201,   202,   203,   204,   205,   206,   207,   208,
+     209,     0,   259,     0,   260,   261,   262,     0,   263,   264,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   258,   198,   199,
-     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-       0,   259,     0,   260,   261,   262,     0,   263,   264,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   112,
-       0,     0,     0,     0,     0,   265,     0,     0,   266,     0,
-     267,     0,   268,   386,   387,   388,   389,    64,    65,   390,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     1,
-       2,     0,     3,     4,     5,   391,   392,   393,     0,     0,
+       0,   112,     0,     0,     0,     0,     0,   265,     0,     0,
+     266,     0,   267,   154,   268,   387,   388,   389,   390,    64,
+      65,   391,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     1,     2,     0,     3,     4,     5,   392,   393,   394,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     394,   395,  -219,    75,    76,     0,     0,    77,     0,    78,
-     482,     0,     0,     0,     0,     0,     0,     0,     0,   396,
-     -63,     1,     2,     0,     3,     4,     5,     0,     0,     0,
-       0,     0,     6,     7,     0,   175,   176,   177,   178,   179,
+       0,     0,   395,   396,     0,    75,    76,     0,     0,    77,
+       0,    78,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   397,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   175,   176,   177,
+     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
+     188,   189,   254,   255,   256,   257,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   258,   198,   199,   200,   201,   202,   203,   204,   205,
+     206,   207,   208,   209,     0,   259,     0,   260,   261,   262,
+       0,   263,   264,   387,   388,   389,   390,     0,     0,   391,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   392,   393,   394,     0,     0,
+     398,     0,     0,   399,     0,   400,     0,   401,     0,     0,
+     395,   396,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,    64,    65,   397,
+     153,    67,    68,    69,    70,    71,    72,    73,     0,     1,
+       2,     0,     3,     4,     5,   175,   176,   177,   178,   179,
      180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
-     254,   255,   256,   257,     8,     0,     0,     0,     9,     0,
-       0,     0,    10,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   258,
+     254,   255,   256,   257,     0,     0,     0,     0,    64,    65,
+      74,   107,    67,    68,    69,    70,    71,    72,    73,     0,
+       1,     2,     0,     3,     4,     5,     0,     0,     0,   258,
      198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
      208,   209,     0,   259,     0,   260,   261,   262,     0,   263,
-     264,   386,   387,   388,   389,     0,     0,   390,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   391,   392,   393,     0,   397,     0,     0,
-     398,     0,   399,     0,   400,     0,     0,     0,   394,   395,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    64,    65,   396,   107,    67,
+     264,    74,    64,    65,     0,   107,    67,    68,    69,    70,
+      71,    72,    73,     0,     1,     2,     0,     3,     4,     5,
+       0,     0,     0,     0,     0,     0,     0,     0,   398,     0,
+       0,   399,     0,   400,   137,   401,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    74,     0,     0,     0,     0,
+       0,   275,   276,     0,   277,    64,    65,   278,   107,    67,
       68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
-       3,     4,     5,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,   189,   254,   255,
-     256,   257,     0,     0,     0,     0,    64,    65,    74,   153,
+       3,     4,     5,     0,     0,     0,     0,    75,    76,     0,
+       0,    77,     0,    78,     0,     0,     0,   352,     0,     0,
+       0,     0,     0,     0,     0,     0,    64,    65,    74,   107,
       67,    68,    69,    70,    71,    72,    73,     0,     1,     2,
-       0,     3,     4,     5,     0,     0,     0,   258,   198,   199,
-     200,   201,   202,   203,   204,   205,   206,   207,   208,   209,
-       0,   259,     0,   260,   261,   262,     0,   263,   264,    74,
-       0,    64,    65,     0,   107,    67,    68,    69,    70,    71,
-      72,    73,     0,     1,     2,     0,     3,     4,     5,     0,
-       0,     0,     0,     0,     0,   397,     0,     0,   398,     0,
-     399,     0,   400,   137,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    74,    64,    65,     0,   153,    67,
-      68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
-       3,     4,     5,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    75,    76,     0,     0,    77,     0,
-      78,   544,     0,     0,     0,     0,     0,     0,    74,     0,
-     275,   276,     0,   277,    64,    65,   278,   107,    67,    68,
+       0,     3,     4,     5,     0,     0,     0,     0,    75,    76,
+       0,   374,    77,     0,    78,     0,     0,     0,    64,    65,
+       0,   107,    67,    68,    69,    70,    71,    72,    73,    74,
+       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     539,     0,    75,    76,     0,     0,    77,     0,    78,    64,
+      65,    74,   107,    67,    68,    69,    70,    71,    72,    73,
+       0,     1,     2,     0,     3,     4,     5,    64,    65,     0,
+      66,    67,    68,    69,    70,    71,    72,    73,     0,     1,
+       2,   633,     3,     4,     5,     0,     0,     0,     0,     0,
+       0,     0,    74,     0,     0,    75,    76,     0,     0,    77,
+       0,    78,     0,     0,     0,     0,     0,     0,    64,    65,
+      74,   107,    67,    68,    69,    70,    71,    72,    73,     0,
+       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    75,    76,     0,   479,
+      77,     0,    78,     0,     0,     0,     0,     0,     0,    64,
+      65,    74,   282,    67,    68,    69,    70,    71,    72,    73,
+       0,     1,     2,     0,     3,     4,     5,     0,    75,    76,
+       0,     0,    77,     0,    78,     0,     0,     0,    64,    65,
+       0,   107,    67,    68,    69,    70,    71,    72,    73,     0,
+       1,     2,    74,     3,     4,     5,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    75,
+      76,     0,     0,    77,     0,    78,     0,     0,     0,     0,
+       0,    74,     0,     0,     0,     0,     0,    75,    76,     0,
+       0,    77,     0,    78,    64,    65,     0,   107,    67,    68,
       69,    70,    71,    72,    73,     0,     1,     2,     0,     3,
-       4,     5,     0,     0,     0,    75,    76,     0,     0,    77,
-       0,    78,     0,     0,     0,     0,   351,     0,     0,     0,
-       0,     0,     0,     0,     0,    64,    65,    74,   107,    67,
-      68,    69,    70,    71,    72,    73,     0,     1,     2,     0,
+       4,     5,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    75,    76,
+       0,     0,    77,     0,    78,    64,    65,    74,   107,    67,
+      68,    69,    70,    71,    72,   640,     0,     1,     2,     0,
        3,     4,     5,     0,     0,     0,     0,     0,     0,     0,
-      75,    76,     0,   154,    77,     0,    78,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,    64,    65,    74,   107,
-      67,    68,    69,    70,    71,    72,    73,     0,     1,     2,
-       0,     3,     4,     5,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    75,
+      76,     0,     0,    77,     0,    78,    64,    65,    74,   107,
+      67,    68,    69,    70,    71,    72,   684,   166,     1,     2,
+       0,     3,     4,     5,     0,     0,     0,     0,    75,    76,
+       0,     0,    77,     0,   377,     0,     0,     0,   167,   168,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,    74,
+     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
+     179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
+     189,   190,   191,   192,   193,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    75,    76,     0,     0,    77,     0,
-      78,     0,     0,     0,     0,     0,     0,    64,    65,    74,
-     107,    67,    68,    69,    70,    71,    72,    73,     0,     1,
-       2,     0,     3,     4,     5,    64,    65,     0,   107,    67,
-      68,    69,    70,    71,    72,    73,     0,     1,     2,   538,
-       3,     4,     5,    75,    76,     0,     0,    77,     0,    78,
-      74,     0,     0,     0,     0,     0,     0,   632,     0,     0,
-       0,     0,     0,     0,     0,     0,    64,    65,    74,    66,
-      67,    68,    69,    70,    71,    72,    73,     0,     1,     2,
-       0,     3,     4,     5,    75,    76,     0,   373,    77,     0,
-      78,    64,    65,     0,   107,    67,    68,    69,    70,    71,
-      72,    73,     0,     1,     2,     0,     3,     4,     5,    74,
+     481,     0,     0,     0,     0,   194,   195,   196,     0,     0,
+     197,   198,   199,   200,   201,   202,   203,   204,   205,   206,
+     207,   208,   209,   210,   211,   212,   213,   214,   215,   216,
+     217,   218,     0,     0,     0,    75,    76,     0,     0,    77,
+       0,    78,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    75,    76,     0,   478,    77,
-       0,    78,    64,    65,    74,   282,    67,    68,    69,    70,
-      71,    72,    73,     0,     1,     2,     0,     3,     4,     5,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,    75,    76,     0,     0,
-      77,     0,    78,     0,     0,    74,     0,     0,     0,     0,
-       0,     0,     0,     0,    75,    76,     0,     0,    77,     0,
-      78,    64,    65,     0,   107,    67,    68,    69,    70,    71,
-      72,    73,     0,     1,     2,     0,     3,     4,     5,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    75,    76,     0,     0,    77,
-       0,    78,    64,    65,    74,   107,    67,    68,    69,    70,
-      71,    72,    73,     0,     1,     2,     0,     3,     4,     5,
-      75,    76,     0,     0,    77,     0,    78,    64,    65,     0,
-     107,    67,    68,    69,    70,    71,    72,   639,     0,     1,
-       2,     0,     3,     4,     5,    74,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    75,    76,     0,     0,    77,     0,    78,    64,    65,
-      74,   107,    67,    68,    69,    70,    71,    72,   683,     0,
-       1,     2,     0,     3,     4,     5,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    74,     0,     0,     0,     0,     0,     0,     0,     0,
-      75,    76,     0,     0,    77,     0,   376,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     166,    75,    76,     0,     0,    77,     0,   480,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   167,   168,     0,     0,     0,    75,    76,     0,     0,
-      77,     0,    78,   169,   170,   171,   172,   173,   174,   175,
-     176,   177,   178,   179,   180,   181,   182,   183,   184,   185,
-     186,   187,   188,   189,   190,   191,   192,   193,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,    75,    76,     0,
-       0,    77,     0,    78,     0,     0,     0,     0,   194,   195,
-     196,     0,     0,   197,   198,   199,   200,   201,   202,   203,
-     204,   205,   206,   207,   208,   209,   210,   211,   212,   213,
-     214,   215,   216,   217,   218
+      77,     0,    78
 };
 
 static const yytype_int16 yycheck[] =
 {
-       0,    27,   158,   239,   196,   321,     4,   121,     0,    11,
-     461,   161,    28,    55,    11,    55,    55,    17,    55,   211,
-     212,   213,   214,   215,   172,    17,   266,   267,    11,   221,
-      21,    55,    55,   159,   192,   289,    55,   151,    29,    11,
-      34,   659,    55,    55,   164,    55,   164,     7,   156,     0,
-     158,   171,    78,     7,     8,   173,   449,   450,   676,    19,
-      54,   193,    22,    53,    24,    19,    20,   164,    22,    23,
-      24,    54,    41,    42,   171,   223,   102,   163,    68,    48,
-     106,   164,    54,   337,    20,    54,   112,    23,   164,    11,
-     173,   164,   118,    93,   164,    17,   254,   173,   256,   169,
-     173,    32,    33,   539,    42,    43,    44,    45,    46,    47,
-      48,    49,    59,    51,   240,   241,   142,   143,   163,   161,
-     146,   161,   161,   255,   161,   257,   152,   167,   165,   171,
-     169,   158,   159,   160,   585,   161,   376,   161,   161,   162,
-     164,   165,   161,   169,   537,   164,   165,   339,   161,   161,
-     162,   161,   165,   164,    18,   164,   172,   397,   398,   399,
-     169,   164,   173,    46,   615,    48,   169,   169,   194,   195,
-     196,   197,   169,    22,   172,   283,   117,   118,   286,   287,
-     288,    35,   173,    37,   210,   211,   212,   213,   214,   215,
-     216,   217,   218,   219,   220,   221,   512,   633,    42,   164,
-      44,   163,   163,   639,   640,   231,   163,    34,   173,    42,
-      43,    44,   167,   405,    47,   323,   242,   162,    21,   164,
-     158,   159,   160,   331,   332,   333,   334,   335,   162,   421,
-     164,   423,   424,   425,   162,   162,   164,   164,    22,   555,
-     480,   557,   132,   133,   680,   681,    22,   683,   684,   162,
-      22,   164,   366,   367,   368,   369,   370,   371,   372,   409,
-     132,   133,   132,   133,   700,   701,   161,   381,   382,   383,
-       4,   114,   115,     4,   300,    62,    63,    64,    65,    66,
-      67,    37,   432,    84,    85,   161,   168,   168,   280,     4,
-     165,   317,   318,   319,   163,    22,   164,   162,   171,     4,
-     162,   617,   410,   411,   412,   413,   161,    55,    57,    11,
-     466,   419,   338,   339,   141,   142,   143,   144,   171,   146,
-     162,   161,   161,   150,   151,   433,   153,   154,   155,   156,
-     157,   161,   161,   161,    22,   161,   161,   161,   452,   453,
-     454,   455,   161,   161,   164,    38,     4,   164,   164,   463,
-     376,   164,   164,   164,   164,    38,   161,   161,   466,   595,
-      61,   161,   161,   161,   171,    22,   558,   164,   164,   561,
-     562,   563,   164,   167,   164,   164,   164,    38,   164,   405,
-     488,   164,   164,   409,   164,   493,   164,   495,    22,    54,
-     498,   164,    17,   164,   164,   421,   422,   423,   424,   425,
-     508,   509,   164,   511,   164,   431,   432,    17,   522,   523,
-     524,   525,   164,   527,   164,     4,     4,   531,   532,   164,
-     164,   164,   164,   164,   164,   451,   164,     4,   664,   164,
-      22,   667,   164,     4,   164,   164,   164,     4,   164,   164,
-     548,   549,   162,   551,   552,   553,   554,   171,   164,   475,
-     171,   559,   161,   164,   480,   161,   121,   122,    54,   567,
-     164,   575,   576,   577,   578,   573,   162,   164,   162,   164,
-     162,    22,   286,   287,   288,   164,   141,   142,   169,   144,
-     145,   507,   147,   148,   149,   171,   167,   513,     7,     8,
-     162,    10,    11,    12,    13,    14,    15,    16,    17,   162,
-      19,    20,   610,    22,    23,    24,   162,   533,   622,   323,
-     624,   625,    38,   162,    17,   169,   162,   331,   332,   333,
-     334,   335,   162,   162,    54,     4,   152,   164,   161,   161,
-      22,    50,   558,    17,   164,   561,   562,   563,    73,   655,
-      17,    19,    17,    17,    22,    93,    24,   634,   112,   231,
-     658,   106,   242,    17,   662,   663,    90,     7,     8,    57,
-      10,    11,    12,    13,    14,    15,    16,    17,   594,    19,
-      20,   133,    22,    23,    24,   601,    54,   456,   616,   133,
-      -1,    -1,    -1,    -1,    -1,    -1,   694,   695,    -1,   697,
-     616,   699,    -1,   593,    -1,   703,   410,   411,   412,   413,
-      50,   709,    -1,    -1,    -1,   419,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   141,   142,   143,   144,   433,
-     146,    -1,    -1,    -1,   150,   151,    -1,   153,   154,   155,
-     156,   157,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   665,
-      -1,    -1,    -1,   121,   122,    -1,    -1,   166,   167,    -1,
-      -1,   170,    -1,   172,   173,   655,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   141,   142,    -1,   144,   145,    -1,   147,
-     148,   149,    -1,    -1,   488,    -1,    -1,    -1,    -1,   493,
-      -1,   495,    -1,    -1,   498,    -1,    26,    27,    -1,    -1,
-      -1,    -1,    -1,    -1,   508,   509,    -1,   511,   141,   142,
+       0,    27,   239,   196,   161,   158,     0,   321,   266,   267,
+     462,     4,    28,    11,   540,    11,    55,    17,   211,   212,
+     213,   214,   215,    17,    21,    55,   192,   172,   221,   289,
+     450,   451,    29,    42,    43,    44,    45,    46,    47,    48,
+      49,    55,    51,   159,    11,    34,    11,    55,    53,     7,
+     660,   165,    78,    55,    32,    33,    55,    42,    43,    44,
+     174,    19,    47,    68,    22,    54,    24,   677,    41,    42,
+     165,   156,    55,   158,   164,    48,   102,   337,   223,   174,
+     106,    54,   165,   193,   117,   118,   112,    54,   254,    54,
+     256,   174,   118,    93,     7,     8,   165,    10,    11,    12,
+      13,    14,    15,    16,    17,   174,    19,    20,   634,    22,
+      23,    24,   165,   165,   640,   641,   142,   143,   538,   377,
+     146,   174,   174,   162,   240,   241,   152,    59,    55,    55,
+      11,    18,   162,   172,   586,   161,    17,    50,   168,   164,
+     398,   399,   400,   169,   164,   255,   339,   257,   162,   163,
+     159,   160,   161,     0,   162,   681,   682,   173,   684,   685,
+     162,    34,   170,   162,   616,   168,   165,   166,   194,   195,
+     196,   197,   170,   165,   170,   701,   702,   174,   170,   162,
+     173,    55,   165,   166,   210,   211,   212,   213,   214,   215,
+     216,   217,   218,   219,   220,   221,   121,   165,   283,   513,
+     164,   286,   287,   288,   172,   231,   165,    20,   165,   165,
+      23,   170,   164,   406,   170,   172,   242,    19,    22,    46,
+      22,    48,    24,   481,    21,    35,   151,    37,    42,   422,
+      44,   424,   425,   426,    22,   162,   162,    22,   323,   166,
+     166,   163,   556,   165,   558,   162,   331,   332,   333,   334,
+     335,    22,    54,   410,   167,   168,     4,   163,   171,   165,
+     173,   174,    62,    63,    64,    65,    66,    67,   141,   142,
+     143,   144,     4,   146,   300,    37,   433,   150,   151,   169,
+     153,   154,   155,   156,   157,   163,   280,   165,   162,   163,
+     169,   317,   318,   319,     7,     8,   159,   160,   161,   163,
+     162,   165,     4,   163,   618,   165,    19,    20,   166,    22,
+      23,    24,   338,   339,   467,   132,   133,   132,   133,   121,
+     122,   132,   133,   114,   115,    54,   411,   412,   413,   414,
+      84,    85,   164,    22,   165,   420,   172,   163,     4,   141,
+     142,   163,   144,   145,   162,   147,   148,   149,    55,   434,
+      11,   377,    57,   172,   163,   162,   158,   162,    22,   596,
+      38,   162,   165,   162,   162,     4,   559,   162,   162,   562,
+     563,   564,   162,   162,    61,   162,    38,    22,    38,   165,
+     406,   165,   467,   165,   410,   165,   165,    38,   162,   165,
+     162,   172,   121,   122,   162,   162,   422,   423,   424,   425,
+     426,   165,   162,   168,   489,    22,   432,   433,   165,   494,
+     165,   496,   141,   142,   499,   144,   145,    17,   147,   148,
+     149,   165,   165,   165,   509,   510,   452,   512,   665,   158,
+     165,   668,   165,    17,   165,   165,     4,   165,    26,    27,
+     165,   165,   367,   368,   369,   370,   371,   372,   373,   165,
+     476,   165,     4,   165,   165,   481,   165,   382,   383,   384,
+       4,   165,   165,    22,   549,   550,   165,   552,   553,   554,
+     555,   165,   165,   165,   165,   560,   172,   165,     4,   165,
+     165,   165,   508,   568,   165,   165,   165,   163,   514,   574,
+     141,   142,   143,   144,   165,   146,   165,   172,     4,   150,
+     151,    54,   153,   154,   155,   156,   157,   162,   534,   286,
+     287,   288,   100,   101,   102,   103,   104,   105,   106,   107,
+     108,   109,   110,   111,   112,   113,   611,   162,   453,   454,
+     455,   456,   165,   559,   163,   165,   562,   563,   564,   464,
+     165,   163,   163,    22,   172,   165,   323,   170,   163,   168,
+     163,   163,   163,    17,   331,   332,   333,   334,   335,    94,
+      95,    96,    97,    98,    99,   100,   101,   102,   103,   595,
+     163,   170,   163,   163,   659,     4,   602,    54,   663,   664,
+       7,     8,   152,    10,    11,    12,    13,    14,    15,    16,
+      17,   617,    19,    20,   594,    22,    23,    24,   523,   524,
+     525,   526,   165,   528,   162,   162,    22,   532,   533,    17,
+     695,   696,    17,   698,   165,   700,    17,    73,    17,   704,
+     656,    93,   635,    50,   231,   710,   112,    17,   106,    90,
+     133,    57,   242,   617,   411,   412,   413,   414,   133,    -1,
+     666,   457,    -1,   420,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   576,   577,   578,   579,    -1,   656,   434,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    -1,    10,
+      11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
+      -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   623,    -1,
+     625,   626,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,
+      -1,    -1,   489,    -1,    -1,    -1,    -1,   494,    -1,   496,
+      -1,    -1,   499,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   509,   510,    -1,   512,    -1,    -1,    -1,    -1,
+     167,   168,    -1,    -1,   171,    -1,   173,   174,    -1,    -1,
+       7,     8,    -1,    10,    11,    12,    13,    14,    15,    16,
+      17,    -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,
+      -1,    -1,   549,   550,    -1,   552,   553,   554,   555,    -1,
+      -1,    -1,    -1,   560,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   568,    -1,    50,    -1,    -1,    -1,   574,   141,   142,
      143,   144,    -1,   146,    -1,    -1,    -1,   150,   151,    -1,
-     153,   154,   155,   156,   157,    -1,   166,   167,    -1,    -1,
-     170,    -1,   172,   173,    94,    95,    96,    97,    98,    99,
-     100,   101,   102,   103,   548,   549,    -1,   551,   552,   553,
-     554,    -1,    -1,    -1,    -1,   559,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   567,    -1,    -1,    -1,    -1,    -1,   573,
-     100,   101,   102,   103,   104,   105,   106,   107,   108,   109,
-     110,   111,   112,   113,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     3,     4,     5,     6,     7,     8,     9,    -1,    -1,
-       0,    -1,    -1,    -1,    -1,    -1,   610,    19,    20,    -1,
-      22,    23,    24,    25,    26,    27,    -1,    -1,    18,    19,
-      20,    -1,    22,    23,    24,    -1,    -1,    -1,    40,    41,
-      30,    31,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    54,    -1,    -1,    -1,    -1,    59,    -1,    -1,
-      -1,    -1,    52,    -1,   658,    -1,    56,    -1,   662,   663,
-      60,    -1,    -1,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     694,   695,    -1,   697,    -1,   699,    -1,    -1,    -1,   703,
-      -1,    -1,    -1,    -1,    -1,   709,    -1,   119,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-      -1,   133,    -1,   135,   136,   137,    -1,   139,   140,   141,
-     142,    -1,   144,   145,    -1,   147,   148,   149,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,     4,     5,
-       6,     7,     8,     9,    -1,   167,    -1,    -1,   170,    -1,
-     172,    -1,   174,    19,    20,    -1,    22,    23,    24,    25,
-      26,    27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,
-      -1,     7,     8,    59,    10,    11,    12,    13,    14,    15,
-      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    -1,    -1,
-      -1,    -1,    -1,    -1,    50,    -1,    -1,    -1,    -1,    -1,
+     153,   154,   155,   156,   157,    -1,    -1,    -1,    -1,     3,
+       4,     5,     6,     7,     8,     9,   167,   168,     0,    -1,
+     171,    -1,   173,   174,   611,    19,    20,    -1,    22,    23,
+      24,    25,    26,    27,    -1,    -1,    18,    19,    20,    -1,
+      22,    23,    24,    -1,    -1,    -1,    40,    41,    30,    31,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,    -1,   133,    -1,   135,
-     136,   137,    -1,   139,   140,    -1,    -1,    -1,    -1,    -1,
+      54,    -1,    -1,    -1,    -1,    59,    -1,    -1,    -1,    -1,
+      52,    -1,   659,    -1,    56,    -1,   663,   664,    60,    -1,
+      -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+     167,   168,    -1,    -1,   171,    -1,   173,   174,   695,   696,
+      -1,   698,    -1,   700,    -1,    -1,    -1,   704,    -1,    -1,
+      -1,    -1,    -1,   710,    -1,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   129,   130,   131,    -1,   133,
+      -1,   135,   136,   137,    -1,   139,   140,   141,   142,    -1,
+     144,   145,    -1,   147,   148,   149,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   158,    -1,     3,     4,     5,     6,
+       7,     8,     9,    -1,   168,    -1,    -1,   171,    -1,   173,
+      -1,   175,    19,    20,    -1,    22,    23,    24,    25,    26,
+      27,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    55,    -1,
+       7,     8,    59,    10,    11,    12,    13,    14,    15,    16,
+      17,    -1,    19,    20,    -1,    22,    23,    24,    75,    76,
+      77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    -1,    -1,    -1,
+      -1,    -1,    -1,    50,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   161,    -1,    -1,    -1,    -1,
-      -1,   167,    -1,    -1,   170,    -1,   172,    -1,   174,     3,
-       4,     5,     6,     7,     8,     9,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    19,    20,    -1,    22,    23,
+      -1,    -1,   119,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,    -1,   133,     0,   135,   136,
+     137,    -1,   139,   140,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    18,    19,    20,    -1,    22,
+      23,    24,    -1,    -1,    -1,   162,    -1,    30,    31,    -1,
+      -1,   168,    -1,    -1,   171,    -1,   173,    -1,   175,     3,
+       4,     5,     6,     7,     8,     9,    -1,    -1,    -1,    52,
+      -1,    -1,    -1,    56,    -1,    19,    20,    60,    22,    23,
       24,    25,    26,    27,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    40,    41,    -1,    -1,
-     166,   167,    -1,    -1,   170,    -1,   172,   173,    -1,    -1,
+     167,   168,    -1,    -1,   171,    -1,   173,   174,    -1,    -1,
       -1,    55,     7,     8,    -1,    10,    11,    12,    13,    14,
       15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
       -1,    75,    76,    77,    78,    79,    80,    81,    82,    83,
@@ -2666,124 +2667,114 @@
      124,   125,   126,   127,   128,   129,   130,   131,    -1,   133,
       -1,   135,   136,   137,    -1,   139,   140,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,    -1,    -1,
-      -1,   165,    -1,   167,    -1,    -1,   170,    -1,   172,    -1,
-     174,     3,     4,     5,     6,     7,     8,     9,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    19,    20,    -1,
-      22,    23,    24,    25,    26,    27,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    41,
-      -1,   166,   167,    -1,    -1,   170,    -1,   172,   173,    -1,
-      -1,    -1,    -1,    55,     7,     8,    -1,    10,    11,    12,
-      13,    14,    15,    16,    17,    -1,    19,    20,    -1,    22,
-      23,    24,    -1,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    -1,    -1,    -1,    -1,    -1,    50,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   162,    -1,
+      -1,    -1,   166,    -1,   168,    -1,    -1,   171,    -1,   173,
+      -1,   175,     3,     4,     5,     6,     7,     8,     9,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    19,    20,
+      -1,    22,    23,    24,    25,    26,    27,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,
+      41,    -1,   167,   168,    -1,    -1,   171,    -1,   173,   174,
+      -1,    -1,    -1,    -1,    55,     7,     8,    -1,    10,    11,
+      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
+      22,    23,    24,    -1,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    -1,    -1,    -1,    -1,    -1,    50,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   119,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-      -1,   133,    -1,   135,   136,   137,    -1,   139,   140,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   119,   120,
+     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
+     131,    -1,   133,    -1,   135,   136,   137,    -1,   139,   140,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   161,
-      -1,    -1,    -1,    -1,    -1,   167,    -1,    -1,   170,    -1,
-     172,    -1,   174,     3,     4,     5,     6,     7,     8,     9,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    19,
-      20,    -1,    22,    23,    24,    25,    26,    27,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      40,    41,     0,   166,   167,    -1,    -1,   170,    -1,   172,
-     173,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    59,
-      18,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
-      -1,    -1,    30,    31,    -1,    75,    76,    77,    78,    79,
+      -1,   162,    -1,    -1,    -1,    -1,    -1,   168,    -1,    -1,
+     171,    -1,   173,   125,   175,     3,     4,     5,     6,     7,
+       8,     9,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    19,    20,    -1,    22,    23,    24,    25,    26,    27,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    40,    41,    -1,   167,   168,    -1,    -1,   171,
+      -1,   173,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    59,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   119,   120,   121,   122,   123,   124,   125,   126,   127,
+     128,   129,   130,   131,    -1,   133,    -1,   135,   136,   137,
+      -1,   139,   140,     3,     4,     5,     6,    -1,    -1,     9,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    25,    26,    27,    -1,    -1,
+     168,    -1,    -1,   171,    -1,   173,    -1,   175,    -1,    -1,
+      40,    41,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    59,
+      10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
+      20,    -1,    22,    23,    24,    75,    76,    77,    78,    79,
       80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    52,    -1,    -1,    -1,    56,    -1,
-      -1,    -1,    60,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   119,
+      90,    91,    92,    93,    -1,    -1,    -1,    -1,     7,     8,
+      50,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
+      19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,   119,
      120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
      130,   131,    -1,   133,    -1,   135,   136,   137,    -1,   139,
-     140,     3,     4,     5,     6,    -1,    -1,     9,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    25,    26,    27,    -1,   167,    -1,    -1,
-     170,    -1,   172,    -1,   174,    -1,    -1,    -1,    40,    41,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     7,     8,    59,    10,    11,
-      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
-      22,    23,    24,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    -1,    -1,    -1,    -1,     7,     8,    50,    10,
-      11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-      -1,    22,    23,    24,    -1,    -1,    -1,   119,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-      -1,   133,    -1,   135,   136,   137,    -1,   139,   140,    50,
-      -1,     7,     8,    -1,    10,    11,    12,    13,    14,    15,
-      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    -1,
-      -1,    -1,    -1,    -1,    -1,   167,    -1,    -1,   170,    -1,
-     172,    -1,   174,    39,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    50,     7,     8,    -1,    10,    11,
-      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
-      22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,    -1,
-     172,   173,    -1,    -1,    -1,    -1,    -1,    -1,    50,    -1,
-     141,   142,    -1,   144,     7,     8,   147,    10,    11,    12,
-      13,    14,    15,    16,    17,    -1,    19,    20,    -1,    22,
-      23,    24,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,
-      -1,   172,    -1,    -1,    -1,    -1,    39,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     7,     8,    50,    10,    11,
+     140,    50,     7,     8,    -1,    10,    11,    12,    13,    14,
+      15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   168,    -1,
+      -1,   171,    -1,   173,    39,   175,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    50,    -1,    -1,    -1,    -1,
+      -1,   141,   142,    -1,   144,     7,     8,   147,    10,    11,
       12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
-      22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     166,   167,    -1,   125,   170,    -1,   172,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    50,    10,
-      11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-      -1,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,    -1,
-     172,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    50,
-      10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
-      20,    -1,    22,    23,    24,     7,     8,    -1,    10,    11,
-      12,    13,    14,    15,    16,    17,    -1,    19,    20,    39,
-      22,    23,    24,   166,   167,    -1,    -1,   170,    -1,   172,
-      50,    -1,    -1,    -1,    -1,    -1,    -1,    39,    -1,    -1,
+      22,    23,    24,    -1,    -1,    -1,    -1,   167,   168,    -1,
+      -1,   171,    -1,   173,    -1,    -1,    -1,    39,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    50,    10,
       11,    12,    13,    14,    15,    16,    17,    -1,    19,    20,
-      -1,    22,    23,    24,   166,   167,    -1,   169,   170,    -1,
-     172,     7,     8,    -1,    10,    11,    12,    13,    14,    15,
-      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    50,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   166,   167,    -1,   169,   170,
-      -1,   172,     7,     8,    50,    10,    11,    12,    13,    14,
-      15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   166,   167,    -1,    -1,
-     170,    -1,   172,    -1,    -1,    50,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,    -1,
-     172,     7,     8,    -1,    10,    11,    12,    13,    14,    15,
-      16,    17,    -1,    19,    20,    -1,    22,    23,    24,    -1,
+      -1,    22,    23,    24,    -1,    -1,    -1,    -1,   167,   168,
+      -1,   170,   171,    -1,   173,    -1,    -1,    -1,     7,     8,
+      -1,    10,    11,    12,    13,    14,    15,    16,    17,    50,
+      19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   166,   167,    -1,    -1,   170,
-      -1,   172,     7,     8,    50,    10,    11,    12,    13,    14,
-      15,    16,    17,    -1,    19,    20,    -1,    22,    23,    24,
-     166,   167,    -1,    -1,   170,    -1,   172,     7,     8,    -1,
+      39,    -1,   167,   168,    -1,    -1,   171,    -1,   173,     7,
+       8,    50,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,     7,     8,    -1,
       10,    11,    12,    13,    14,    15,    16,    17,    -1,    19,
-      20,    -1,    22,    23,    24,    50,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   166,   167,    -1,    -1,   170,    -1,   172,     7,     8,
+      20,    39,    22,    23,    24,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    50,    -1,    -1,   167,   168,    -1,    -1,   171,
+      -1,   173,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,
       50,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
       19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,   167,   168,    -1,   170,
+     171,    -1,   173,    -1,    -1,    -1,    -1,    -1,    -1,     7,
+       8,    50,    10,    11,    12,    13,    14,    15,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,   167,   168,
+      -1,    -1,   171,    -1,   173,    -1,    -1,    -1,     7,     8,
+      -1,    10,    11,    12,    13,    14,    15,    16,    17,    -1,
+      19,    20,    50,    22,    23,    24,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   167,
+     168,    -1,    -1,   171,    -1,   173,    -1,    -1,    -1,    -1,
+      -1,    50,    -1,    -1,    -1,    -1,    -1,   167,   168,    -1,
+      -1,   171,    -1,   173,     7,     8,    -1,    10,    11,    12,
+      13,    14,    15,    16,    17,    -1,    19,    20,    -1,    22,
+      23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   167,   168,
+      -1,    -1,   171,    -1,   173,     7,     8,    50,    10,    11,
+      12,    13,    14,    15,    16,    17,    -1,    19,    20,    -1,
+      22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   167,
+     168,    -1,    -1,   171,    -1,   173,     7,     8,    50,    10,
+      11,    12,    13,    14,    15,    16,    17,    36,    19,    20,
+      -1,    22,    23,    24,    -1,    -1,    -1,    -1,   167,   168,
+      -1,    -1,   171,    -1,   173,    -1,    -1,    -1,    57,    58,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    50,
+      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
+      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
+      89,    90,    91,    92,    93,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   167,   168,    -1,    -1,   171,    -1,
+     173,    -1,    -1,    -1,    -1,   114,   115,   116,    -1,    -1,
+     119,   120,   121,   122,   123,   124,   125,   126,   127,   128,
+     129,   130,   131,   132,   133,   134,   135,   136,   137,   138,
+     139,   140,    -1,    -1,    -1,   167,   168,    -1,    -1,   171,
+      -1,   173,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    50,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     166,   167,    -1,    -1,   170,    -1,   172,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      36,   166,   167,    -1,    -1,   170,    -1,   172,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    57,    58,    -1,    -1,    -1,   166,   167,    -1,    -1,
-     170,    -1,   172,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   166,   167,    -1,
-      -1,   170,    -1,   172,    -1,    -1,    -1,    -1,   114,   115,
-     116,    -1,    -1,   119,   120,   121,   122,   123,   124,   125,
-     126,   127,   128,   129,   130,   131,   132,   133,   134,   135,
-     136,   137,   138,   139,   140
+      -1,    -1,    -1,    -1,    -1,    -1,   167,   168,    -1,    -1,
+     171,    -1,   173
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2791,77 +2782,77 @@
 static const yytype_uint16 yystos[] =
 {
        0,    19,    20,    22,    23,    24,    30,    31,    52,    56,
-      60,   181,   184,   186,   187,   188,   222,   223,   224,   226,
-     225,    53,    68,   231,   163,    59,   163,    18,   163,    42,
-      43,    44,    45,    46,    47,    48,    49,    51,   158,   159,
-     160,   189,   190,   191,     0,   224,    46,    48,   192,   241,
-      42,    43,    44,    47,   193,   238,   240,   248,   163,   163,
-     167,   232,    22,   230,     7,     8,    10,    11,    12,    13,
-      14,    15,    16,    17,    50,   166,   167,   170,   172,   181,
-     186,   209,   210,   244,   191,   191,    35,    37,   220,   191,
-     191,    21,   249,   250,    29,   173,   239,   249,    22,    22,
-      22,   233,   161,     4,     4,     4,   172,    10,   173,   210,
-     215,    55,   161,   183,   220,   220,    42,    44,   194,    32,
-      33,   219,    62,    63,    64,    65,    66,    67,   195,   236,
-     236,     7,   184,   185,   253,   164,   169,    39,   210,   211,
-     213,   214,   168,   168,   173,   215,   164,   173,   161,   214,
-     165,   219,   219,    10,   125,   210,   212,   221,   210,   216,
-       4,   199,    28,   172,   237,   163,    36,    57,    58,    69,
+      60,   182,   185,   187,   188,   189,   223,   224,   225,   227,
+     226,    53,    68,   232,   164,    59,   164,    18,   164,    42,
+      43,    44,    45,    46,    47,    48,    49,    51,   159,   160,
+     161,   190,   191,   192,     0,   225,    46,    48,   193,   242,
+      42,    43,    44,    47,   194,   239,   241,   249,   164,   164,
+     168,   233,    22,   231,     7,     8,    10,    11,    12,    13,
+      14,    15,    16,    17,    50,   167,   168,   171,   173,   182,
+     187,   210,   211,   245,   192,   192,    35,    37,   221,   192,
+     192,    21,   250,   251,    29,   174,   240,   250,    22,    22,
+      22,   234,   162,     4,     4,     4,   173,    10,   174,   211,
+     216,    55,   162,   184,   221,   221,    42,    44,   195,    32,
+      33,   220,    62,    63,    64,    65,    66,    67,   196,   237,
+     237,     7,   185,   186,   254,   165,   170,    39,   211,   212,
+     214,   215,   169,   169,   174,   216,   165,   174,   162,   215,
+     166,   220,   220,    10,   125,   211,   213,   222,   211,   217,
+       4,   200,    28,   173,   238,   164,    36,    57,    58,    69,
       70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
       80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
       90,    91,    92,    93,   114,   115,   116,   119,   120,   121,
      122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   139,   140,   176,
-     177,   178,   251,   258,   259,   260,   261,   251,   259,    22,
-     197,   164,   162,   210,   210,   171,   173,   210,     4,   162,
-     216,   210,   161,   244,     3,     4,     5,     6,     9,    25,
+     132,   133,   134,   135,   136,   137,   138,   139,   140,   177,
+     178,   179,   252,   259,   260,   261,   262,   252,   260,    22,
+     198,   165,   163,   211,   211,   172,   174,   211,     4,   163,
+     217,   211,   162,   245,     3,     4,     5,     6,     9,    25,
       26,    27,    40,    41,    90,    91,    92,    93,   119,   133,
-     135,   136,   137,   139,   140,   167,   170,   172,   174,   176,
-     177,   178,   217,   244,   183,   141,   142,   144,   147,   198,
-     212,    57,    10,   210,   246,   247,    11,    17,    11,   195,
+     135,   136,   137,   139,   140,   168,   171,   173,   175,   177,
+     178,   179,   218,   245,   184,   141,   142,   144,   147,   199,
+     213,    57,    10,   211,   247,   248,    11,    17,    11,   196,
       94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-     179,    26,    27,   100,   101,   102,   103,   104,   105,   106,
-     107,   108,   109,   110,   111,   112,   113,   180,   179,   180,
-     210,   210,   246,   210,   210,   254,   246,   246,   246,   246,
-     246,   210,   210,   210,   210,   210,   246,   195,   117,   118,
+     180,    26,    27,   100,   101,   102,   103,   104,   105,   106,
+     107,   108,   109,   110,   111,   112,   113,   181,   180,   181,
+     211,   211,   247,   211,   211,   255,   247,   247,   247,   247,
+     247,   211,   211,   211,   211,   211,   247,   196,   117,   118,
       54,   121,   122,   141,   142,   144,   145,   147,   148,   149,
-     196,    39,   211,   201,   169,   171,   171,   162,   201,   183,
-     183,   221,   179,   180,   179,   180,   161,   161,   161,   161,
-     161,   161,   161,   169,   216,   218,   172,   218,   173,   218,
-      22,   161,   161,   161,   227,   186,     3,     4,     5,     6,
-       9,    25,    26,    27,    40,    41,    59,   167,   170,   172,
-     174,   217,   243,   244,   245,   164,   245,   245,   245,   199,
-     210,   210,   210,   210,   164,   204,   164,   204,   245,   167,
-     164,   164,   164,   164,   164,   164,   245,   245,   245,   245,
-     245,    38,   199,   210,   246,     4,   141,   142,   143,   144,
-     146,   150,   151,   153,   154,   155,   156,   157,   200,   228,
-     229,    38,   161,   161,   161,   161,   216,   216,   216,   216,
-     216,   216,   216,   164,   169,   173,   210,   218,   171,   173,
-     216,   216,   216,   164,   207,   161,    61,   242,   169,   218,
-     172,   218,   173,   218,    22,   246,   164,   164,   212,   245,
-     245,   245,   245,    11,    54,    11,   256,   245,   167,   246,
-     210,   246,   246,   246,   164,   164,   257,   164,   164,   164,
-     210,   212,   245,   164,   207,   207,   210,   216,   216,   216,
-     216,   256,   164,   164,   164,   164,   257,   164,   216,   171,
-     173,   164,   164,    38,    34,    54,   205,   208,    39,   210,
-     234,   235,    22,   169,   173,   218,   171,   173,    17,    17,
-     245,   164,   164,   164,   164,   245,     4,   245,   164,   164,
-     245,   164,   164,   164,     4,     4,   164,   210,   245,   245,
-     245,   164,   204,   210,   162,   164,   164,   164,   164,   162,
-     216,   216,   216,   216,   162,   216,   171,   216,   216,   210,
-      22,     4,   207,   197,   164,   162,   164,   171,   173,   245,
-     245,   161,   245,   245,   245,   245,   204,   204,   246,   245,
-     164,   246,   246,   246,     4,   245,   161,   245,   216,   216,
-     216,   216,   164,   162,   164,   164,   257,   162,   162,   162,
-     181,   182,    39,   210,   201,    22,   171,   164,   167,    17,
-     210,   255,   169,   245,   257,   255,   204,   162,   162,   162,
-     162,   216,   216,   216,   162,   197,   205,   206,    17,    11,
-     169,   252,   197,   197,   162,   164,   169,   162,   162,   162,
-     162,   182,    54,   203,   245,   243,    11,   169,   121,   122,
-     245,   245,   201,    17,   210,   201,     4,   152,   202,   164,
-     243,   197,   197,    38,   197,   197,    22,    17,   164,    17,
-     245,   245,   245,    17,   245,   197,   197,   245,    73,    17,
-     245
+     158,   197,    39,   212,   202,   170,   172,   172,   163,   202,
+     184,   184,   222,   180,   181,   180,   181,   162,   162,   162,
+     162,   162,   162,   162,   170,   217,   219,   173,   219,   174,
+     219,    22,   162,   162,   162,   228,   187,     3,     4,     5,
+       6,     9,    25,    26,    27,    40,    41,    59,   168,   171,
+     173,   175,   218,   244,   245,   246,   165,   246,   246,   246,
+     200,   211,   211,   211,   211,   165,   205,   165,   205,   246,
+     168,   165,   165,   165,   165,   165,   165,   246,   246,   246,
+     246,   246,    38,   200,   211,   247,     4,   141,   142,   143,
+     144,   146,   150,   151,   153,   154,   155,   156,   157,   201,
+     229,   230,    38,   162,   162,   162,   162,   217,   217,   217,
+     217,   217,   217,   217,   165,   170,   174,   211,   219,   172,
+     174,   217,   217,   217,   165,   208,   162,    61,   243,   170,
+     219,   173,   219,   174,   219,    22,   247,   165,   165,   213,
+     246,   246,   246,   246,    11,    54,    11,   257,   246,   168,
+     247,   211,   247,   247,   247,   165,   165,   258,   165,   165,
+     165,   211,   213,   246,   165,   208,   208,   211,   217,   217,
+     217,   217,   257,   165,   165,   165,   165,   258,   165,   217,
+     172,   174,   165,   165,    38,    34,    54,   206,   209,    39,
+     211,   235,   236,    22,   170,   174,   219,   172,   174,    17,
+      17,   246,   165,   165,   165,   165,   246,     4,   246,   165,
+     165,   246,   165,   165,   165,     4,     4,   165,   211,   246,
+     246,   246,   165,   205,   211,   163,   165,   165,   165,   165,
+     163,   217,   217,   217,   217,   163,   217,   172,   217,   217,
+     211,    22,     4,   208,   198,   165,   163,   165,   172,   174,
+     246,   246,   162,   246,   246,   246,   246,   205,   205,   247,
+     246,   165,   247,   247,   247,     4,   246,   162,   246,   217,
+     217,   217,   217,   165,   163,   165,   165,   258,   163,   163,
+     163,   182,   183,    39,   211,   202,    22,   172,   165,   168,
+      17,   211,   256,   170,   246,   258,   256,   205,   163,   163,
+     163,   163,   217,   217,   217,   163,   198,   206,   207,    17,
+      11,   170,   253,   198,   198,   163,   165,   170,   163,   163,
+     163,   163,   183,    54,   204,   246,   244,    11,   170,   121,
+     122,   246,   246,   202,    17,   211,   202,     4,   152,   203,
+     165,   244,   198,   198,    38,   198,   198,    22,    17,   165,
+      17,   246,   246,   246,    17,   246,   198,   198,   246,    73,
+      17,   246
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -4057,180 +4048,189 @@
 
   case 108:
 #line 1275 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ByVal;     ;}
+    { (yyval.Attributes) = Attribute::NoCapture; ;}
     break;
 
   case 109:
 #line 1276 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::Nest;      ;}
+    { (yyval.Attributes) = Attribute::ByVal;     ;}
     break;
 
   case 110:
 #line 1277 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) =
-                          Attribute::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val));    ;}
+    { (yyval.Attributes) = Attribute::Nest;      ;}
     break;
 
   case 111:
-#line 1281 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::None; ;}
+#line 1278 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) =
+                          Attribute::constructAlignmentFromInt((yyvsp[(2) - (2)].UInt64Val));    ;}
     break;
 
   case 112:
 #line 1282 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    {
-                (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
-              ;}
+    { (yyval.Attributes) = Attribute::None; ;}
     break;
 
   case 113:
-#line 1287 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::InReg;    ;}
+#line 1283 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    {
+                (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
+              ;}
     break;
 
   case 114:
 #line 1288 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ZExt;     ;}
+    { (yyval.Attributes) = Attribute::InReg;    ;}
     break;
 
   case 115:
 #line 1289 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::SExt;     ;}
+    { (yyval.Attributes) = Attribute::ZExt;     ;}
     break;
 
   case 116:
 #line 1290 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::NoAlias;  ;}
+    { (yyval.Attributes) = Attribute::SExt;     ;}
     break;
 
   case 117:
-#line 1293 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::None; ;}
+#line 1291 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::NoAlias;  ;}
     break;
 
   case 118:
 #line 1294 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    {
-               (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
-             ;}
+    { (yyval.Attributes) = Attribute::None; ;}
     break;
 
   case 119:
-#line 1300 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::NoReturn; ;}
+#line 1295 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    {
+               (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
+             ;}
     break;
 
   case 120:
 #line 1301 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::NoUnwind; ;}
+    { (yyval.Attributes) = Attribute::NoReturn; ;}
     break;
 
   case 121:
 #line 1302 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::InReg;     ;}
+    { (yyval.Attributes) = Attribute::NoUnwind; ;}
     break;
 
   case 122:
 #line 1303 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ZExt;     ;}
+    { (yyval.Attributes) = Attribute::InReg;     ;}
     break;
 
   case 123:
 #line 1304 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::SExt;     ;}
+    { (yyval.Attributes) = Attribute::ZExt;     ;}
     break;
 
   case 124:
 #line 1305 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ReadNone; ;}
+    { (yyval.Attributes) = Attribute::SExt;     ;}
     break;
 
   case 125:
 #line 1306 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::ReadOnly; ;}
+    { (yyval.Attributes) = Attribute::ReadNone; ;}
     break;
 
   case 126:
 #line 1307 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::NoInline; ;}
+    { (yyval.Attributes) = Attribute::ReadOnly; ;}
     break;
 
   case 127:
 #line 1308 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::AlwaysInline; ;}
+    { (yyval.Attributes) = Attribute::NoInline; ;}
     break;
 
   case 128:
 #line 1309 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::OptimizeForSize; ;}
+    { (yyval.Attributes) = Attribute::AlwaysInline; ;}
     break;
 
   case 129:
 #line 1310 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::StackProtect; ;}
+    { (yyval.Attributes) = Attribute::OptimizeForSize; ;}
     break;
 
   case 130:
 #line 1311 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::StackProtectReq; ;}
+    { (yyval.Attributes) = Attribute::StackProtect; ;}
     break;
 
   case 131:
-#line 1314 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.Attributes) = Attribute::None; ;}
+#line 1312 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::StackProtectReq; ;}
     break;
 
   case 132:
 #line 1315 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.Attributes) = Attribute::None; ;}
+    break;
+
+  case 133:
+#line 1316 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.Attributes) = (yyvsp[(1) - (2)].Attributes) | (yyvsp[(2) - (2)].Attributes);
               ;}
     break;
 
-  case 133:
-#line 1321 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 134:
+#line 1322 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
-  case 134:
-#line 1322 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 135:
+#line 1323 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.StrVal) = (yyvsp[(2) - (2)].StrVal);
               ;}
     break;
 
-  case 135:
-#line 1329 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 136:
+#line 1330 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 136:
-#line 1330 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 137:
+#line 1331 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(2) - (2)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
     GEN_ERROR("Alignment must be a power of two");
+  if ((yyval.UIntVal) > 0x40000000)
+    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 137:
-#line 1336 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 138:
+#line 1339 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 138:
-#line 1337 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 139:
+#line 1340 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[(3) - (3)].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
     GEN_ERROR("Alignment must be a power of two");
+  if ((yyval.UIntVal) > 0x40000000)
+    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 139:
-#line 1346 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 140:
+#line 1351 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   for (unsigned i = 0, e = (yyvsp[(2) - (2)].StrVal)->length(); i != e; ++i)
     if ((*(yyvsp[(2) - (2)].StrVal))[i] == '"' || (*(yyvsp[(2) - (2)].StrVal))[i] == '\\')
@@ -4240,28 +4240,28 @@
 ;}
     break;
 
-  case 140:
-#line 1354 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = 0; ;}
-    break;
-
   case 141:
-#line 1355 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
+#line 1359 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = 0; ;}
     break;
 
   case 142:
 #line 1360 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
-    {;}
+    { (yyval.StrVal) = (yyvsp[(1) - (1)].StrVal); ;}
     break;
 
   case 143:
-#line 1361 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+#line 1365 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 144:
-#line 1362 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+#line 1366 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+    {;}
+    break;
+
+  case 145:
+#line 1367 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -4269,34 +4269,36 @@
   ;}
     break;
 
-  case 145:
-#line 1367 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 146:
+#line 1372 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(2) - (2)].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[(2) - (2)].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two");
+    if ((yyvsp[(2) - (2)].UInt64Val) > 0x40000000)
+      GEN_ERROR("Alignment too large");
     CurGV->setAlignment((yyvsp[(2) - (2)].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 153:
-#line 1383 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 154:
+#line 1390 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 154:
-#line 1387 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 155:
+#line 1394 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[(1) - (1)].PrimType));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 155:
-#line 1391 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 156:
+#line 1398 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[(1) - (3)].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -4306,8 +4308,8 @@
   ;}
     break;
 
-  case 156:
-#line 1398 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 157:
+#line 1405 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
     const Type* tmp = getTypeVal((yyvsp[(1) - (1)].ValIDVal));
     CHECK_FOR_ERROR
@@ -4315,8 +4317,8 @@
   ;}
     break;
 
-  case 157:
-#line 1403 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 158:
+#line 1410 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                   // Type UpReference
     if ((yyvsp[(2) - (2)].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
@@ -4327,8 +4329,8 @@
   ;}
     break;
 
-  case 158:
-#line 1411 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 159:
+#line 1418 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4366,8 +4368,8 @@
   ;}
     break;
 
-  case 159:
-#line 1446 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 160:
+#line 1453 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4400,8 +4402,8 @@
   ;}
     break;
 
-  case 160:
-#line 1477 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 161:
+#line 1484 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[(4) - (5)].TypeVal), (yyvsp[(2) - (5)].UInt64Val))));
     delete (yyvsp[(4) - (5)].TypeVal);
@@ -4409,8 +4411,8 @@
   ;}
     break;
 
-  case 161:
-#line 1482 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 162:
+#line 1489 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {          // Vector type?
      const llvm::Type* ElemTy = (yyvsp[(4) - (5)].TypeVal)->get();
      if ((unsigned)(yyvsp[(2) - (5)].UInt64Val) != (yyvsp[(2) - (5)].UInt64Val))
@@ -4423,8 +4425,8 @@
   ;}
     break;
 
-  case 162:
-#line 1492 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 163:
+#line 1499 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(2) - (3)].TypeList)->begin(),
@@ -4437,16 +4439,16 @@
   ;}
     break;
 
-  case 163:
-#line 1502 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 164:
+#line 1509 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 164:
-#line 1506 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 165:
+#line 1513 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[(3) - (5)].TypeList)->begin(),
@@ -4459,16 +4461,16 @@
   ;}
     break;
 
-  case 165:
-#line 1516 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 166:
+#line 1523 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 166:
-#line 1523 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 167:
+#line 1530 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Allow but ignore attributes on function types; this permits auto-upgrade.
     // FIXME: remove in LLVM 3.0.
@@ -4477,8 +4479,8 @@
   ;}
     break;
 
-  case 167:
-#line 1532 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 168:
+#line 1539 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (1)].TypeVal))->getDescription());
@@ -4488,15 +4490,15 @@
   ;}
     break;
 
-  case 168:
-#line 1539 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 169:
+#line 1546 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
-  case 169:
-#line 1544 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 170:
+#line 1551 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     (yyval.TypeWithAttrsList)->push_back((yyvsp[(1) - (1)].TypeWithAttrs));
@@ -4504,16 +4506,16 @@
   ;}
     break;
 
-  case 170:
-#line 1549 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 171:
+#line 1556 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList))->push_back((yyvsp[(3) - (3)].TypeWithAttrs));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 172:
-#line 1557 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 173:
+#line 1564 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList)=(yyvsp[(1) - (3)].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = Attribute::None;
@@ -4523,8 +4525,8 @@
   ;}
     break;
 
-  case 173:
-#line 1564 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 174:
+#line 1571 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = Attribute::None;
@@ -4534,16 +4536,16 @@
   ;}
     break;
 
-  case 174:
-#line 1571 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 175:
+#line 1578 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 175:
-#line 1579 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 176:
+#line 1586 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[(1) - (1)].TypeVal));
@@ -4552,8 +4554,8 @@
   ;}
     break;
 
-  case 176:
-#line 1585 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 177:
+#line 1592 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[(1) - (3)].TypeList))->push_back(*(yyvsp[(3) - (3)].TypeVal));
     delete (yyvsp[(3) - (3)].TypeVal);
@@ -4561,8 +4563,8 @@
   ;}
     break;
 
-  case 177:
-#line 1597 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 178:
+#line 1604 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4593,8 +4595,8 @@
   ;}
     break;
 
-  case 178:
-#line 1625 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 179:
+#line 1632 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4613,8 +4615,8 @@
   ;}
     break;
 
-  case 179:
-#line 1641 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 180:
+#line 1648 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4644,8 +4646,8 @@
   ;}
     break;
 
-  case 180:
-#line 1668 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 181:
+#line 1675 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (4)].TypeVal))->getDescription());
@@ -4676,8 +4678,8 @@
   ;}
     break;
 
-  case 181:
-#line 1696 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 182:
+#line 1703 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (4)].TypeVal)->get());
     if (STy == 0)
@@ -4706,8 +4708,8 @@
   ;}
     break;
 
-  case 182:
-#line 1722 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 183:
+#line 1729 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -4730,8 +4732,8 @@
   ;}
     break;
 
-  case 183:
-#line 1742 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 184:
+#line 1749 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[(1) - (6)].TypeVal)->get());
     if (STy == 0)
@@ -4760,8 +4762,8 @@
   ;}
     break;
 
-  case 184:
-#line 1768 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 185:
+#line 1775 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (5)].TypeVal))->getDescription());
@@ -4784,8 +4786,8 @@
   ;}
     break;
 
-  case 185:
-#line 1788 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 186:
+#line 1795 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4800,8 +4802,8 @@
   ;}
     break;
 
-  case 186:
-#line 1800 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 187:
+#line 1807 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4811,8 +4813,8 @@
   ;}
     break;
 
-  case 187:
-#line 1807 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 188:
+#line 1814 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4881,8 +4883,8 @@
   ;}
     break;
 
-  case 188:
-#line 1873 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 189:
+#line 1880 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4895,8 +4897,8 @@
   ;}
     break;
 
-  case 189:
-#line 1883 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 190:
+#line 1890 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -4909,8 +4911,8 @@
   ;}
     break;
 
-  case 190:
-#line 1893 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 191:
+#line 1900 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (IntegerType *IT = dyn_cast<IntegerType>((yyvsp[(1) - (2)].TypeVal)->get())) {
       if (!ConstantInt::isValueValidForType(IT, (yyvsp[(2) - (2)].SInt64Val)))
@@ -4924,8 +4926,8 @@
   ;}
     break;
 
-  case 191:
-#line 1904 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 192:
+#line 1911 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     if (IntegerType *IT = dyn_cast<IntegerType>((yyvsp[(1) - (2)].TypeVal)->get())) {
       if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > IT->getBitWidth())
@@ -4941,8 +4943,8 @@
   ;}
     break;
 
-  case 192:
-#line 1917 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 193:
+#line 1924 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (IntegerType *IT = dyn_cast<IntegerType>((yyvsp[(1) - (2)].TypeVal)->get())) {
       if (!ConstantInt::isValueValidForType(IT, (yyvsp[(2) - (2)].UInt64Val)))
@@ -4956,8 +4958,8 @@
   ;}
     break;
 
-  case 193:
-#line 1928 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 194:
+#line 1935 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     if (IntegerType *IT = dyn_cast<IntegerType>((yyvsp[(1) - (2)].TypeVal)->get())) {
       if ((yyvsp[(2) - (2)].APIntVal)->getBitWidth() > IT->getBitWidth())
@@ -4974,8 +4976,8 @@
   ;}
     break;
 
-  case 194:
-#line 1942 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 195:
+#line 1949 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     if ((yyvsp[(1) - (2)].TypeVal)->get() != Type::Int1Ty)
       GEN_ERROR("Constant true must have type i1");
@@ -4985,8 +4987,8 @@
   ;}
     break;
 
-  case 195:
-#line 1949 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 196:
+#line 1956 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     if ((yyvsp[(1) - (2)].TypeVal)->get() != Type::Int1Ty)
       GEN_ERROR("Constant false must have type i1");
@@ -4996,8 +4998,8 @@
   ;}
     break;
 
-  case 196:
-#line 1956 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 197:
+#line 1963 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                   // Floating point constants
     if (!ConstantFP::isValueValidForType((yyvsp[(1) - (2)].TypeVal)->get(), *(yyvsp[(2) - (2)].FPVal)))
       GEN_ERROR("Floating point constant invalid for type");
@@ -5016,8 +5018,8 @@
   ;}
     break;
 
-  case 197:
-#line 1974 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 198:
+#line 1981 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (6)].TypeVal))->getDescription());
@@ -5032,8 +5034,8 @@
   ;}
     break;
 
-  case 198:
-#line 1986 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 199:
+#line 1993 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
@@ -5057,8 +5059,8 @@
   ;}
     break;
 
-  case 199:
-#line 2007 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 200:
+#line 2014 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (8)].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
@@ -5069,8 +5071,8 @@
   ;}
     break;
 
-  case 200:
-#line 2015 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 201:
+#line 2022 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
@@ -5079,8 +5081,8 @@
   ;}
     break;
 
-  case 201:
-#line 2021 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 202:
+#line 2028 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(3) - (6)].ConstVal)->getType() != (yyvsp[(5) - (6)].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
@@ -5094,8 +5096,8 @@
   ;}
     break;
 
-  case 202:
-#line 2032 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 203:
+#line 2039 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
@@ -5103,8 +5105,8 @@
   ;}
     break;
 
-  case 203:
-#line 2037 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 204:
+#line 2044 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
@@ -5112,8 +5114,8 @@
   ;}
     break;
 
-  case 204:
-#line 2042 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 205:
+#line 2049 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vicmp operand types must match");
@@ -5121,8 +5123,8 @@
   ;}
     break;
 
-  case 205:
-#line 2047 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 206:
+#line 2054 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(4) - (7)].ConstVal)->getType() != (yyvsp[(6) - (7)].ConstVal)->getType())
       GEN_ERROR("vfcmp operand types must match");
@@ -5130,8 +5132,8 @@
   ;}
     break;
 
-  case 206:
-#line 2052 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 207:
+#line 2059 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(3) - (6)].ConstVal), (yyvsp[(5) - (6)].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -5140,8 +5142,8 @@
   ;}
     break;
 
-  case 207:
-#line 2058 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 208:
+#line 2065 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -5150,8 +5152,8 @@
   ;}
     break;
 
-  case 208:
-#line 2064 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 209:
+#line 2071 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[(3) - (8)].ConstVal), (yyvsp[(5) - (8)].ConstVal), (yyvsp[(7) - (8)].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -5160,8 +5162,8 @@
   ;}
     break;
 
-  case 209:
-#line 2070 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 210:
+#line 2077 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (5)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (5)].ConstVal)->getType()))
       GEN_ERROR("ExtractValue requires an aggregate operand");
@@ -5172,8 +5174,8 @@
   ;}
     break;
 
-  case 210:
-#line 2078 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 211:
+#line 2085 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<StructType>((yyvsp[(3) - (7)].ConstVal)->getType()) && !isa<ArrayType>((yyvsp[(3) - (7)].ConstVal)->getType()))
       GEN_ERROR("InsertValue requires an aggregate operand");
@@ -5184,16 +5186,16 @@
   ;}
     break;
 
-  case 211:
-#line 2089 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 212:
+#line 2096 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[(1) - (3)].ConstVector))->push_back((yyvsp[(3) - (3)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 212:
-#line 2093 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 213:
+#line 2100 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[(1) - (1)].ConstVal));
@@ -5201,28 +5203,28 @@
   ;}
     break;
 
-  case 213:
-#line 2101 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 214:
+#line 2108 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 214:
-#line 2101 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 215:
+#line 2108 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 215:
-#line 2104 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 216:
+#line 2111 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 216:
-#line 2104 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 217:
+#line 2111 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 217:
-#line 2107 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 218:
+#line 2114 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const Type* VTy = (yyvsp[(1) - (2)].TypeVal)->get();
     Value *V = getVal(VTy, (yyvsp[(2) - (2)].ValIDVal));
@@ -5237,8 +5239,8 @@
    ;}
     break;
 
-  case 218:
-#line 2119 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 219:
+#line 2126 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     Constant *Val = (yyvsp[(3) - (6)].ConstVal);
     const Type *DestTy = (yyvsp[(5) - (6)].TypeVal)->get();
@@ -5253,8 +5255,8 @@
    ;}
     break;
 
-  case 219:
-#line 2140 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 220:
+#line 2147 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5262,8 +5264,8 @@
   ;}
     break;
 
-  case 220:
-#line 2145 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 221:
+#line 2152 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -5271,40 +5273,40 @@
   ;}
     break;
 
-  case 223:
-#line 2158 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 224:
+#line 2165 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
-  case 224:
-#line 2158 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 225:
+#line 2165 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 225:
-#line 2162 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 226:
+#line 2169 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
-  case 226:
-#line 2162 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 227:
+#line 2169 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 227:
-#line 2165 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 228:
+#line 2172 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 228:
-#line 2168 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 229:
+#line 2175 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (3)].TypeVal))->getDescription());
@@ -5331,8 +5333,8 @@
   ;}
     break;
 
-  case 229:
-#line 2192 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 230:
+#line 2199 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[(1) - (3)].StrVal), (yyvsp[(3) - (3)].PrimType));
 
@@ -5346,8 +5348,8 @@
   ;}
     break;
 
-  case 230:
-#line 2204 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 231:
+#line 2211 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     /* "Externally Visible" Linkage */
     if ((yyvsp[(5) - (6)].ConstVal) == 0)
@@ -5358,15 +5360,15 @@
   ;}
     break;
 
-  case 231:
-#line 2211 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 232:
+#line 2218 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 232:
-#line 2215 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 233:
+#line 2222 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[(6) - (7)].ConstVal) == 0)
       GEN_ERROR("Global value initializer is not a constant");
@@ -5375,15 +5377,15 @@
   ;}
     break;
 
-  case 233:
-#line 2220 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 234:
+#line 2227 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 234:
-#line 2224 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 235:
+#line 2231 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(6) - (7)].TypeVal))->getDescription());
@@ -5393,16 +5395,16 @@
   ;}
     break;
 
-  case 235:
-#line 2230 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 236:
+#line 2237 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 236:
-#line 2234 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 237:
+#line 2241 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     std::string Name;
     if ((yyvsp[(1) - (5)].StrVal)) {
@@ -5445,22 +5447,22 @@
   ;}
     break;
 
-  case 237:
-#line 2274 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 238:
+#line 2281 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 238:
-#line 2277 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 239:
+#line 2284 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 239:
-#line 2283 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 240:
+#line 2290 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   if (AsmSoFar.empty())
@@ -5472,24 +5474,24 @@
 ;}
     break;
 
-  case 240:
-#line 2293 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 241:
+#line 2300 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
   ;}
     break;
 
-  case 241:
-#line 2297 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 242:
+#line 2304 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout(*(yyvsp[(3) - (3)].StrVal));
     delete (yyvsp[(3) - (3)].StrVal);
   ;}
     break;
 
-  case 243:
-#line 2304 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 244:
+#line 2311 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(3) - (3)].StrVal));
           delete (yyvsp[(3) - (3)].StrVal);
@@ -5497,8 +5499,8 @@
         ;}
     break;
 
-  case 244:
-#line 2309 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 245:
+#line 2316 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary(*(yyvsp[(1) - (1)].StrVal));
           delete (yyvsp[(1) - (1)].StrVal);
@@ -5506,15 +5508,15 @@
         ;}
     break;
 
-  case 245:
-#line 2314 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 246:
+#line 2321 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
-  case 246:
-#line 2323 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 247:
+#line 2330 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -5527,8 +5529,8 @@
   ;}
     break;
 
-  case 247:
-#line 2333 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 248:
+#line 2340 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (3)].TypeVal))->getDescription());
@@ -5541,16 +5543,16 @@
   ;}
     break;
 
-  case 248:
-#line 2344 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 249:
+#line 2351 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (1)].ArgList);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 249:
-#line 2348 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 250:
+#line 2355 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[(1) - (3)].ArgList);
     struct ArgListEntry E;
@@ -5562,8 +5564,8 @@
   ;}
     break;
 
-  case 250:
-#line 2357 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 251:
+#line 2364 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -5575,16 +5577,16 @@
   ;}
     break;
 
-  case 251:
-#line 2366 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 252:
+#line 2373 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 252:
-#line 2372 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 253:
+#line 2379 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   std::string FunctionName(*(yyvsp[(4) - (11)].StrVal));
   delete (yyvsp[(4) - (11)].StrVal);  // Free strdup'd memory!
@@ -5734,8 +5736,8 @@
 ;}
     break;
 
-  case 255:
-#line 2522 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 256:
+#line 2529 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -5746,16 +5748,16 @@
 ;}
     break;
 
-  case 258:
-#line 2533 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 259:
+#line 2540 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 259:
-#line 2538 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 260:
+#line 2545 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[(1) - (3)].Linkage));
     CurFun.CurrentFunction->setVisibility((yyvsp[(2) - (3)].Visibility));
@@ -5765,40 +5767,40 @@
   ;}
     break;
 
-  case 260:
-#line 2550 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 261:
+#line 2557 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 261:
-#line 2554 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 262:
+#line 2561 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 262:
-#line 2559 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 263:
+#line 2566 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].SInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 263:
-#line 2563 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 264:
+#line 2570 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 264:
-#line 2567 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 265:
+#line 2574 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     (yyval.ValIDVal) = ValID::create(*(yyvsp[(1) - (1)].APIntVal), true);
     delete (yyvsp[(1) - (1)].APIntVal);
@@ -5806,8 +5808,8 @@
   ;}
     break;
 
-  case 265:
-#line 2572 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 266:
+#line 2579 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     (yyval.ValIDVal) = ValID::create(*(yyvsp[(1) - (1)].APIntVal), false);
     delete (yyvsp[(1) - (1)].APIntVal);
@@ -5815,56 +5817,56 @@
   ;}
     break;
 
-  case 266:
-#line 2577 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 267:
+#line 2584 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].FPVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 267:
-#line 2581 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 268:
+#line 2588 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 268:
-#line 2585 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 269:
+#line 2592 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 269:
-#line 2589 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 270:
+#line 2596 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 270:
-#line 2593 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 271:
+#line 2600 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 271:
-#line 2597 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 272:
+#line 2604 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 272:
-#line 2601 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 273:
+#line 2608 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     unsigned NumElements = (yyvsp[(2) - (3)].ConstVector)->size();
@@ -5889,8 +5891,8 @@
   ;}
     break;
 
-  case 273:
-#line 2623 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 274:
+#line 2630 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     const Type *ETy = (*(yyvsp[(2) - (3)].ConstVector))[0]->getType();
     uint64_t NumElements = (yyvsp[(2) - (3)].ConstVector)->size();
@@ -5915,8 +5917,8 @@
   ;}
     break;
 
-  case 274:
-#line 2645 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 275:
+#line 2652 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Use undef instead of an array because it's inconvenient to determine
     // the element type at this point, there being no elements to examine.
@@ -5925,8 +5927,8 @@
   ;}
     break;
 
-  case 275:
-#line 2651 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 276:
+#line 2658 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     uint64_t NumElements = (yyvsp[(2) - (2)].StrVal)->length();
     const Type *ETy = Type::Int8Ty;
@@ -5942,8 +5944,8 @@
   ;}
     break;
 
-  case 276:
-#line 2664 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 277:
+#line 2671 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(2) - (3)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(2) - (3)].ConstVector)->size(); i != e; ++i)
@@ -5958,8 +5960,8 @@
   ;}
     break;
 
-  case 277:
-#line 2676 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 278:
+#line 2683 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>());
     (yyval.ValIDVal) = ValID::create(ConstantStruct::get(STy, std::vector<Constant*>()));
@@ -5967,8 +5969,8 @@
   ;}
     break;
 
-  case 278:
-#line 2681 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 279:
+#line 2688 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements((yyvsp[(3) - (5)].ConstVector)->size());
     for (unsigned i = 0, e = (yyvsp[(3) - (5)].ConstVector)->size(); i != e; ++i)
@@ -5983,8 +5985,8 @@
   ;}
     break;
 
-  case 279:
-#line 2693 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 280:
+#line 2700 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = StructType::get(std::vector<const Type*>(),
                                             /*isPacked=*/true);
@@ -5993,16 +5995,16 @@
   ;}
     break;
 
-  case 280:
-#line 2699 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 281:
+#line 2706 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[(1) - (1)].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 281:
-#line 2703 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 282:
+#line 2710 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createInlineAsm(*(yyvsp[(3) - (5)].StrVal), *(yyvsp[(5) - (5)].StrVal), (yyvsp[(2) - (5)].BoolVal));
     delete (yyvsp[(3) - (5)].StrVal);
@@ -6011,24 +6013,24 @@
   ;}
     break;
 
-  case 282:
-#line 2713 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 283:
+#line 2720 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::createLocalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 283:
-#line 2717 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 284:
+#line 2724 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[(1) - (1)].UIntVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 284:
-#line 2721 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 285:
+#line 2728 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -6036,8 +6038,8 @@
   ;}
     break;
 
-  case 285:
-#line 2726 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 286:
+#line 2733 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createGlobalName(*(yyvsp[(1) - (1)].StrVal));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -6045,8 +6047,8 @@
   ;}
     break;
 
-  case 288:
-#line 2739 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 289:
+#line 2746 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (2)].TypeVal))->getDescription());
@@ -6056,8 +6058,8 @@
   ;}
     break;
 
-  case 289:
-#line 2748 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 290:
+#line 2755 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = new std::vector<Value *>();
     (yyval.ValueList)->push_back((yyvsp[(1) - (1)].ValueVal));
@@ -6065,32 +6067,32 @@
   ;}
     break;
 
-  case 290:
-#line 2753 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 291:
+#line 2760 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ValueList)=(yyvsp[(1) - (3)].ValueList))->push_back((yyvsp[(3) - (3)].ValueVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 291:
-#line 2758 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 292:
+#line 2765 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 292:
-#line 2762 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 293:
+#line 2769 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks
     (yyval.FunctionVal) = (yyvsp[(1) - (2)].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 293:
-#line 2771 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 294:
+#line 2778 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[(3) - (3)].TermInstVal), (yyvsp[(2) - (3)].StrVal));
     CHECK_FOR_ERROR
@@ -6101,8 +6103,8 @@
   ;}
     break;
 
-  case 294:
-#line 2780 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 295:
+#line 2787 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
   CHECK_FOR_ERROR
   int ValNum = InsertValue((yyvsp[(3) - (3)].TermInstVal));
@@ -6116,8 +6118,8 @@
 ;}
     break;
 
-  case 295:
-#line 2793 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 296:
+#line 2800 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[(2) - (2)].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -6129,16 +6131,16 @@
   ;}
     break;
 
-  case 296:
-#line 2802 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 297:
+#line 2809 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 297:
-#line 2806 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 298:
+#line 2813 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName(*(yyvsp[(1) - (1)].StrVal)));
     delete (yyvsp[(1) - (1)].StrVal);
@@ -6147,8 +6149,8 @@
   ;}
     break;
 
-  case 298:
-#line 2814 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 299:
+#line 2821 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { // Return with a result...
     ValueList &VL = *(yyvsp[(2) - (2)].ValueList);
     assert(!VL.empty() && "Invalid ret operands!");
@@ -6171,16 +6173,16 @@
   ;}
     break;
 
-  case 299:
-#line 2834 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 300:
+#line 2841 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
     (yyval.TermInstVal) = ReturnInst::Create();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 300:
-#line 2838 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 301:
+#line 2845 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[(3) - (3)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6188,8 +6190,8 @@
   ;}
     break;
 
-  case 301:
-#line 2843 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 302:
+#line 2850 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (cast<IntegerType>((yyvsp[(2) - (9)].PrimType))->getBitWidth() != 1)
       GEN_ERROR("Branch condition must have type i1");
@@ -6203,8 +6205,8 @@
   ;}
     break;
 
-  case 302:
-#line 2854 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 303:
+#line 2861 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (9)].PrimType), (yyvsp[(3) - (9)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6226,8 +6228,8 @@
   ;}
     break;
 
-  case 303:
-#line 2873 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 304:
+#line 2880 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[(2) - (8)].PrimType), (yyvsp[(3) - (8)].ValIDVal));
     CHECK_FOR_ERROR
@@ -6239,8 +6241,8 @@
   ;}
     break;
 
-  case 304:
-#line 2883 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 305:
+#line 2890 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6346,24 +6348,24 @@
   ;}
     break;
 
-  case 305:
-#line 2986 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 306:
+#line 2993 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 306:
-#line 2990 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 307:
+#line 2997 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 307:
-#line 2997 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 308:
+#line 3004 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[(1) - (6)].JumpTable);
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(2) - (6)].PrimType), (yyvsp[(3) - (6)].ValIDVal)));
@@ -6377,8 +6379,8 @@
   ;}
     break;
 
-  case 308:
-#line 3008 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 309:
+#line 3015 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getExistingVal((yyvsp[(1) - (5)].PrimType), (yyvsp[(2) - (5)].ValIDVal)));
@@ -6393,8 +6395,8 @@
   ;}
     break;
 
-  case 309:
-#line 3021 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 310:
+#line 3028 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
     setValueName((yyvsp[(2) - (2)].InstVal), (yyvsp[(1) - (2)].StrVal));
@@ -6405,8 +6407,8 @@
   ;}
     break;
 
-  case 310:
-#line 3030 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 311:
+#line 3037 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
     int ValNum = InsertValue((yyvsp[(2) - (2)].InstVal));
@@ -6420,8 +6422,8 @@
   ;}
     break;
 
-  case 311:
-#line 3043 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 312:
+#line 3050 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(1) - (6)].TypeVal))->getDescription());
@@ -6435,8 +6437,8 @@
   ;}
     break;
 
-  case 312:
-#line 3054 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 313:
+#line 3061 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.PHIList) = (yyvsp[(1) - (7)].PHIList);
     Value* tmpVal = getVal((yyvsp[(1) - (7)].PHIList)->front().first->getType(), (yyvsp[(4) - (7)].ValIDVal));
@@ -6447,8 +6449,8 @@
   ;}
     break;
 
-  case 313:
-#line 3064 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 314:
+#line 3071 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -6462,8 +6464,8 @@
   ;}
     break;
 
-  case 314:
-#line 3075 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 315:
+#line 3082 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     // Labels are only valid in ASMs
@@ -6474,8 +6476,8 @@
   ;}
     break;
 
-  case 315:
-#line 3083 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 316:
+#line 3090 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     if (!UpRefs.empty())
@@ -6488,8 +6490,8 @@
   ;}
     break;
 
-  case 316:
-#line 3093 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 317:
+#line 3100 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     // FIXME: Remove trailing OptAttributes in LLVM 3.0, it was a mistake in 2.0
     (yyval.ParamList) = (yyvsp[(1) - (6)].ParamList);
@@ -6499,18 +6501,18 @@
   ;}
     break;
 
-  case 317:
-#line 3100 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 318:
+#line 3107 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamList) = new ParamList(); ;}
     break;
 
-  case 318:
-#line 3103 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 319:
+#line 3110 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
-  case 319:
-#line 3104 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 320:
+#line 3111 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[(1) - (3)].ValueList);
     (yyval.ValueList)->push_back((yyvsp[(3) - (3)].ValueVal));
@@ -6518,8 +6520,8 @@
   ;}
     break;
 
-  case 320:
-#line 3112 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 321:
+#line 3119 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = new std::vector<unsigned>();
     if ((unsigned)(yyvsp[(2) - (2)].UInt64Val) != (yyvsp[(2) - (2)].UInt64Val))
@@ -6528,8 +6530,8 @@
   ;}
     break;
 
-  case 321:
-#line 3118 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 322:
+#line 3125 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstantList) = (yyvsp[(1) - (3)].ConstantList);
     if ((unsigned)(yyvsp[(3) - (3)].UInt64Val) != (yyvsp[(3) - (3)].UInt64Val))
@@ -6539,24 +6541,24 @@
   ;}
     break;
 
-  case 322:
-#line 3127 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 323:
+#line 3134 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 323:
-#line 3131 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 324:
+#line 3138 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 324:
-#line 3136 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 325:
+#line 3143 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6575,8 +6577,8 @@
   ;}
     break;
 
-  case 325:
-#line 3152 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 326:
+#line 3159 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -6596,8 +6598,8 @@
   ;}
     break;
 
-  case 326:
-#line 3169 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 327:
+#line 3176 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6612,8 +6614,8 @@
   ;}
     break;
 
-  case 327:
-#line 3181 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 328:
+#line 3188 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6628,8 +6630,8 @@
   ;}
     break;
 
-  case 328:
-#line 3193 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 329:
+#line 3200 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6646,8 +6648,8 @@
   ;}
     break;
 
-  case 329:
-#line 3207 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 330:
+#line 3214 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (6)].TypeVal))->getDescription());
@@ -6664,8 +6666,8 @@
   ;}
     break;
 
-  case 330:
-#line 3221 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 331:
+#line 3228 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6680,8 +6682,8 @@
   ;}
     break;
 
-  case 331:
-#line 3233 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 332:
+#line 3240 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (isa<VectorType>((yyvsp[(2) - (6)].ValueVal)->getType())) {
       // vector select
@@ -6705,8 +6707,8 @@
   ;}
     break;
 
-  case 332:
-#line 3254 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 333:
+#line 3261 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(4) - (4)].TypeVal))->getDescription());
@@ -6716,8 +6718,8 @@
   ;}
     break;
 
-  case 333:
-#line 3261 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 334:
+#line 3268 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[(2) - (4)].ValueVal), (yyvsp[(4) - (4)].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -6726,8 +6728,8 @@
   ;}
     break;
 
-  case 334:
-#line 3267 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 335:
+#line 3274 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -6736,8 +6738,8 @@
   ;}
     break;
 
-  case 335:
-#line 3273 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 336:
+#line 3280 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[(2) - (6)].ValueVal), (yyvsp[(4) - (6)].ValueVal), (yyvsp[(6) - (6)].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -6746,8 +6748,8 @@
   ;}
     break;
 
-  case 336:
-#line 3279 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 337:
+#line 3286 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[(2) - (2)].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -6765,8 +6767,8 @@
   ;}
     break;
 
-  case 337:
-#line 3295 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 338:
+#line 3302 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -6878,32 +6880,32 @@
   ;}
     break;
 
-  case 338:
-#line 3404 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 339:
+#line 3411 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[(1) - (1)].InstVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 339:
-#line 3409 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 340:
+#line 3416 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 340:
-#line 3413 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 341:
+#line 3420 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 341:
-#line 3420 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 342:
+#line 3427 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6913,8 +6915,8 @@
   ;}
     break;
 
-  case 342:
-#line 3427 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 343:
+#line 3434 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6927,8 +6929,8 @@
   ;}
     break;
 
-  case 343:
-#line 3437 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 344:
+#line 3444 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (3)].TypeVal))->getDescription());
@@ -6938,8 +6940,8 @@
   ;}
     break;
 
-  case 344:
-#line 3444 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 345:
+#line 3451 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (6)].TypeVal))->getDescription());
@@ -6952,8 +6954,8 @@
   ;}
     break;
 
-  case 345:
-#line 3454 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 346:
+#line 3461 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[(2) - (2)].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " +
@@ -6963,8 +6965,8 @@
   ;}
     break;
 
-  case 346:
-#line 3462 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 347:
+#line 3469 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(3) - (5)].TypeVal))->getDescription());
@@ -6981,8 +6983,8 @@
   ;}
     break;
 
-  case 347:
-#line 3476 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 348:
+#line 3483 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(5) - (7)].TypeVal))->getDescription());
@@ -7002,8 +7004,8 @@
   ;}
     break;
 
-  case 348:
-#line 3493 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 349:
+#line 3500 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (5)].TypeVal))->getDescription());
@@ -7020,8 +7022,8 @@
   ;}
     break;
 
-  case 349:
-#line 3507 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 350:
+#line 3514 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -7039,8 +7041,8 @@
   ;}
     break;
 
-  case 350:
-#line 3522 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 351:
+#line 3529 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (4)].TypeVal))->getDescription());
@@ -7058,8 +7060,8 @@
   ;}
     break;
 
-  case 351:
-#line 3537 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+  case 352:
+#line 3544 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[(2) - (7)].TypeVal))->getDescription());
@@ -7081,7 +7083,7 @@
 
 
 /* Line 1267 of yacc.c.  */
-#line 7085 "llvmAsmParser.tab.c"
+#line 7087 "llvmAsmParser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -7295,7 +7297,7 @@
 }
 
 
-#line 3556 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
+#line 3563 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs?rev=61241&r1=61240&r2=61241&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.h.cvs Fri Dec 19 03:41:54 2008
@@ -184,8 +184,8 @@
      SRET = 400,
      NOUNWIND = 401,
      NOALIAS = 402,
-     BYVAL = 403,
-     NEST = 404,
+     NOCAPTURE = 403,
+     BYVAL = 404,
      READNONE = 405,
      READONLY = 406,
      GC = 407,
@@ -194,9 +194,10 @@
      ALWAYSINLINE = 410,
      SSP = 411,
      SSPREQ = 412,
-     DEFAULT = 413,
-     HIDDEN = 414,
-     PROTECTED = 415
+     NEST = 413,
+     DEFAULT = 414,
+     HIDDEN = 415,
+     PROTECTED = 416
    };
 #endif
 /* Tokens.  */
@@ -345,8 +346,8 @@
 #define SRET 400
 #define NOUNWIND 401
 #define NOALIAS 402
-#define BYVAL 403
-#define NEST 404
+#define NOCAPTURE 403
+#define BYVAL 404
 #define READNONE 405
 #define READONLY 406
 #define GC 407
@@ -355,16 +356,17 @@
 #define ALWAYSINLINE 410
 #define SSP 411
 #define SSPREQ 412
-#define DEFAULT 413
-#define HIDDEN 414
-#define PROTECTED 415
+#define NEST 413
+#define DEFAULT 414
+#define HIDDEN 415
+#define PROTECTED 416
 
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 986 "/Volumes/Gir/devel/llvm/llvm.src/lib/AsmParser/llvmAsmParser.y"
+#line 986 "/home/nicholas/llvm-commit/lib/AsmParser/llvmAsmParser.y"
 {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -412,8 +414,8 @@
   llvm::ICmpInst::Predicate         IPredicate;
   llvm::FCmpInst::Predicate         FPredicate;
 }
-/* Line 1529 of yacc.c.  */
-#line 417 "llvmAsmParser.tab.h"
+/* Line 1489 of yacc.c.  */
+#line 419 "llvmAsmParser.tab.h"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

Modified: llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs?rev=61241&r1=61240&r2=61241&view=diff

==============================================================================
--- llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs (original)
+++ llvm/trunk/lib/AsmParser/llvmAsmParser.y.cvs Fri Dec 19 03:41:54 2008
@@ -1136,8 +1136,8 @@
 %token <OtherOpVal> EXTRACTVALUE INSERTVALUE
 
 // Function Attributes
-%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS BYVAL NEST
-%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ
+%token SIGNEXT ZEROEXT NORETURN INREG SRET NOUNWIND NOALIAS NOCAPTURE BYVAL
+%token READNONE READONLY GC OPTSIZE NOINLINE ALWAYSINLINE SSP SSPREQ NEST
 
 // Visibility Styles
 %token DEFAULT HIDDEN PROTECTED
@@ -1265,15 +1265,16 @@
                   CHECK_FOR_ERROR
                  };
 
-Attribute     : ZEROEXT { $$ = Attribute::ZExt;      }
-              | ZEXT    { $$ = Attribute::ZExt;      }
-              | SIGNEXT { $$ = Attribute::SExt;      }
-              | SEXT    { $$ = Attribute::SExt;      }
-              | INREG   { $$ = Attribute::InReg;     }
-              | SRET    { $$ = Attribute::StructRet; }
-              | NOALIAS { $$ = Attribute::NoAlias;   }
-              | BYVAL   { $$ = Attribute::ByVal;     }
-              | NEST    { $$ = Attribute::Nest;      }
+Attribute     : ZEROEXT   { $$ = Attribute::ZExt;      }
+              | ZEXT      { $$ = Attribute::ZExt;      }
+              | SIGNEXT   { $$ = Attribute::SExt;      }
+              | SEXT      { $$ = Attribute::SExt;      }
+              | INREG     { $$ = Attribute::InReg;     }
+              | SRET      { $$ = Attribute::StructRet; }
+              | NOALIAS   { $$ = Attribute::NoAlias;   }
+              | NOCAPTURE { $$ = Attribute::NoCapture; }
+              | BYVAL     { $$ = Attribute::ByVal;     }
+              | NEST      { $$ = Attribute::Nest;      }
               | ALIGN EUINT64VAL { $$ =
                           Attribute::constructAlignmentFromInt($2);    }
               ;
@@ -1284,9 +1285,10 @@
               }
               ;
 
-RetAttr       : INREG    { $$ = Attribute::InReg;     }
+RetAttr       : INREG    { $$ = Attribute::InReg;    }
               | ZEROEXT  { $$ = Attribute::ZExt;     }
               | SIGNEXT  { $$ = Attribute::SExt;     }
+              | NOALIAS  { $$ = Attribute::NoAlias;  }
               ;
 
 OptRetAttrs  : /* empty */ { $$ = Attribute::None; }
@@ -1330,6 +1332,8 @@
   $$ = $2;
   if ($$ != 0 && !isPowerOf2_32($$))
     GEN_ERROR("Alignment must be a power of two");
+  if ($$ > 0x40000000)
+    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 };
 OptCAlign : /*empty*/            { $$ = 0; } |
@@ -1337,6 +1341,8 @@
   $$ = $3;
   if ($$ != 0 && !isPowerOf2_32($$))
     GEN_ERROR("Alignment must be a power of two");
+  if ($$ > 0x40000000)
+    GEN_ERROR("Alignment too large");
   CHECK_FOR_ERROR
 };
 
@@ -1366,6 +1372,8 @@
   | ALIGN EUINT64VAL {
     if ($2 != 0 && !isPowerOf2_32($2))
       GEN_ERROR("Alignment must be a power of two");
+    if ($2 > 0x40000000)
+      GEN_ERROR("Alignment too large");
     CurGV->setAlignment($2);
     CHECK_FOR_ERROR
   };




From rafael.espindola at gmail.com  Fri Dec 19 04:56:27 2008
From: rafael.espindola at gmail.com (Rafael Espindola)
Date: Fri, 19 Dec 2008 10:56:27 -0000
Subject: [llvm-commits] [llvm] r61242 - in /llvm/trunk:
 include/llvm/Target/TargetAsmInfo.h lib/CodeGen/AsmPrinter/AsmPrinter.cpp
 lib/CodeGen/AsmPrinter/DwarfWriter.cpp lib/Target/PowerPC/PPCSubtarget.h
 lib/Target/PowerPC/PPCTargetAsmInfo.cpp
 lib/Target/PowerPC/PPCTargetAsmInfo.h lib/Target/X86/X86TargetAsmInfo.cpp
 lib/Target/X86/X86TargetAsmInfo.h test/CodeGen/PowerPC/20081212.ll
 test/CodeGen/X86/20081212.ll
Message-ID: <200812191056.mBJAukXv011395@zion.cs.uiuc.edu>

Author: rafael
Date: Fri Dec 19 04:55:56 2008
New Revision: 61242

URL: http://llvm.org/viewvc/llvm-project?rev=61242&view=rev
Log:
Fix bug 3202.
The EH_frame and .eh symbols are now private, except for darwin9 and earlier.
The patch also fixes the definition of PrivateGlobalPrefix on pcc linux.


Added:
    llvm/trunk/test/CodeGen/PowerPC/20081212.ll
    llvm/trunk/test/CodeGen/X86/20081212.ll
Modified:
    llvm/trunk/include/llvm/Target/TargetAsmInfo.h
    llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
    llvm/trunk/lib/Target/PowerPC/PPCSubtarget.h
    llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
    llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h

Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=61242&r1=61241&r2=61242&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Fri Dec 19 04:55:56 2008
@@ -646,6 +646,12 @@
     const char *getPrivateGlobalPrefix() const {
       return PrivateGlobalPrefix;
     }
+    /// EHGlobalPrefix - Prefix for EH_frame and the .eh symbols.
+    /// This is normally PrivateGlobalPrefix, but some targets want
+    /// these symbols to be visible.
+    virtual const char *getEHGlobalPrefix() const {
+      return PrivateGlobalPrefix;
+    }
     const char *getLessPrivateGlobalPrefix() const {
       return LessPrivateGlobalPrefix;
     }

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=61242&r1=61241&r2=61242&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Fri Dec 19 04:55:56 2008
@@ -239,7 +239,8 @@
   std::string Name = MF->getFunction()->getName();
   if (Name.empty())
     Name = Mang->getValueName(MF->getFunction());
-  return Mang->makeNameProper(Name + ".eh", TAI->getGlobalPrefix());
+  return Mang->makeNameProper(TAI->getEHGlobalPrefix() +
+                              Name + ".eh", TAI->getGlobalPrefix());
 }
 
 void AsmPrinter::SetupMachineFunction(MachineFunction &MF) {

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp?rev=61242&r1=61241&r2=61242&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfWriter.cpp Fri Dec 19 04:55:56 2008
@@ -2962,7 +2962,7 @@
 
     // Begin eh frame section.
     Asm->SwitchToTextSection(TAI->getDwarfEHFrameSection());
-    O << "EH_frame" << Index << ":\n";
+    O << TAI->getEHGlobalPrefix() << "EH_frame" << Index << ":\n";
     EmitLabel("section_eh_frame", Index);
 
     // Define base labels.

Modified: llvm/trunk/lib/Target/PowerPC/PPCSubtarget.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCSubtarget.h?rev=61242&r1=61241&r2=61242&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCSubtarget.h (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCSubtarget.h Fri Dec 19 04:55:56 2008
@@ -141,6 +141,9 @@
   /// isDarwin - True if this is darwin9 (leopard, 10.5) or above.
   bool isDarwin9() const { return DarwinVers >= 9; }
 
+  /// getDarwinVers - Return the darwin version number, 8 = tiger, 9 = leopard.
+  unsigned getDarwinVers() const { return DarwinVers; }
+
   bool isMachoABI() const { return isDarwin() || IsPPC64; }
   bool isELF32_ABI() const { return !isDarwin() && !IsPPC64; }
 

Modified: llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp?rev=61242&r1=61241&r2=61242&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp Fri Dec 19 04:55:56 2008
@@ -89,12 +89,21 @@
     return DW_EH_PE_absptr;
 }
 
+const char *
+PPCDarwinTargetAsmInfo::getEHGlobalPrefix() const
+{
+  const PPCSubtarget* Subtarget = &TM.getSubtarget<PPCSubtarget>();
+  if (Subtarget->getDarwinVers() > 9)
+    return PrivateGlobalPrefix;
+  else
+    return "";
+}
 
 PPCLinuxTargetAsmInfo::PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM) :
   PPCTargetAsmInfo<ELFTargetAsmInfo>(TM) {
   CommentString = "#";
   GlobalPrefix = "";
-  PrivateGlobalPrefix = "";
+  PrivateGlobalPrefix = ".L";
   ConstantPoolSection = "\t.section .rodata.cst4\t";
   JumpTableDataSection = ".section .rodata.cst4";
   CStringSection = ".rodata.str";

Modified: llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h?rev=61242&r1=61241&r2=61242&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h Fri Dec 19 04:55:56 2008
@@ -48,6 +48,7 @@
     explicit PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
+    virtual const char *getEHGlobalPrefix() const;
   };
 
   struct PPCLinuxTargetAsmInfo : public PPCTargetAsmInfo<ELFTargetAsmInfo> {

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=61242&r1=61241&r2=61242&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Fri Dec 19 04:55:56 2008
@@ -138,6 +138,16 @@
     return DW_EH_PE_absptr;
 }
 
+const char *
+X86DarwinTargetAsmInfo::getEHGlobalPrefix() const
+{
+  const X86Subtarget* Subtarget = &TM.getSubtarget<X86Subtarget>();
+  if (Subtarget->getDarwinVers() > 9)
+    return PrivateGlobalPrefix;
+  else
+    return "";
+}
+
 X86ELFTargetAsmInfo::X86ELFTargetAsmInfo(const X86TargetMachine &TM):
   X86TargetAsmInfo<ELFTargetAsmInfo>(TM) {
 

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h?rev=61242&r1=61241&r2=61242&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h Fri Dec 19 04:55:56 2008
@@ -48,6 +48,7 @@
     explicit X86DarwinTargetAsmInfo(const X86TargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
+    virtual const char *getEHGlobalPrefix() const;
   };
 
   struct X86ELFTargetAsmInfo : public X86TargetAsmInfo<ELFTargetAsmInfo> {
@@ -72,4 +73,3 @@
 } // namespace llvm
 
 #endif
-

Added: llvm/trunk/test/CodeGen/PowerPC/20081212.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/20081212.ll?rev=61242&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/20081212.ll (added)
+++ llvm/trunk/test/CodeGen/PowerPC/20081212.ll Fri Dec 19 04:55:56 2008
@@ -0,0 +1,10 @@
+; RUN: llvm-as < %s | llc -march=ppc32 -mtriple=powerpc-unknown-linux-gnu | grep ^.L_Z1fv.eh
+; RUN: llvm-as < %s | llc  -march=ppc32 -mtriple=powerpc-apple-darwin9 | grep ^__Z1fv.eh
+
+define void @_Z1fv() {
+entry:
+	br label %return
+
+return:
+	ret void
+}

Added: llvm/trunk/test/CodeGen/X86/20081212.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/20081212.ll?rev=61242&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/20081212.ll (added)
+++ llvm/trunk/test/CodeGen/X86/20081212.ll Fri Dec 19 04:55:56 2008
@@ -0,0 +1,12 @@
+; RUN: llvm-as < %s | llc -march=x86-64 -mtriple=x86_64-unknown-linux-gnu | grep ^.L_Z1fv.eh
+; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-unknown-linux-gnu | grep ^.L_Z1fv.eh
+; RUN: llvm-as < %s | llc -march=x86-64 -mtriple=-mtriple=x86_64-apple-darwin9 | grep ^__Z1fv.eh
+; RUN: llvm-as < %s | llc -march=x86 -mtriple=-mtriple=i386-apple-darwin9 | grep ^__Z1fv.eh
+
+define void @_Z1fv() {
+entry:
+	br label %return
+
+return:
+	ret void
+}




From espindola at google.com  Fri Dec 19 06:41:02 2008
From: espindola at google.com (Rafael Espindola)
Date: Fri, 19 Dec 2008 12:41:02 +0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61207 -
	/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
In-Reply-To: <200812181918.mBIJIMmK006291@zion.cs.uiuc.edu>
References: <200812181918.mBIJIMmK006291@zion.cs.uiuc.edu>
Message-ID: <38a0d8450812190441r6d4c4ae3u2014b536ab7535ac@mail.gmail.com>

This broke llvm-gcc bootstrap (see bug 3236).

2008/12/18 Devang Patel <dpatel at apple.com>:
> Author: dpatel
> Date: Thu Dec 18 13:18:20 2008
> New Revision: 61207
>
> URL: http://llvm.org/viewvc/llvm-project?rev=61207&view=rev
> Log:
>
> Reuse DIType slot used for foward declaration for real definition.
>
> Modified:
>    llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
>
> Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=61207&r1=61206&r2=61207&view=diff
>
> ==============================================================================
> --- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original)
> +++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Thu Dec 18 13:18:20 2008
> @@ -325,8 +325,14 @@
>
>   // Check to see if the compile unit already has created this type.
>   DIType &Slot = TypeCache[type];
> -  if (!Slot.isNull())
> -    return Slot;
> +  bool SlotIsFwdDecl = false;
> +  if (!Slot.isNull()) {
> +    if (Slot.getFlags() == DW_AT_declaration
> +        && TYPE_SIZE(type) != 0)
> +      SlotIsFwdDecl = true;
> +    if (!SlotIsFwdDecl)
> +      return Slot;
> +  }
>
>   DIType MainTy;
>   if (type != TYPE_MAIN_VARIANT(type))
> @@ -528,15 +534,17 @@
>       unsigned Tag = TREE_CODE(type) == RECORD_TYPE ? DW_TAG_structure_type :
>                                                       DW_TAG_union_type;
>
> -      // Records and classes and unions can all be recursive.  To handle them, we
> -      // first generate a debug descriptor for the struct as a forward declaration.
> -      // Then (if it is a definition) we go through and get debug info for all of
> -      // its members.  Finally, we create a descriptor for the complete type (which
> -      // may refer to the forward decl if the struct is recursive) and replace all
> -      // uses of the forward declaration with the final definition.
> +      // Records and classes and unions can all be recursive.  To handle them,
> +      // we first generate a debug descriptor for the struct as a forward
> +      // declaration. Then (if it is a definition) we go through and get debug
> +      // info for all of its members.  Finally, we create a descriptor for the
> +      // complete type (which may refer to the forward decl if the struct is
> +      // recursive) and replace all  uses of the forward declaration with the
> +      // final definition.
>       expanded_location Loc = GetNodeLocation(type, false);
> -      llvm::DIType FwdDecl =
> -        DebugFactory.CreateCompositeType(Tag, Unit, TypeName, Unit, Loc.line, 0, 0, 0, 0,
> +      llvm::DIType FwdDecl = SlotIsFwdDecl ? Slot :
> +        DebugFactory.CreateCompositeType(Tag, Unit, TypeName, Unit, Loc.line,
> +                                         0, 0, 0, DW_AT_declaration,
>                                          llvm::DIType(), llvm::DIArray());
>
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>



-- 
Rafael Avila de Espindola

Google | Gordon House | Barrow Street | Dublin 4 | Ireland
Registered in Dublin, Ireland | Registration Number: 368047


From rafael.espindola at gmail.com  Fri Dec 19 10:16:18 2008
From: rafael.espindola at gmail.com (Rafael Espindola)
Date: Fri, 19 Dec 2008 16:16:18 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61243 -
	/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
Message-ID: <200812191616.mBJGGJUp025342@zion.cs.uiuc.edu>

Author: rafael
Date: Fri Dec 19 10:16:06 2008
New Revision: 61243

URL: http://llvm.org/viewvc/llvm-project?rev=61243&view=rev
Log:
Revert revision 61207.
Fixes bug 3236.


Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp?rev=61243&r1=61242&r2=61243&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-debug.cpp Fri Dec 19 10:16:06 2008
@@ -325,14 +325,8 @@
   
   // Check to see if the compile unit already has created this type.
   DIType &Slot = TypeCache[type];
-  bool SlotIsFwdDecl = false;
-  if (!Slot.isNull()) {
-    if (Slot.getFlags() == DW_AT_declaration
-        && TYPE_SIZE(type) != 0)
-      SlotIsFwdDecl = true;
-    if (!SlotIsFwdDecl)
-      return Slot;
-  }
+  if (!Slot.isNull())
+    return Slot;
   
   DIType MainTy;
   if (type != TYPE_MAIN_VARIANT(type))
@@ -551,7 +545,7 @@
       expanded_location Loc = GetNodeLocation(TREE_CHAIN(type), false);
       std::string Filename, Directory;
       DirectoryAndFile(Loc.file, Directory, Filename);
-      llvm::DIType FwdDecl = SlotIsFwdDecl ? Slot :
+      llvm::DIType FwdDecl =
         DebugFactory.CreateCompositeType(Tag, Unit, TypeName, Unit, Loc.line, 
                                          0, 0, 0, DW_AT_declaration,
                                          llvm::DIType(), llvm::DIArray(),
@@ -752,4 +746,3 @@
 }
 
 /* LLVM LOCAL end (ENTIRE FILE!)  */
-




From sabre at nondot.org  Fri Dec 19 11:04:10 2008
From: sabre at nondot.org (Chris Lattner)
Date: Fri, 19 Dec 2008 17:04:10 -0000
Subject: [llvm-commits] [llvm] r61244 - in /llvm/trunk/lib:
 CodeGen/MachOWriter.cpp Target/X86/X86FastISel.cpp
Message-ID: <200812191704.mBJH4Mrk027053@zion.cs.uiuc.edu>

Author: lattner
Date: Fri Dec 19 11:03:38 2008
New Revision: 61244

URL: http://llvm.org/viewvc/llvm-project?rev=61244&view=rev
Log:
Fix some release-assert warnings

Modified:
    llvm/trunk/lib/CodeGen/MachOWriter.cpp
    llvm/trunk/lib/Target/X86/X86FastISel.cpp

Modified: llvm/trunk/lib/CodeGen/MachOWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachOWriter.cpp?rev=61244&r1=61243&r2=61244&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/MachOWriter.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachOWriter.cpp Fri Dec 19 11:03:38 2008
@@ -264,8 +264,8 @@
   if (CP.empty()) return;
 
   // FIXME: handle PIC codegen
-  bool isPIC = TM.getRelocationModel() == Reloc::PIC_;
-  assert(!isPIC && "PIC codegen not yet handled for mach-o jump tables!");
+  assert(TM.getRelocationModel() != Reloc::PIC_ &&
+         "PIC codegen not yet handled for mach-o jump tables!");
 
   // Although there is no strict necessity that I am aware of, we will do what
   // gcc for OS X does and put each constant pool entry in a section of constant
@@ -305,8 +305,8 @@
   if (JT.empty()) return;
 
   // FIXME: handle PIC codegen
-  bool isPIC = TM.getRelocationModel() == Reloc::PIC_;
-  assert(!isPIC && "PIC codegen not yet handled for mach-o jump tables!");
+  assert(TM.getRelocationModel() != Reloc::PIC_ &&
+         "PIC codegen not yet handled for mach-o jump tables!");
 
   MachOWriter::MachOSection *Sec = MOW.getJumpTableSection();
   unsigned TextSecIndex = MOW.getTextSection()->Index;

Modified: llvm/trunk/lib/Target/X86/X86FastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FastISel.cpp?rev=61244&r1=61243&r2=61244&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86FastISel.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FastISel.cpp Fri Dec 19 11:03:38 2008
@@ -1219,14 +1219,14 @@
     case CCValAssign::SExt: {
       bool Emitted = X86FastEmitExtend(ISD::SIGN_EXTEND, VA.getLocVT(),
                                        Arg, ArgVT, Arg);
-      assert(Emitted && "Failed to emit a sext!");
+      assert(Emitted && "Failed to emit a sext!"); Emitted=Emitted;
       ArgVT = VA.getLocVT();
       break;
     }
     case CCValAssign::ZExt: {
       bool Emitted = X86FastEmitExtend(ISD::ZERO_EXTEND, VA.getLocVT(),
                                        Arg, ArgVT, Arg);
-      assert(Emitted && "Failed to emit a zext!");
+      assert(Emitted && "Failed to emit a zext!"); Emitted=Emitted;
       ArgVT = VA.getLocVT();
       break;
     }
@@ -1240,7 +1240,7 @@
         Emitted = X86FastEmitExtend(ISD::SIGN_EXTEND, VA.getLocVT(),
                                     Arg, ArgVT, Arg);
       
-      assert(Emitted && "Failed to emit a aext!");
+      assert(Emitted && "Failed to emit a aext!"); Emitted=Emitted;
       ArgVT = VA.getLocVT();
       break;
     }
@@ -1250,7 +1250,7 @@
       TargetRegisterClass* RC = TLI.getRegClassFor(ArgVT);
       bool Emitted = TII.copyRegToReg(*MBB, MBB->end(), VA.getLocReg(),
                                       Arg, RC, RC);
-      assert(Emitted && "Failed to emit a copy instruction!");
+      assert(Emitted && "Failed to emit a copy instruction!"); Emitted=Emitted;
       RegArgs.push_back(VA.getLocReg());
     } else {
       unsigned LocMemOffset = VA.getLocMemOffset();
@@ -1277,7 +1277,7 @@
     TargetRegisterClass *RC = X86::GR32RegisterClass;
     unsigned Base = getInstrInfo()->getGlobalBaseReg(&MF);
     bool Emitted = TII.copyRegToReg(*MBB, MBB->end(), X86::EBX, Base, RC, RC);
-    assert(Emitted && "Failed to emit a copy instruction!");
+    assert(Emitted && "Failed to emit a copy instruction!"); Emitted=Emitted;
   }
 
   // Issue the call.
@@ -1328,7 +1328,7 @@
     unsigned ResultReg = createResultReg(DstRC);
     bool Emitted = TII.copyRegToReg(*MBB, MBB->end(), ResultReg,
                                     RVLocs[0].getLocReg(), DstRC, SrcRC);
-    assert(Emitted && "Failed to emit a copy instruction!");
+    assert(Emitted && "Failed to emit a copy instruction!"); Emitted=Emitted;
     if (CopyVT != RVLocs[0].getValVT()) {
       // Round the F80 the right size, which also moves to the appropriate xmm
       // register. This is accomplished by storing the F80 value in memory and




From gohman at apple.com  Fri Dec 19 11:07:42 2008
From: gohman at apple.com (Dan Gohman)
Date: Fri, 19 Dec 2008 09:07:42 -0800
Subject: [llvm-commits] Patch to safely restore optimization to
	testcase	from PR3225 on x86
In-Reply-To: <200812190649.53303.baldrick@free.fr>
References: <f5aa3e9b0812162140v6d2db1e7m8a542866af36ab87@mail.gmail.com>
	<C5BFCA77-FA65-4A43-B527-3491CFDD148D@apple.com>
	<200812190649.53303.baldrick@free.fr>
Message-ID: <FF02AE04-89AD-403D-A9B2-B06634810CC5@apple.com>


On Dec 18, 2008, at 9:49 PM, Duncan Sands wrote:

> On Friday 19 December 2008 02:31:13 Dan Gohman wrote:
>>> +  if (KnownZero == VTBits) {
>>
>> If the shift count is known to be all-zero, shouldn't it
>> have been simplified already by pre-legalize DAGCombine,
>> if not InstCombine?
>
> What if it was introduced by LegalizeTypes itself?

It turns out I had misread the code.  But even if it had been this
way, we now run DAGCombine between LegalizeTypes and
LegalizeOps(?) so it should still catch this :-).

Dan



From gohman at apple.com  Fri Dec 19 11:28:18 2008
From: gohman at apple.com (Dan Gohman)
Date: Fri, 19 Dec 2008 09:28:18 -0800
Subject: [llvm-commits] Patch to safely restore optimization to testcase
	from PR3225 on x86
In-Reply-To: <f5aa3e9b0812182342m635fd228j63658d0fc1722877@mail.gmail.com>
References: <f5aa3e9b0812162140v6d2db1e7m8a542866af36ab87@mail.gmail.com>
	<C5BFCA77-FA65-4A43-B527-3491CFDD148D@apple.com>
	<f5aa3e9b0812182342m635fd228j63658d0fc1722877@mail.gmail.com>
Message-ID: <A87775A2-11C1-497B-A343-F6D29EFE5221@apple.com>


On Dec 18, 2008, at 11:42 PM, Eli Friedman wrote:

> On Thu, Dec 18, 2008 at 5:31 PM, Dan Gohman <gohman at apple.com> wrote:
>>> +  if (KnownZero == VTBits) {
>>
>> If the shift count is known to be all-zero, shouldn't it
>> have been simplified already by pre-legalize DAGCombine,
>> if not InstCombine?
>
> The masked bits check is only checking the top bit, i.e. whether the
> shift amount is < 32 or >= 32.

Thanks, I misread that.  The patch looks ok to me, assuming you can
add a testcase to go along with it :-).  Thanks!

Dan



From baldrick at free.fr  Fri Dec 19 11:31:23 2008
From: baldrick at free.fr (Duncan Sands)
Date: Fri, 19 Dec 2008 18:31:23 +0100
Subject: [llvm-commits]
 =?iso-8859-1?q?Patch_to_safely_restore_optimizatio?=
 =?iso-8859-1?q?n_to_testcase=09from_PR3225_on_x86?=
In-Reply-To: <FF02AE04-89AD-403D-A9B2-B06634810CC5@apple.com>
References: <f5aa3e9b0812162140v6d2db1e7m8a542866af36ab87@mail.gmail.com>
	<200812190649.53303.baldrick@free.fr>
	<FF02AE04-89AD-403D-A9B2-B06634810CC5@apple.com>
Message-ID: <200812191831.23800.baldrick@free.fr>

On Friday 19 December 2008 18:07:42 Dan Gohman wrote:
> 
> On Dec 18, 2008, at 9:49 PM, Duncan Sands wrote:
> 
> > On Friday 19 December 2008 02:31:13 Dan Gohman wrote:
> >>> +  if (KnownZero == VTBits) {
> >>
> >> If the shift count is known to be all-zero, shouldn't it
> >> have been simplified already by pre-legalize DAGCombine,
> >> if not InstCombine?
> >
> > What if it was introduced by LegalizeTypes itself?
> 
> It turns out I had misread the code.  But even if it had been this
> way, we now run DAGCombine between LegalizeTypes and
> LegalizeOps(?) so it should still catch this :-).

IIRC the above (KnownZero == VTBits) is in LegalizeTypes, so might
fire on nodes created by LegalizeTypes itself.  In any case, since
you seem happy now I am happy too :)

Ciao,

Duncan.


From evan.cheng at apple.com  Fri Dec 19 12:03:22 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Fri, 19 Dec 2008 18:03:22 -0000
Subject: [llvm-commits] [llvm] r61248 - in /llvm/trunk:
 lib/Transforms/Scalar/CodeGenPrepare.cpp
 test/CodeGen/X86/critical-edge-split.ll test/CodeGen/X86/remat-mov0.ll
Message-ID: <200812191803.mBJI3Q6l028812@zion.cs.uiuc.edu>

Author: evancheng
Date: Fri Dec 19 12:03:11 2008
New Revision: 61248

URL: http://llvm.org/viewvc/llvm-project?rev=61248&view=rev
Log:
- CodeGenPrepare does not split loop back edges but it only knows about back edges of single block loops. It now does a DFS walk to find loop back edges.
- Use SplitBlockPredecessors to factor out common predecessors of the critical edge destination. This is disabled for now due to some regressions.

Added:
    llvm/trunk/test/CodeGen/X86/critical-edge-split.ll
Modified:
    llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp
    llvm/trunk/test/CodeGen/X86/remat-mov0.ll

Modified: llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp?rev=61248&r1=61247&r2=61248&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp Fri Dec 19 12:03:11 2008
@@ -30,6 +30,7 @@
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/ADT/SmallSet.h"
 #include "llvm/Support/CallSite.h"
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Compiler.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
@@ -37,11 +38,18 @@
 using namespace llvm;
 using namespace llvm::PatternMatch;
 
+static cl::opt<bool> FactorCommonPreds("split-critical-paths-tweak",
+                                       cl::init(false), cl::Hidden);
+
 namespace {
   class VISIBILITY_HIDDEN CodeGenPrepare : public FunctionPass {
     /// TLI - Keep a pointer of a TargetLowering to consult for determining
     /// transformation profitability.
     const TargetLowering *TLI;
+
+    /// BackEdges - Keep a set of all the loop back edges.
+    ///
+    SmallSet<std::pair<BasicBlock*,BasicBlock*>, 8> BackEdges;
   public:
     static char ID; // Pass identification, replacement for typeid
     explicit CodeGenPrepare(const TargetLowering *tli = 0)
@@ -58,6 +66,7 @@
     bool OptimizeInlineAsmInst(Instruction *I, CallSite CS,
                                DenseMap<Value*,Value*> &SunkAddrs);
     bool OptimizeExtUses(Instruction *I);
+    void findLoopBackEdges(Function &F);
   };
 }
 
@@ -69,10 +78,55 @@
   return new CodeGenPrepare(TLI);
 }
 
+/// findLoopBackEdges - Do a DFS walk to find loop back edges.
+///
+void CodeGenPrepare::findLoopBackEdges(Function &F) {
+  SmallPtrSet<BasicBlock*, 8> Visited;
+  SmallVector<std::pair<BasicBlock*, succ_iterator>, 8> VisitStack;
+  SmallPtrSet<BasicBlock*, 8> InStack;
+
+  BasicBlock *BB = &F.getEntryBlock();
+  if (succ_begin(BB) == succ_end(BB))
+    return;
+  Visited.insert(BB);
+  VisitStack.push_back(std::make_pair(BB, succ_begin(BB)));
+  InStack.insert(BB);
+  do {
+    std::pair<BasicBlock*, succ_iterator> &Top = VisitStack.back();
+    BasicBlock *ParentBB = Top.first;
+    succ_iterator &I = Top.second;
+
+    bool FoundNew = false;
+    while (I != succ_end(ParentBB)) {
+      BB = *I++;
+      if (Visited.insert(BB)) {
+        FoundNew = true;
+        break;
+      }
+      // Successor is in VisitStack, it's a back edge.
+      if (InStack.count(BB))
+        BackEdges.insert(std::make_pair(ParentBB, BB));
+    }
+
+    if (FoundNew) {
+      // Go down one level if there is a unvisited successor.
+      InStack.insert(BB);
+      VisitStack.push_back(std::make_pair(BB, succ_begin(BB)));
+    } else {
+      // Go up one level.
+      std::pair<BasicBlock*, succ_iterator> &Pop = VisitStack.back();
+      InStack.erase(Pop.first);
+      VisitStack.pop_back();
+    }
+  } while (!VisitStack.empty());
+}
+
 
 bool CodeGenPrepare::runOnFunction(Function &F) {
   bool EverMadeChange = false;
 
+  findLoopBackEdges(F);
+
   // First pass, eliminate blocks that contain only PHI nodes and an
   // unconditional branch.
   EverMadeChange |= EliminateMostlyEmptyBlocks(F);
@@ -262,7 +316,9 @@
 /// phi nodes (otherwise critical edges are ok).  If there is already another
 /// predecessor of the succ that is empty (and thus has no phi nodes), use it
 /// instead of introducing a new block.
-static void SplitEdgeNicely(TerminatorInst *TI, unsigned SuccNum, Pass *P) {
+static void SplitEdgeNicely(TerminatorInst *TI, unsigned SuccNum,
+                     SmallSet<std::pair<BasicBlock*,BasicBlock*>, 8> &BackEdges,
+                             Pass *P) {
   BasicBlock *TIBB = TI->getParent();
   BasicBlock *Dest = TI->getSuccessor(SuccNum);
   assert(isa<PHINode>(Dest->begin()) &&
@@ -271,55 +327,90 @@
   // As a hack, never split backedges of loops.  Even though the copy for any
   // PHIs inserted on the backedge would be dead for exits from the loop, we
   // assume that the cost of *splitting* the backedge would be too high.
-  if (Dest == TIBB)
+  if (BackEdges.count(std::make_pair(TIBB, Dest)))
     return;
 
-  /// TIPHIValues - This array is lazily computed to determine the values of
-  /// PHIs in Dest that TI would provide.
-  SmallVector<Value*, 32> TIPHIValues;
+  if (!FactorCommonPreds) {
+    /// TIPHIValues - This array is lazily computed to determine the values of
+    /// PHIs in Dest that TI would provide.
+    SmallVector<Value*, 32> TIPHIValues;
+
+    // Check to see if Dest has any blocks that can be used as a split edge for
+    // this terminator.
+    for (pred_iterator PI = pred_begin(Dest), E = pred_end(Dest); PI != E; ++PI) {
+      BasicBlock *Pred = *PI;
+      // To be usable, the pred has to end with an uncond branch to the dest.
+      BranchInst *PredBr = dyn_cast<BranchInst>(Pred->getTerminator());
+      if (!PredBr || !PredBr->isUnconditional() ||
+          // Must be empty other than the branch.
+          &Pred->front() != PredBr ||
+          // Cannot be the entry block; its label does not get emitted.
+          Pred == &(Dest->getParent()->getEntryBlock()))
+        continue;
 
-  // Check to see if Dest has any blocks that can be used as a split edge for
-  // this terminator.
-  for (pred_iterator PI = pred_begin(Dest), E = pred_end(Dest); PI != E; ++PI) {
-    BasicBlock *Pred = *PI;
-    // To be usable, the pred has to end with an uncond branch to the dest.
-    BranchInst *PredBr = dyn_cast<BranchInst>(Pred->getTerminator());
-    if (!PredBr || !PredBr->isUnconditional() ||
-        // Must be empty other than the branch.
-        &Pred->front() != PredBr ||
-        // Cannot be the entry block; its label does not get emitted.
-        Pred == &(Dest->getParent()->getEntryBlock()))
-      continue;
+      // Finally, since we know that Dest has phi nodes in it, we have to make
+      // sure that jumping to Pred will have the same affect as going to Dest in
+      // terms of PHI values.
+      PHINode *PN;
+      unsigned PHINo = 0;
+      bool FoundMatch = true;
+      for (BasicBlock::iterator I = Dest->begin();
+           (PN = dyn_cast<PHINode>(I)); ++I, ++PHINo) {
+        if (PHINo == TIPHIValues.size())
+          TIPHIValues.push_back(PN->getIncomingValueForBlock(TIBB));
+
+        // If the PHI entry doesn't work, we can't use this pred.
+        if (TIPHIValues[PHINo] != PN->getIncomingValueForBlock(Pred)) {
+          FoundMatch = false;
+          break;
+        }
+      }
 
-    // Finally, since we know that Dest has phi nodes in it, we have to make
-    // sure that jumping to Pred will have the same affect as going to Dest in
-    // terms of PHI values.
-    PHINode *PN;
-    unsigned PHINo = 0;
-    bool FoundMatch = true;
-    for (BasicBlock::iterator I = Dest->begin();
-         (PN = dyn_cast<PHINode>(I)); ++I, ++PHINo) {
-      if (PHINo == TIPHIValues.size())
-        TIPHIValues.push_back(PN->getIncomingValueForBlock(TIBB));
-
-      // If the PHI entry doesn't work, we can't use this pred.
-      if (TIPHIValues[PHINo] != PN->getIncomingValueForBlock(Pred)) {
-        FoundMatch = false;
-        break;
+      // If we found a workable predecessor, change TI to branch to Succ.
+      if (FoundMatch) {
+        Dest->removePredecessor(TIBB);
+        TI->setSuccessor(SuccNum, Pred);
+        return;
       }
     }
 
-    // If we found a workable predecessor, change TI to branch to Succ.
-    if (FoundMatch) {
-      Dest->removePredecessor(TIBB);
-      TI->setSuccessor(SuccNum, Pred);
-      return;
+    SplitCriticalEdge(TI, SuccNum, P, true);
+    return;
+  }
+
+  PHINode *PN;
+  SmallVector<Value*, 8> TIPHIValues;
+  for (BasicBlock::iterator I = Dest->begin();
+       (PN = dyn_cast<PHINode>(I)); ++I)
+    TIPHIValues.push_back(PN->getIncomingValueForBlock(TIBB));
+
+  SmallVector<BasicBlock*, 8> IdenticalPreds;
+  for (pred_iterator PI = pred_begin(Dest), E = pred_end(Dest); PI != E; ++PI) {
+    BasicBlock *Pred = *PI;
+    if (BackEdges.count(std::make_pair(Pred, Dest)))
+      continue;
+    if (PI == TIBB)
+      IdenticalPreds.push_back(Pred);
+    else {
+      bool Identical = true;
+      unsigned PHINo = 0;
+      for (BasicBlock::iterator I = Dest->begin();
+           (PN = dyn_cast<PHINode>(I)); ++I, ++PHINo)
+        if (TIPHIValues[PHINo] != PN->getIncomingValueForBlock(Pred)) {
+          Identical = false;
+          break;
+        }
+      if (Identical)
+        IdenticalPreds.push_back(Pred);
     }
   }
 
-  SplitCriticalEdge(TI, SuccNum, P, true);
+  assert(!IdenticalPreds.empty());
+  SplitBlockPredecessors(Dest, &IdenticalPreds[0], IdenticalPreds.size(),
+                         ".critedge", P);
 }
 
+
 /// OptimizeNoopCopyExpression - If the specified cast instruction is a noop
 /// copy (e.g. it's casting from one pointer type to another, int->uint, or
 /// int->sbyte on PPC), sink it into user blocks to reduce the number of virtual
@@ -1350,17 +1441,16 @@
 bool CodeGenPrepare::OptimizeBlock(BasicBlock &BB) {
   bool MadeChange = false;
 
-  // Split all critical edges where the dest block has a PHI and where the phi
-  // has shared immediate operands.
+  // Split all critical edges where the dest block has a PHI.
   TerminatorInst *BBTI = BB.getTerminator();
   if (BBTI->getNumSuccessors() > 1) {
-    for (unsigned i = 0, e = BBTI->getNumSuccessors(); i != e; ++i)
-      if (isa<PHINode>(BBTI->getSuccessor(i)->begin()) &&
-          isCriticalEdge(BBTI, i, true))
-        SplitEdgeNicely(BBTI, i, this);
+    for (unsigned i = 0, e = BBTI->getNumSuccessors(); i != e; ++i) {
+      BasicBlock *SuccBB = BBTI->getSuccessor(i);
+      if (isa<PHINode>(SuccBB->begin()) && isCriticalEdge(BBTI, i, true))
+        SplitEdgeNicely(BBTI, i, BackEdges, this);
+    }
   }
 
-
   // Keep track of non-local addresses that have been sunk into this block.
   // This allows us to avoid inserting duplicate code for blocks with multiple
   // load/stores of the same address.

Added: llvm/trunk/test/CodeGen/X86/critical-edge-split.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/critical-edge-split.ll?rev=61248&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/critical-edge-split.ll (added)
+++ llvm/trunk/test/CodeGen/X86/critical-edge-split.ll Fri Dec 19 12:03:11 2008
@@ -0,0 +1,50 @@
+; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin -stats -info-output-file - | grep asm-printer | grep 31
+
+	%CC = type { %Register }
+	%II = type { %"struct.XX::II::$_74" }
+	%JITFunction = type %YYValue* (%CC*, %YYValue**)
+	%YYValue = type { i32 (...)** }
+	%Register = type { %"struct.XX::ByteCodeFeatures" }
+	%"struct.XX::ByteCodeFeatures" = type { i32 }
+	%"struct.XX::II::$_74" = type { i8* }
+ at llvm.used = appending global [1 x i8*] [ i8* bitcast (%JITFunction* @loop to i8*) ], section "llvm.metadata"		; <[1 x i8*]*> [#uses=0]
+
+define %YYValue* @loop(%CC*, %YYValue**) nounwind {
+; <label>:2
+	%3 = getelementptr %CC* %0, i32 -9		; <%CC*> [#uses=1]
+	%4 = bitcast %CC* %3 to %YYValue**		; <%YYValue**> [#uses=2]
+	%5 = load %YYValue** %4		; <%YYValue*> [#uses=3]
+	%unique_1.i = ptrtoint %YYValue* %5 to i1		; <i1> [#uses=1]
+	br i1 %unique_1.i, label %loop, label %11
+
+loop:		; preds = %6, %2
+	%.1 = phi %YYValue* [ inttoptr (i32 1 to %YYValue*), %2 ], [ %intAddValue, %6 ]		; <%YYValue*> [#uses=3]
+	%immediateCmp = icmp slt %YYValue* %.1, %5		; <i1> [#uses=1]
+	br i1 %immediateCmp, label %6, label %8
+
+; <label>:6		; preds = %loop
+	%lhsInt = ptrtoint %YYValue* %.1 to i32		; <i32> [#uses=1]
+	%7 = call { i32, i1 } @llvm.sadd.with.overflow.i32(i32 %lhsInt, i32 2)		; <{ i32, i1 }> [#uses=2]
+	%intAdd = extractvalue { i32, i1 } %7, 0		; <i32> [#uses=1]
+	%intAddValue = inttoptr i32 %intAdd to %YYValue*		; <%YYValue*> [#uses=1]
+	%intAddOverflow = extractvalue { i32, i1 } %7, 1		; <i1> [#uses=1]
+	br i1 %intAddOverflow, label %.loopexit, label %loop
+
+; <label>:8		; preds = %loop
+	ret %YYValue* inttoptr (i32 10 to %YYValue*)
+
+.loopexit:		; preds = %6
+	%9 = bitcast %CC* %0 to %YYValue**		; <%YYValue**> [#uses=1]
+	store %YYValue* %.1, %YYValue** %9
+	store %YYValue* %5, %YYValue** %4
+	%10 = call fastcc %YYValue* @foobar(%II* inttoptr (i32 3431104 to %II*), %CC* %0, %YYValue** %1)		; <%YYValue*> [#uses=1]
+	ret %YYValue* %10
+
+; <label>:11		; preds = %2
+	%12 = call fastcc %YYValue* @foobar(%II* inttoptr (i32 3431080 to %II*), %CC* %0, %YYValue** %1)		; <%YYValue*> [#uses=1]
+	ret %YYValue* %12
+}
+
+declare fastcc %YYValue* @foobar(%II*, %CC*, %YYValue**) nounwind
+
+declare { i32, i1 } @llvm.sadd.with.overflow.i32(i32, i32) nounwind

Modified: llvm/trunk/test/CodeGen/X86/remat-mov0.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/remat-mov0.ll?rev=61248&r1=61247&r2=61248&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/X86/remat-mov0.ll (original)
+++ llvm/trunk/test/CodeGen/X86/remat-mov0.ll Fri Dec 19 12:03:11 2008
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 | grep xor | count 2
+; RUN: llvm-as < %s | llc -march=x86 | grep xor | count 1
 
 	%struct.FILE = type { i8*, i32, i32, i16, i16, %struct.__sbuf, i32, i8*, i32 (i8*)*, i32 (i8*, i8*, i32)*, i64 (i8*, i64, i32)*, i32 (i8*, i8*, i32)*, %struct.__sbuf, %struct.__sFILEX*, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64 }
 	%struct.ImgT = type { i8, i8*, i8*, %struct.FILE*, i32, i32, i32, i32, i8*, double*, float*, float*, float*, i32*, double, double, i32*, double*, i32*, i32* }




From gohman at apple.com  Fri Dec 19 12:13:48 2008
From: gohman at apple.com (Dan Gohman)
Date: Fri, 19 Dec 2008 18:13:48 -0000
Subject: [llvm-commits] [llvm] r61249 -
	/llvm/trunk/utils/TableGen/DAGISelEmitter.cpp
Message-ID: <200812191813.mBJIDnC9029105@zion.cs.uiuc.edu>

Author: djg
Date: Fri Dec 19 12:13:39 2008
New Revision: 61249

URL: http://llvm.org/viewvc/llvm-project?rev=61249&view=rev
Log:
Use dyn_cast intead of isa + cast in the generated DAGISel code. This
reduces the amount of code slightly when assertions are enabled.

Modified:
    llvm/trunk/utils/TableGen/DAGISelEmitter.cpp

Modified: llvm/trunk/utils/TableGen/DAGISelEmitter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/TableGen/DAGISelEmitter.cpp?rev=61249&r1=61248&r2=61249&view=diff

==============================================================================
--- llvm/trunk/utils/TableGen/DAGISelEmitter.cpp (original)
+++ llvm/trunk/utils/TableGen/DAGISelEmitter.cpp Fri Dec 19 12:13:39 2008
@@ -583,11 +583,14 @@
           emitInit("SDValue " + RootName + "1" + " = " +
                    RootName + ".getOperand(" + utostr(1) + ");");
 
-          emitCheck("isa<ConstantSDNode>(" + RootName + "1)");
+          unsigned NTmp = TmpNo++;
+          emitCode("ConstantSDNode *Tmp" + utostr(NTmp) +
+                   " = dyn_cast<ConstantSDNode>(" + RootName + "1);");
+          emitCheck("Tmp" + utostr(NTmp));
           const char *MaskPredicate = N->getOperator()->getName() == "or"
             ? "CheckOrMask(" : "CheckAndMask(";
-          emitCheck(MaskPredicate + RootName + "0, cast<ConstantSDNode>(" +
-                    RootName + "1), INT64_C(" + itostr(II->getValue()) + "))");
+          emitCheck(MaskPredicate + RootName + "0, Tmp" + utostr(NTmp) +
+                    ", INT64_C(" + itostr(II->getValue()) + "))");
           
           EmitChildMatchCode(N->getChild(0), N, RootName + utostr(0), RootName,
                              ChainSuffix + utostr(0), FoundChain);
@@ -738,11 +741,14 @@
                     ".getNode())");
       } else if (IntInit *II =
                  dynamic_cast<IntInit*>(Child->getLeafValue())) {
-        emitCheck("isa<ConstantSDNode>(" + RootName + ")");
+        unsigned NTmp = TmpNo++;
+        emitCode("ConstantSDNode *Tmp"+ utostr(NTmp) +
+                 " = dyn_cast<ConstantSDNode>("+
+                 RootName + ");");
+        emitCheck("Tmp" + utostr(NTmp));
         unsigned CTmp = TmpNo++;
-        emitCode("int64_t CN"+utostr(CTmp)+" = cast<ConstantSDNode>("+
-                 RootName + ")->getSExtValue();");
-        
+        emitCode("int64_t CN"+ utostr(CTmp) +
+                 " = Tmp" + utostr(NTmp) + "->getSExtValue();");
         emitCheck("CN" + utostr(CTmp) + " == "
                   "INT64_C(" +itostr(II->getValue()) + ")");
       } else {




From gohman at apple.com  Fri Dec 19 12:25:31 2008
From: gohman at apple.com (Dan Gohman)
Date: Fri, 19 Dec 2008 18:25:31 -0000
Subject: [llvm-commits] [llvm] r61250 -
	/llvm/trunk/lib/Target/X86/X86Instr64bit.td
Message-ID: <200812191825.mBJIPWYT029509@zion.cs.uiuc.edu>

Author: djg
Date: Fri Dec 19 12:25:21 2008
New Revision: 61250

URL: http://llvm.org/viewvc/llvm-project?rev=61250&view=rev
Log:
Move the patterns which have i8 immediates before the patterns
that have i32 immediates so that they get selected first. This
currently only matters in the JIT, as assemblers will
automatically use the smallest encoding.

Modified:
    llvm/trunk/lib/Target/X86/X86Instr64bit.td

Modified: llvm/trunk/lib/Target/X86/X86Instr64bit.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Instr64bit.td?rev=61250&r1=61249&r2=61250&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86Instr64bit.td (original)
+++ llvm/trunk/lib/Target/X86/X86Instr64bit.td Fri Dec 19 12:25:21 2008
@@ -43,6 +43,12 @@
 // Pattern fragments.
 //
 
+def i64immSExt8  : PatLeaf<(i64 imm), [{
+  // i64immSExt8 predicate - True if the 64-bit immediate fits in a 8-bit
+  // sign extended field.
+  return (int64_t)N->getZExtValue() == (int8_t)N->getZExtValue();
+}]>;
+
 def i64immSExt32  : PatLeaf<(i64 imm), [{
   // i64immSExt32 predicate - True if the 64-bit immediate fits in a 32-bit
   // sign extended field.
@@ -55,12 +61,6 @@
   return (uint64_t)N->getZExtValue() == (uint32_t)N->getZExtValue();
 }]>;
 
-def i64immSExt8  : PatLeaf<(i64 imm), [{
-  // i64immSExt8 predicate - True if the 64-bit immediate fits in a 8-bit
-  // sign extended field.
-  return (int64_t)N->getZExtValue() == (int8_t)N->getZExtValue();
-}]>;
-
 def sextloadi64i8  : PatFrag<(ops node:$ptr), (i64 (sextloadi8 node:$ptr))>;
 def sextloadi64i16 : PatFrag<(ops node:$ptr), (i64 (sextloadi16 node:$ptr))>;
 def sextloadi64i32 : PatFrag<(ops node:$ptr), (i64 (sextloadi32 node:$ptr))>;
@@ -319,14 +319,14 @@
                      (implicit EFLAGS)]>;
 
 // Register-Integer Addition
-def ADD64ri32 : RIi32<0x81, MRM0r, (outs GR64:$dst), (ins GR64:$src1, i64i32imm:$src2),
-                      "add{q}\t{$src2, $dst|$dst, $src2}",
-                      [(set GR64:$dst, (add GR64:$src1, i64immSExt32:$src2)),
-                       (implicit EFLAGS)]>;
 def ADD64ri8  : RIi8<0x83, MRM0r, (outs GR64:$dst), (ins GR64:$src1, i64i8imm:$src2),
                      "add{q}\t{$src2, $dst|$dst, $src2}",
                      [(set GR64:$dst, (add GR64:$src1, i64immSExt8:$src2)),
                       (implicit EFLAGS)]>;
+def ADD64ri32 : RIi32<0x81, MRM0r, (outs GR64:$dst), (ins GR64:$src1, i64i32imm:$src2),
+                      "add{q}\t{$src2, $dst|$dst, $src2}",
+                      [(set GR64:$dst, (add GR64:$src1, i64immSExt32:$src2)),
+                       (implicit EFLAGS)]>;
 } // isConvertibleToThreeAddress
 
 // Register-Memory Addition
@@ -341,14 +341,14 @@
                   "add{q}\t{$src2, $dst|$dst, $src2}",
                   [(store (add (load addr:$dst), GR64:$src2), addr:$dst),
                    (implicit EFLAGS)]>;
-def ADD64mi32 : RIi32<0x81, MRM0m, (outs), (ins i64mem:$dst, i64i32imm :$src2),
-                      "add{q}\t{$src2, $dst|$dst, $src2}",
-               [(store (add (load addr:$dst), i64immSExt32:$src2), addr:$dst),
-                (implicit EFLAGS)]>;
 def ADD64mi8 : RIi8<0x83, MRM0m, (outs), (ins i64mem:$dst, i64i8imm :$src2),
                     "add{q}\t{$src2, $dst|$dst, $src2}",
                 [(store (add (load addr:$dst), i64immSExt8:$src2), addr:$dst),
                  (implicit EFLAGS)]>;
+def ADD64mi32 : RIi32<0x81, MRM0m, (outs), (ins i64mem:$dst, i64i32imm :$src2),
+                      "add{q}\t{$src2, $dst|$dst, $src2}",
+               [(store (add (load addr:$dst), i64immSExt32:$src2), addr:$dst),
+                (implicit EFLAGS)]>;
 
 let Uses = [EFLAGS] in {
 let isTwoAddress = 1 in {
@@ -361,23 +361,23 @@
                   "adc{q}\t{$src2, $dst|$dst, $src2}",
                   [(set GR64:$dst, (adde GR64:$src1, (load addr:$src2)))]>;
 
-def ADC64ri32 : RIi32<0x81, MRM2r, (outs GR64:$dst), (ins GR64:$src1, i64i32imm:$src2),
-                      "adc{q}\t{$src2, $dst|$dst, $src2}",
-                      [(set GR64:$dst, (adde GR64:$src1, i64immSExt32:$src2))]>;
 def ADC64ri8 : RIi8<0x83, MRM2r, (outs GR64:$dst), (ins GR64:$src1, i64i8imm:$src2),
                     "adc{q}\t{$src2, $dst|$dst, $src2}",
                     [(set GR64:$dst, (adde GR64:$src1, i64immSExt8:$src2))]>;
+def ADC64ri32 : RIi32<0x81, MRM2r, (outs GR64:$dst), (ins GR64:$src1, i64i32imm:$src2),
+                      "adc{q}\t{$src2, $dst|$dst, $src2}",
+                      [(set GR64:$dst, (adde GR64:$src1, i64immSExt32:$src2))]>;
 } // isTwoAddress
 
 def ADC64mr  : RI<0x11, MRMDestMem, (outs), (ins i64mem:$dst, GR64:$src2),
                   "adc{q}\t{$src2, $dst|$dst, $src2}",
                   [(store (adde (load addr:$dst), GR64:$src2), addr:$dst)]>;
-def ADC64mi32 : RIi32<0x81, MRM2m, (outs), (ins i64mem:$dst, i64i32imm:$src2),
-                      "adc{q}\t{$src2, $dst|$dst, $src2}",
-                 [(store (adde (load addr:$dst), i64immSExt8:$src2), addr:$dst)]>;
 def ADC64mi8 : RIi8<0x83, MRM2m, (outs), (ins i64mem:$dst, i64i8imm :$src2),
                     "adc{q}\t{$src2, $dst|$dst, $src2}",
                  [(store (adde (load addr:$dst), i64immSExt8:$src2), addr:$dst)]>;
+def ADC64mi32 : RIi32<0x81, MRM2m, (outs), (ins i64mem:$dst, i64i32imm:$src2),
+                      "adc{q}\t{$src2, $dst|$dst, $src2}",
+                 [(store (adde (load addr:$dst), i64immSExt8:$src2), addr:$dst)]>;
 } // Uses = [EFLAGS]
 
 let isTwoAddress = 1 in {
@@ -394,16 +394,16 @@
                    (implicit EFLAGS)]>;
 
 // Register-Integer Subtraction
-def SUB64ri32 : RIi32<0x81, MRM5r, (outs GR64:$dst),
-                                   (ins GR64:$src1, i64i32imm:$src2),
-                      "sub{q}\t{$src2, $dst|$dst, $src2}",
-                      [(set GR64:$dst, (sub GR64:$src1, i64immSExt32:$src2)),
-                       (implicit EFLAGS)]>;
 def SUB64ri8 : RIi8<0x83, MRM5r, (outs GR64:$dst),
                                  (ins GR64:$src1, i64i8imm:$src2),
                     "sub{q}\t{$src2, $dst|$dst, $src2}",
                     [(set GR64:$dst, (sub GR64:$src1, i64immSExt8:$src2)),
                      (implicit EFLAGS)]>;
+def SUB64ri32 : RIi32<0x81, MRM5r, (outs GR64:$dst),
+                                   (ins GR64:$src1, i64i32imm:$src2),
+                      "sub{q}\t{$src2, $dst|$dst, $src2}",
+                      [(set GR64:$dst, (sub GR64:$src1, i64immSExt32:$src2)),
+                       (implicit EFLAGS)]>;
 } // isTwoAddress
 
 // Memory-Register Subtraction
@@ -413,16 +413,16 @@
                    (implicit EFLAGS)]>;
 
 // Memory-Integer Subtraction
-def SUB64mi32 : RIi32<0x81, MRM5m, (outs), (ins i64mem:$dst, i64i32imm:$src2),
-                      "sub{q}\t{$src2, $dst|$dst, $src2}",
-                      [(store (sub (load addr:$dst), i64immSExt32:$src2),
-                              addr:$dst),
-                       (implicit EFLAGS)]>;
 def SUB64mi8 : RIi8<0x83, MRM5m, (outs), (ins i64mem:$dst, i64i8imm :$src2), 
                     "sub{q}\t{$src2, $dst|$dst, $src2}",
                     [(store (sub (load addr:$dst), i64immSExt8:$src2),
                             addr:$dst),
                      (implicit EFLAGS)]>;
+def SUB64mi32 : RIi32<0x81, MRM5m, (outs), (ins i64mem:$dst, i64i32imm:$src2),
+                      "sub{q}\t{$src2, $dst|$dst, $src2}",
+                      [(store (sub (load addr:$dst), i64immSExt32:$src2),
+                              addr:$dst),
+                       (implicit EFLAGS)]>;
 
 let Uses = [EFLAGS] in {
 let isTwoAddress = 1 in {
@@ -434,23 +434,23 @@
                   "sbb{q}\t{$src2, $dst|$dst, $src2}",
                   [(set GR64:$dst, (sube GR64:$src1, (load addr:$src2)))]>;
 
-def SBB64ri32 : RIi32<0x81, MRM3r, (outs GR64:$dst), (ins GR64:$src1, i64i32imm:$src2),
-                      "sbb{q}\t{$src2, $dst|$dst, $src2}",
-                      [(set GR64:$dst, (sube GR64:$src1, i64immSExt32:$src2))]>;
 def SBB64ri8 : RIi8<0x83, MRM3r, (outs GR64:$dst), (ins GR64:$src1, i64i8imm:$src2),
                     "sbb{q}\t{$src2, $dst|$dst, $src2}",
                     [(set GR64:$dst, (sube GR64:$src1, i64immSExt8:$src2))]>;
+def SBB64ri32 : RIi32<0x81, MRM3r, (outs GR64:$dst), (ins GR64:$src1, i64i32imm:$src2),
+                      "sbb{q}\t{$src2, $dst|$dst, $src2}",
+                      [(set GR64:$dst, (sube GR64:$src1, i64immSExt32:$src2))]>;
 } // isTwoAddress
 
 def SBB64mr  : RI<0x19, MRMDestMem, (outs), (ins i64mem:$dst, GR64:$src2), 
                   "sbb{q}\t{$src2, $dst|$dst, $src2}",
                   [(store (sube (load addr:$dst), GR64:$src2), addr:$dst)]>;
-def SBB64mi32 : RIi32<0x81, MRM3m, (outs), (ins i64mem:$dst, i64i32imm:$src2), 
-                      "sbb{q}\t{$src2, $dst|$dst, $src2}",
-              [(store (sube (load addr:$dst), i64immSExt32:$src2), addr:$dst)]>;
 def SBB64mi8 : RIi8<0x83, MRM3m, (outs), (ins i64mem:$dst, i64i8imm :$src2), 
                     "sbb{q}\t{$src2, $dst|$dst, $src2}",
                [(store (sube (load addr:$dst), i64immSExt8:$src2), addr:$dst)]>;
+def SBB64mi32 : RIi32<0x81, MRM3m, (outs), (ins i64mem:$dst, i64i32imm:$src2), 
+                      "sbb{q}\t{$src2, $dst|$dst, $src2}",
+              [(store (sube (load addr:$dst), i64immSExt32:$src2), addr:$dst)]>;
 } // Uses = [EFLAGS]
 } // Defs = [EFLAGS]
 
@@ -491,30 +491,30 @@
 // Suprisingly enough, these are not two address instructions!
 
 // Register-Integer Signed Integer Multiplication
-def IMUL64rri32 : RIi32<0x69, MRMSrcReg,                    // GR64 = GR64*I32
-                        (outs GR64:$dst), (ins GR64:$src1, i64i32imm:$src2),
-                        "imul{q}\t{$src2, $src1, $dst|$dst, $src1, $src2}",
-                       [(set GR64:$dst, (mul GR64:$src1, i64immSExt32:$src2)),
-                        (implicit EFLAGS)]>;
 def IMUL64rri8 : RIi8<0x6B, MRMSrcReg,                      // GR64 = GR64*I8
                       (outs GR64:$dst), (ins GR64:$src1, i64i8imm:$src2),
                       "imul{q}\t{$src2, $src1, $dst|$dst, $src1, $src2}",
                       [(set GR64:$dst, (mul GR64:$src1, i64immSExt8:$src2)),
                        (implicit EFLAGS)]>;
+def IMUL64rri32 : RIi32<0x69, MRMSrcReg,                    // GR64 = GR64*I32
+                        (outs GR64:$dst), (ins GR64:$src1, i64i32imm:$src2),
+                        "imul{q}\t{$src2, $src1, $dst|$dst, $src1, $src2}",
+                       [(set GR64:$dst, (mul GR64:$src1, i64immSExt32:$src2)),
+                        (implicit EFLAGS)]>;
 
 // Memory-Integer Signed Integer Multiplication
-def IMUL64rmi32 : RIi32<0x69, MRMSrcMem,                   // GR64 = [mem64]*I32
-                        (outs GR64:$dst), (ins i64mem:$src1, i64i32imm:$src2),
-                        "imul{q}\t{$src2, $src1, $dst|$dst, $src1, $src2}",
-                        [(set GR64:$dst, (mul (load addr:$src1),
-                                              i64immSExt32:$src2)),
-                         (implicit EFLAGS)]>;
 def IMUL64rmi8 : RIi8<0x6B, MRMSrcMem,                      // GR64 = [mem64]*I8
                       (outs GR64:$dst), (ins i64mem:$src1, i64i8imm: $src2),
                       "imul{q}\t{$src2, $src1, $dst|$dst, $src1, $src2}",
                       [(set GR64:$dst, (mul (load addr:$src1),
                                             i64immSExt8:$src2)),
                        (implicit EFLAGS)]>;
+def IMUL64rmi32 : RIi32<0x69, MRMSrcMem,                   // GR64 = [mem64]*I32
+                        (outs GR64:$dst), (ins i64mem:$src1, i64i32imm:$src2),
+                        "imul{q}\t{$src2, $src1, $dst|$dst, $src1, $src2}",
+                        [(set GR64:$dst, (mul (load addr:$src1),
+                                              i64immSExt32:$src2)),
+                         (implicit EFLAGS)]>;
 } // Defs = [EFLAGS]
 
 // Unsigned division / remainder
@@ -783,28 +783,28 @@
                   (outs GR64:$dst), (ins GR64:$src1, i64mem:$src2),
                   "and{q}\t{$src2, $dst|$dst, $src2}",
                   [(set GR64:$dst, (and GR64:$src1, (load addr:$src2)))]>;
-def AND64ri32  : RIi32<0x81, MRM4r, 
-                       (outs GR64:$dst), (ins GR64:$src1, i64i32imm:$src2),
-                       "and{q}\t{$src2, $dst|$dst, $src2}",
-                       [(set GR64:$dst, (and GR64:$src1, i64immSExt32:$src2))]>;
 def AND64ri8 : RIi8<0x83, MRM4r, 
                     (outs GR64:$dst), (ins GR64:$src1, i64i8imm:$src2),
                     "and{q}\t{$src2, $dst|$dst, $src2}",
                     [(set GR64:$dst, (and GR64:$src1, i64immSExt8:$src2))]>;
+def AND64ri32  : RIi32<0x81, MRM4r, 
+                       (outs GR64:$dst), (ins GR64:$src1, i64i32imm:$src2),
+                       "and{q}\t{$src2, $dst|$dst, $src2}",
+                       [(set GR64:$dst, (and GR64:$src1, i64immSExt32:$src2))]>;
 } // isTwoAddress
 
 def AND64mr  : RI<0x21, MRMDestMem,
                   (outs), (ins i64mem:$dst, GR64:$src),
                   "and{q}\t{$src, $dst|$dst, $src}",
                   [(store (and (load addr:$dst), GR64:$src), addr:$dst)]>;
-def AND64mi32  : RIi32<0x81, MRM4m,
-                       (outs), (ins i64mem:$dst, i64i32imm:$src),
-                       "and{q}\t{$src, $dst|$dst, $src}",
-             [(store (and (loadi64 addr:$dst), i64immSExt32:$src), addr:$dst)]>;
 def AND64mi8 : RIi8<0x83, MRM4m,
                     (outs), (ins i64mem:$dst, i64i8imm :$src),
                     "and{q}\t{$src, $dst|$dst, $src}",
                  [(store (and (load addr:$dst), i64immSExt8:$src), addr:$dst)]>;
+def AND64mi32  : RIi32<0x81, MRM4m,
+                       (outs), (ins i64mem:$dst, i64i32imm:$src),
+                       "and{q}\t{$src, $dst|$dst, $src}",
+             [(store (and (loadi64 addr:$dst), i64immSExt32:$src), addr:$dst)]>;
 
 let isTwoAddress = 1 in {
 let isCommutable = 1 in
@@ -814,23 +814,23 @@
 def OR64rm   : RI<0x0B, MRMSrcMem , (outs GR64:$dst), (ins GR64:$src1, i64mem:$src2),
                   "or{q}\t{$src2, $dst|$dst, $src2}",
                   [(set GR64:$dst, (or GR64:$src1, (load addr:$src2)))]>;
-def OR64ri32 : RIi32<0x81, MRM1r, (outs GR64:$dst), (ins GR64:$src1, i64i32imm:$src2),
-                     "or{q}\t{$src2, $dst|$dst, $src2}",
-                     [(set GR64:$dst, (or GR64:$src1, i64immSExt32:$src2))]>;
 def OR64ri8  : RIi8<0x83, MRM1r, (outs GR64:$dst), (ins GR64:$src1, i64i8imm:$src2),
                     "or{q}\t{$src2, $dst|$dst, $src2}",
                     [(set GR64:$dst, (or GR64:$src1, i64immSExt8:$src2))]>;
+def OR64ri32 : RIi32<0x81, MRM1r, (outs GR64:$dst), (ins GR64:$src1, i64i32imm:$src2),
+                     "or{q}\t{$src2, $dst|$dst, $src2}",
+                     [(set GR64:$dst, (or GR64:$src1, i64immSExt32:$src2))]>;
 } // isTwoAddress
 
 def OR64mr : RI<0x09, MRMDestMem, (outs), (ins i64mem:$dst, GR64:$src),
                 "or{q}\t{$src, $dst|$dst, $src}",
                 [(store (or (load addr:$dst), GR64:$src), addr:$dst)]>;
-def OR64mi32 : RIi32<0x81, MRM1m, (outs), (ins i64mem:$dst, i64i32imm:$src),
-                     "or{q}\t{$src, $dst|$dst, $src}",
-              [(store (or (loadi64 addr:$dst), i64immSExt32:$src), addr:$dst)]>;
 def OR64mi8  : RIi8<0x83, MRM1m, (outs), (ins i64mem:$dst, i64i8imm:$src),
                     "or{q}\t{$src, $dst|$dst, $src}",
                   [(store (or (load addr:$dst), i64immSExt8:$src), addr:$dst)]>;
+def OR64mi32 : RIi32<0x81, MRM1m, (outs), (ins i64mem:$dst, i64i32imm:$src),
+                     "or{q}\t{$src, $dst|$dst, $src}",
+              [(store (or (loadi64 addr:$dst), i64immSExt32:$src), addr:$dst)]>;
 
 let isTwoAddress = 1 in {
 let isCommutable = 1 in
@@ -840,24 +840,24 @@
 def XOR64rm  : RI<0x33, MRMSrcMem, (outs GR64:$dst), (ins GR64:$src1, i64mem:$src2), 
                   "xor{q}\t{$src2, $dst|$dst, $src2}",
                   [(set GR64:$dst, (xor GR64:$src1, (load addr:$src2)))]>;
+def XOR64ri8 : RIi8<0x83, MRM6r,  (outs GR64:$dst), (ins GR64:$src1, i64i8imm:$src2),
+                    "xor{q}\t{$src2, $dst|$dst, $src2}",
+                    [(set GR64:$dst, (xor GR64:$src1, i64immSExt8:$src2))]>;
 def XOR64ri32 : RIi32<0x81, MRM6r, 
                       (outs GR64:$dst), (ins GR64:$src1, i64i32imm:$src2), 
                       "xor{q}\t{$src2, $dst|$dst, $src2}",
                       [(set GR64:$dst, (xor GR64:$src1, i64immSExt32:$src2))]>;
-def XOR64ri8 : RIi8<0x83, MRM6r,  (outs GR64:$dst), (ins GR64:$src1, i64i8imm:$src2),
-                    "xor{q}\t{$src2, $dst|$dst, $src2}",
-                    [(set GR64:$dst, (xor GR64:$src1, i64immSExt8:$src2))]>;
 } // isTwoAddress
 
 def XOR64mr  : RI<0x31, MRMDestMem, (outs), (ins i64mem:$dst, GR64:$src),
                   "xor{q}\t{$src, $dst|$dst, $src}",
                   [(store (xor (load addr:$dst), GR64:$src), addr:$dst)]>;
-def XOR64mi32 : RIi32<0x81, MRM6m, (outs), (ins i64mem:$dst, i64i32imm:$src),
-                      "xor{q}\t{$src, $dst|$dst, $src}",
-             [(store (xor (loadi64 addr:$dst), i64immSExt32:$src), addr:$dst)]>;
 def XOR64mi8 : RIi8<0x83, MRM6m, (outs), (ins i64mem:$dst, i64i8imm :$src),
                     "xor{q}\t{$src, $dst|$dst, $src}",
                  [(store (xor (load addr:$dst), i64immSExt8:$src), addr:$dst)]>;
+def XOR64mi32 : RIi32<0x81, MRM6m, (outs), (ins i64mem:$dst, i64i32imm:$src),
+                      "xor{q}\t{$src, $dst|$dst, $src}",
+             [(store (xor (loadi64 addr:$dst), i64immSExt32:$src), addr:$dst)]>;
 } // Defs = [EFLAGS]
 
 //===----------------------------------------------------------------------===//
@@ -898,23 +898,23 @@
                  "cmp{q}\t{$src2, $src1|$src1, $src2}",
                  [(X86cmp GR64:$src1, (loadi64 addr:$src2)),
                   (implicit EFLAGS)]>;
+def CMP64ri8 : RIi8<0x83, MRM7r, (outs), (ins GR64:$src1, i64i8imm:$src2),
+                    "cmp{q}\t{$src2, $src1|$src1, $src2}",
+                    [(X86cmp GR64:$src1, i64immSExt8:$src2),
+                     (implicit EFLAGS)]>;
 def CMP64ri32 : RIi32<0x81, MRM7r, (outs), (ins GR64:$src1, i64i32imm:$src2),
                       "cmp{q}\t{$src2, $src1|$src1, $src2}",
                       [(X86cmp GR64:$src1, i64immSExt32:$src2),
                        (implicit EFLAGS)]>;
+def CMP64mi8 : RIi8<0x83, MRM7m, (outs), (ins i64mem:$src1, i64i8imm:$src2),
+                    "cmp{q}\t{$src2, $src1|$src1, $src2}",
+                    [(X86cmp (loadi64 addr:$src1), i64immSExt8:$src2),
+                     (implicit EFLAGS)]>;
 def CMP64mi32 : RIi32<0x81, MRM7m, (outs),
                                        (ins i64mem:$src1, i64i32imm:$src2),
                       "cmp{q}\t{$src2, $src1|$src1, $src2}",
                       [(X86cmp (loadi64 addr:$src1), i64immSExt32:$src2),
                        (implicit EFLAGS)]>;
-def CMP64mi8 : RIi8<0x83, MRM7m, (outs), (ins i64mem:$src1, i64i8imm:$src2),
-                    "cmp{q}\t{$src2, $src1|$src1, $src2}",
-                    [(X86cmp (loadi64 addr:$src1), i64immSExt8:$src2),
-                     (implicit EFLAGS)]>;
-def CMP64ri8 : RIi8<0x83, MRM7r, (outs), (ins GR64:$src1, i64i8imm:$src2),
-                    "cmp{q}\t{$src2, $src1|$src1, $src2}",
-                    [(X86cmp GR64:$src1, i64immSExt8:$src2),
-                     (implicit EFLAGS)]>;
 } // Defs = [EFLAGS]
 
 // Conditional moves
@@ -1492,19 +1492,19 @@
           (ADD64rr GR64:$src1, GR64:$src2)>;
 def : Pat<(addc GR64:$src1, (load addr:$src2)),
           (ADD64rm GR64:$src1, addr:$src2)>;
-def : Pat<(addc GR64:$src1, i64immSExt32:$src2),
-          (ADD64ri32 GR64:$src1, imm:$src2)>;
 def : Pat<(addc GR64:$src1, i64immSExt8:$src2),
           (ADD64ri8 GR64:$src1, i64immSExt8:$src2)>;
+def : Pat<(addc GR64:$src1, i64immSExt32:$src2),
+          (ADD64ri32 GR64:$src1, imm:$src2)>;
 
 def : Pat<(subc GR64:$src1, GR64:$src2),
           (SUB64rr GR64:$src1, GR64:$src2)>;
 def : Pat<(subc GR64:$src1, (load addr:$src2)),
           (SUB64rm GR64:$src1, addr:$src2)>;
-def : Pat<(subc GR64:$src1, imm:$src2),
-          (SUB64ri32 GR64:$src1, i64immSExt32:$src2)>;
 def : Pat<(subc GR64:$src1, i64immSExt8:$src2),
           (SUB64ri8 GR64:$src1, i64immSExt8:$src2)>;
+def : Pat<(subc GR64:$src1, imm:$src2),
+          (SUB64ri32 GR64:$src1, i64immSExt32:$src2)>;
 
 //===----------------------------------------------------------------------===//
 // Overflow Patterns
@@ -1516,12 +1516,12 @@
           (ADD64rr GR64:$src1, GR64:$src2)>;
 
 // Register-Integer Addition with Overflow
-def : Pat<(parallel (X86add_ovf GR64:$src1, i64immSExt32:$src2),
-                    (implicit EFLAGS)),
-          (ADD64ri32 GR64:$src1, i64immSExt32:$src2)>;
 def : Pat<(parallel (X86add_ovf GR64:$src1, i64immSExt8:$src2),
                     (implicit EFLAGS)),
           (ADD64ri8 GR64:$src1, i64immSExt8:$src2)>;
+def : Pat<(parallel (X86add_ovf GR64:$src1, i64immSExt32:$src2),
+                    (implicit EFLAGS)),
+          (ADD64ri32 GR64:$src1, i64immSExt32:$src2)>;
 
 // Register-Memory Addition with Overflow
 def : Pat<(parallel (X86add_ovf GR64:$src1, (load addr:$src2)),
@@ -1533,14 +1533,14 @@
                            addr:$dst),
                     (implicit EFLAGS)),
           (ADD64mr addr:$dst, GR64:$src2)>;
-def : Pat<(parallel (store (X86add_ovf (load addr:$dst), i64immSExt32:$src2),
-                           addr:$dst),
-                    (implicit EFLAGS)),
-          (ADD64mi32 addr:$dst, i64immSExt32:$src2)>;
 def : Pat<(parallel (store (X86add_ovf (load addr:$dst), i64immSExt8:$src2),
                            addr:$dst),
                     (implicit EFLAGS)),
           (ADD64mi8 addr:$dst, i64immSExt8:$src2)>;
+def : Pat<(parallel (store (X86add_ovf (load addr:$dst), i64immSExt32:$src2),
+                           addr:$dst),
+                    (implicit EFLAGS)),
+          (ADD64mi32 addr:$dst, i64immSExt32:$src2)>;
 
 // Register-Register Subtraction with Overflow
 def : Pat<(parallel (X86sub_ovf GR64:$src1, GR64:$src2),
@@ -1553,12 +1553,12 @@
           (SUB64rm GR64:$src1, addr:$src2)>;
 
 // Register-Integer Subtraction with Overflow
-def : Pat<(parallel (X86sub_ovf GR64:$src1, i64immSExt32:$src2),
-                    (implicit EFLAGS)),
-          (SUB64ri32 GR64:$src1, i64immSExt32:$src2)>;
 def : Pat<(parallel (X86sub_ovf GR64:$src1, i64immSExt8:$src2),
                     (implicit EFLAGS)),
           (SUB64ri8 GR64:$src1, i64immSExt8:$src2)>;
+def : Pat<(parallel (X86sub_ovf GR64:$src1, i64immSExt32:$src2),
+                    (implicit EFLAGS)),
+          (SUB64ri32 GR64:$src1, i64immSExt32:$src2)>;
 
 // Memory-Register Subtraction with Overflow
 def : Pat<(parallel (store (X86sub_ovf (load addr:$dst), GR64:$src2),
@@ -1567,14 +1567,14 @@
           (SUB64mr addr:$dst, GR64:$src2)>;
 
 // Memory-Integer Subtraction with Overflow
-def : Pat<(parallel (store (X86sub_ovf (load addr:$dst), i64immSExt32:$src2),
-                           addr:$dst),
-                    (implicit EFLAGS)),
-          (SUB64mi32 addr:$dst, i64immSExt32:$src2)>;
 def : Pat<(parallel (store (X86sub_ovf (load addr:$dst), i64immSExt8:$src2),
                            addr:$dst),
                     (implicit EFLAGS)),
           (SUB64mi8 addr:$dst, i64immSExt8:$src2)>;
+def : Pat<(parallel (store (X86sub_ovf (load addr:$dst), i64immSExt32:$src2),
+                           addr:$dst),
+                    (implicit EFLAGS)),
+          (SUB64mi32 addr:$dst, i64immSExt32:$src2)>;
 
 // Register-Register Signed Integer Multiplication with Overflow
 def : Pat<(parallel (X86smul_ovf GR64:$src1, GR64:$src2),
@@ -1587,20 +1587,20 @@
           (IMUL64rm GR64:$src1, addr:$src2)>;
 
 // Register-Integer Signed Integer Multiplication with Overflow
-def : Pat<(parallel (X86smul_ovf GR64:$src1, i64immSExt32:$src2),
-                    (implicit EFLAGS)),
-          (IMUL64rri32 GR64:$src1, i64immSExt32:$src2)>;
 def : Pat<(parallel (X86smul_ovf GR64:$src1, i64immSExt8:$src2),
                     (implicit EFLAGS)),
           (IMUL64rri8 GR64:$src1, i64immSExt8:$src2)>;
+def : Pat<(parallel (X86smul_ovf GR64:$src1, i64immSExt32:$src2),
+                    (implicit EFLAGS)),
+          (IMUL64rri32 GR64:$src1, i64immSExt32:$src2)>;
 
 // Memory-Integer Signed Integer Multiplication with Overflow
-def : Pat<(parallel (X86smul_ovf (load addr:$src1), i64immSExt32:$src2),
-                    (implicit EFLAGS)),
-          (IMUL64rmi32 addr:$src1, i64immSExt32:$src2)>;
 def : Pat<(parallel (X86smul_ovf (load addr:$src1), i64immSExt8:$src2),
                     (implicit EFLAGS)),
           (IMUL64rmi8 addr:$src1, i64immSExt8:$src2)>;
+def : Pat<(parallel (X86smul_ovf (load addr:$src1), i64immSExt32:$src2),
+                    (implicit EFLAGS)),
+          (IMUL64rmi32 addr:$src1, i64immSExt32:$src2)>;
 
 //===----------------------------------------------------------------------===//
 // X86-64 SSE Instructions




From sabre at nondot.org  Fri Dec 19 12:38:02 2008
From: sabre at nondot.org (Chris Lattner)
Date: Fri, 19 Dec 2008 18:38:02 -0000
Subject: [llvm-commits] [llvm] r61251 - in /llvm/trunk:
 include/llvm/Bitcode/BitstreamWriter.h include/llvm/Bitcode/ReaderWriter.h
 lib/Bitcode/Writer/BitcodeWriter.cpp
Message-ID: <200812191838.mBJIc4Fx029841@zion.cs.uiuc.edu>

Author: lattner
Date: Fri Dec 19 12:37:59 2008
New Revision: 61251

URL: http://llvm.org/viewvc/llvm-project?rev=61251&view=rev
Log:
Add support for writing LLVM IR to a specified BitstreamWriter.
Patch by Lukasz Janyst!

Modified:
    llvm/trunk/include/llvm/Bitcode/BitstreamWriter.h
    llvm/trunk/include/llvm/Bitcode/ReaderWriter.h
    llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp

Modified: llvm/trunk/include/llvm/Bitcode/BitstreamWriter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/BitstreamWriter.h?rev=61251&r1=61250&r2=61251&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Bitcode/BitstreamWriter.h (original)
+++ llvm/trunk/include/llvm/Bitcode/BitstreamWriter.h Fri Dec 19 12:37:59 2008
@@ -76,6 +76,9 @@
       BlockInfoRecords.pop_back();
     }
   }
+
+  std::vector<unsigned char> &getBuffer() { return Out; }
+
   //===--------------------------------------------------------------------===//
   // Basic Primitives for emitting bits to the stream.
   //===--------------------------------------------------------------------===//

Modified: llvm/trunk/include/llvm/Bitcode/ReaderWriter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Bitcode/ReaderWriter.h?rev=61251&r1=61250&r2=61251&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Bitcode/ReaderWriter.h (original)
+++ llvm/trunk/include/llvm/Bitcode/ReaderWriter.h Fri Dec 19 12:37:59 2008
@@ -22,6 +22,7 @@
   class ModuleProvider;
   class MemoryBuffer;
   class ModulePass;
+  class BitstreamWriter;
   class raw_ostream;
   
   /// getBitcodeModuleProvider - Read the header of the specified bitcode buffer
@@ -45,6 +46,10 @@
   /// raw output stream.
   void WriteBitcodeToFile(const Module *M, raw_ostream &Out);
 
+  /// WriteBitcodeToStream - Write the specified module to the specified
+  /// raw output stream.
+  void WriteBitcodeToStream(const Module *M, BitstreamWriter &Stream);
+
   /// CreateBitcodeWriterPass - Create and return a pass that writes the module
   /// to the specified ostream.
   ModulePass *CreateBitcodeWriterPass(std::ostream &Str);

Modified: llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=61251&r1=61250&r2=61251&view=diff

==============================================================================
--- llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
+++ llvm/trunk/lib/Bitcode/Writer/BitcodeWriter.cpp Fri Dec 19 12:37:59 2008
@@ -1355,7 +1355,23 @@
   BitstreamWriter Stream(Buffer);
   
   Buffer.reserve(256*1024);
+
+  WriteBitcodeToStream( M, Stream );
+  
+  // If writing to stdout, set binary mode.
+  if (&llvm::outs() == &Out)
+    sys::Program::ChangeStdoutToBinary();
+
+  // Write the generated bitstream to "Out".
+  Out.write((char*)&Buffer.front(), Buffer.size());
   
+  // Make sure it hits disk now.
+  Out.flush();
+}
+
+/// WriteBitcodeToStream - Write the specified module to the specified output
+/// stream.
+void llvm::WriteBitcodeToStream(const Module *M, BitstreamWriter &Stream) {
   // If this is darwin, emit a file header and trailer if needed.
   bool isDarwin = M->getTargetTriple().find("-darwin") != std::string::npos;
   if (isDarwin)
@@ -1373,16 +1389,5 @@
   WriteModule(M, Stream);
 
   if (isDarwin)
-    EmitDarwinBCTrailer(Stream, Buffer.size());
-
-  
-  // If writing to stdout, set binary mode.
-  if (&llvm::outs() == &Out)
-    sys::Program::ChangeStdoutToBinary();
-
-  // Write the generated bitstream to "Out".
-  Out.write((char*)&Buffer.front(), Buffer.size());
-  
-  // Make sure it hits disk now.
-  Out.flush();
+    EmitDarwinBCTrailer(Stream, Stream.getBuffer().size());
 }




From gordonhenriksen at mac.com  Fri Dec 19 12:39:46 2008
From: gordonhenriksen at mac.com (Gordon Henriksen)
Date: Fri, 19 Dec 2008 18:39:46 -0000
Subject: [llvm-commits] [llvm] r61252 - in /llvm/trunk:
	include/llvm-c/Core.h lib/VMCore/Core.cpp
Message-ID: <200812191839.mBJIdlf8029905@zion.cs.uiuc.edu>

Author: gordon
Date: Fri Dec 19 12:39:45 2008
New Revision: 61252

URL: http://llvm.org/viewvc/llvm-project?rev=61252&view=rev
Log:
C bindings for dyn_cast_or_null.
This operation can be used to build dyn_cast, isa, and cast.

Modified:
    llvm/trunk/include/llvm-c/Core.h
    llvm/trunk/lib/VMCore/Core.cpp

Modified: llvm/trunk/include/llvm-c/Core.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/Core.h?rev=61252&r1=61251&r2=61252&view=diff

==============================================================================
--- llvm/trunk/include/llvm-c/Core.h (original)
+++ llvm/trunk/include/llvm-c/Core.h Fri Dec 19 12:39:45 2008
@@ -282,24 +282,79 @@
 
 /* The bulk of LLVM's object model consists of values, which comprise a very
  * rich type hierarchy.
- * 
- *   values:
- *     constants:
- *       scalar constants
- *       composite contants
- *       globals:
- *         global variable
- *         function
- *         alias
- *       basic blocks
  */
 
+#define LLVM_FOR_EACH_VALUE_SUBCLASS(macro) \
+  macro(Argument)                           \
+  macro(BasicBlock)                         \
+  macro(InlineAsm)                          \
+  macro(User)                               \
+    macro(Constant)                         \
+      macro(ConstantAggregateZero)          \
+      macro(ConstantArray)                  \
+      macro(ConstantExpr)                   \
+      macro(ConstantFP)                     \
+      macro(ConstantInt)                    \
+      macro(ConstantPointerNull)            \
+      macro(ConstantStruct)                 \
+      macro(ConstantVector)                 \
+      macro(GlobalValue)                    \
+        macro(Function)                     \
+        macro(GlobalAlias)                  \
+        macro(GlobalVariable)               \
+      macro(UndefValue)                     \
+    macro(Instruction)                      \
+      macro(BinaryOperator)                 \
+      macro(CallInst)                       \
+        macro(IntrinsicInst)                \
+          macro(DbgInfoIntrinsic)           \
+            macro(DbgDeclareInst)           \
+            macro(DbgFuncStartInst)         \
+            macro(DbgRegionEndInst)         \
+            macro(DbgRegionStartInst)       \
+            macro(DbgStopPointInst)         \
+          macro(EHSelectorInst)             \
+          macro(MemIntrinsic)               \
+            macro(MemCpyInst)               \
+            macro(MemMoveInst)              \
+            macro(MemSetInst)               \
+      macro(CmpInst)                        \
+      macro(FCmpInst)                       \
+      macro(ICmpInst)                       \
+      macro(VFCmpInst)                      \
+      macro(VICmpInst)                      \
+      macro(ExtractElementInst)             \
+      macro(GetElementPtrInst)              \
+      macro(InsertElementInst)              \
+      macro(InsertValueInst)                \
+      macro(PHINode)                        \
+      macro(SelectInst)                     \
+      macro(ShuffleVectorInst)              \
+      macro(StoreInst)                      \
+      macro(TerminatorInst)                 \
+        macro(BranchInst)                   \
+        macro(InvokeInst)                   \
+        macro(ReturnInst)                   \
+        macro(SwitchInst)                   \
+        macro(UnreachableInst)              \
+        macro(UnwindInst)                   \
+    macro(UnaryInstruction)                 \
+      macro(AllocationInst)                 \
+      macro(CastInst)                       \
+      macro(ExtractValueInst)
+
 /* Operations on all values */
 LLVMTypeRef LLVMTypeOf(LLVMValueRef Val);
 const char *LLVMGetValueName(LLVMValueRef Val);
 void LLVMSetValueName(LLVMValueRef Val, const char *Name);
 void LLVMDumpValue(LLVMValueRef Val);
 
+/* Conversion functions. Return the input value if it is an instance of the
+   specified class, otherwise NULL. See llvm::dyn_cast_or_null<>. */
+#define LLVM_DECLARE_VALUE_CAST(name) \
+  LLVMValueRef LLVMIsA##name(LLVMValueRef Val);
+LLVM_FOR_EACH_VALUE_SUBCLASS(LLVM_DECLARE_VALUE_CAST)
+
 /* Operations on constants of any type */
 LLVMValueRef LLVMConstNull(LLVMTypeRef Ty); /* all zeroes */
 LLVMValueRef LLVMConstAllOnes(LLVMTypeRef Ty); /* only for int/vector */

Modified: llvm/trunk/lib/VMCore/Core.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Core.cpp?rev=61252&r1=61251&r2=61252&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Core.cpp (original)
+++ llvm/trunk/lib/VMCore/Core.cpp Fri Dec 19 12:39:45 2008
@@ -21,6 +21,7 @@
 #include "llvm/TypeSymbolTable.h"
 #include "llvm/ModuleProvider.h"
 #include "llvm/InlineAsm.h"
+#include "llvm/IntrinsicInst.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/CallSite.h"
 #include <cassert>
@@ -252,6 +253,17 @@
   unwrap(Val)->dump();
 }
 
+
+/*--.. Conversion functions ................................................--*/
+
+#define LLVM_DEFINE_VALUE_CAST(name)                                       \
+  LLVMValueRef LLVMIsA##name(LLVMValueRef Val) {                           \
+    return wrap(static_cast<Value*>(dyn_cast_or_null<name>(unwrap(Val)))); \
+  }
+
+LLVM_FOR_EACH_VALUE_SUBCLASS(LLVM_DEFINE_VALUE_CAST)
+
+
 /*--.. Operations on constants of any type .................................--*/
 
 LLVMValueRef LLVMConstNull(LLVMTypeRef Ty) {




From gordonhenriksen at mac.com  Fri Dec 19 12:51:18 2008
From: gordonhenriksen at mac.com (Gordon Henriksen)
Date: Fri, 19 Dec 2008 18:51:18 -0000
Subject: [llvm-commits] [llvm] r61253 - /llvm/trunk/include/llvm-c/Core.h
Message-ID: <200812191851.mBJIpJbn030304@zion.cs.uiuc.edu>

Author: gordon
Date: Fri Dec 19 12:51:17 2008
New Revision: 61253

URL: http://llvm.org/viewvc/llvm-project?rev=61253&view=rev
Log:
Add dyn_cast_or_null bindings for some additional classes missed in r61252.

Modified:
    llvm/trunk/include/llvm-c/Core.h

Modified: llvm/trunk/include/llvm-c/Core.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/Core.h?rev=61253&r1=61252&r2=61253&view=diff

==============================================================================
--- llvm/trunk/include/llvm-c/Core.h (original)
+++ llvm/trunk/include/llvm-c/Core.h Fri Dec 19 12:51:17 2008
@@ -340,8 +340,25 @@
         macro(UnwindInst)                   \
     macro(UnaryInstruction)                 \
       macro(AllocationInst)                 \
+        macro(AllocaInst)                   \
+        macro(MallocInst)                   \
       macro(CastInst)                       \
-      macro(ExtractValueInst)
+        macro(BitCastInst)                  \
+        macro(FPExtInst)                    \
+        macro(FPToSIInst)                   \
+        macro(FPToUIInst)                   \
+        macro(FPTruncInst)                  \
+        macro(IntToPtrInst)                 \
+        macro(PtrToIntInst)                 \
+        macro(SExtInst)                     \
+        macro(SIToFPInst)                   \
+        macro(TruncInst)                    \
+        macro(UIToFPInst)                   \
+        macro(ZExtInst)                     \
+      macro(ExtractValueInst)               \
+      macro(FreeInst)                       \
+      macro(LoadInst)                       \
+      macro(VAArgInst)
 
 /* Operations on all values */
 LLVMTypeRef LLVMTypeOf(LLVMValueRef Val);




From isanbard at gmail.com  Fri Dec 19 13:08:24 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 19 Dec 2008 19:08:24 -0000
Subject: [llvm-commits] [llvm] r61254 -
	/llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp
Message-ID: <200812191908.mBJJ8PQw031152@zion.cs.uiuc.edu>

Author: void
Date: Fri Dec 19 13:08:13 2008
New Revision: 61254

URL: http://llvm.org/viewvc/llvm-project?rev=61254&view=rev
Log:
This test works again for Darwin because a patch was reverted.

Modified:
    llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp

Modified: llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC%2B%2B/2006-11-06-StackTrace.cpp?rev=61254&r1=61253&r2=61254&view=diff

==============================================================================
--- llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp (original)
+++ llvm/trunk/test/FrontendC++/2006-11-06-StackTrace.cpp Fri Dec 19 13:08:13 2008
@@ -10,10 +10,8 @@
 // RUN:   grep {#7  0x.* in main.*(argc=\[12\],.*argv=.*)}
 
 // Only works on ppc, x86 and x86_64.  Should generalize?
-// XFAIL: alpha|ia64|arm
-
-// FIXME: Un-XFAIL this test when debug stuff is working again.
-// XFAIL: *
+// FIXME: Un-XFAIL this test for Linux when debug stuff is working again.
+// XFAIL: alpha|ia64|arm|linux
 
 #include <stdlib.h>
 




From criswell at uiuc.edu  Fri Dec 19 13:22:27 2008
From: criswell at uiuc.edu (John Criswell)
Date: Fri, 19 Dec 2008 13:22:27 -0600
Subject: [llvm-commits] [llvm] r61164 - in /llvm/trunk:
 include/llvm/Analysis/DebugInfo.h include/llvm/CodeGen/MachineModuleInfo.h
 lib/Analysis/DebugInfo.cpp
In-Reply-To: <200812172239.mBHMdUc7020218@zion.cs.uiuc.edu>
References: <200812172239.mBHMdUc7020218@zion.cs.uiuc.edu>
Message-ID: <494BF473.2030003@uiuc.edu>

Dear Devang,

If the indices have not changed for stoppoint, can we update the asserts 
for DbgStopPointInst::getFilename()?  I'm using this intrinsic for a 
project I'm working on, and increasing the debug info version breaks it.

-- John T.

Devang Patel wrote:
> Author: dpatel
> Date: Wed Dec 17 16:39:29 2008
> New Revision: 61164
>
> URL: http://llvm.org/viewvc/llvm-project?rev=61164&view=rev
> Log:
>
> Today the front-ends (llvm-gcc and clang) generate multiple llvm.dbg.compile_units to identify source file for various debug entities. Each llvm.dbg.compile_unit matches one file on the disk. However, the backend only supports one DW_TAG_compile_unit per .o file. The backend selects first compile_unit from the vector to construct DW_TAG_compile_unit entry, which is not correct in all cases.
>
> First step to resolve this is, record file name and directory directly in debug info for various debug entities.
>
>
> Modified:
>     llvm/trunk/include/llvm/Analysis/DebugInfo.h
>     llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h
>     llvm/trunk/lib/Analysis/DebugInfo.cpp
>
> Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DebugInfo.h?rev=61164&r1=61163&r2=61164&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/Analysis/DebugInfo.h (original)
> +++ llvm/trunk/include/llvm/Analysis/DebugInfo.h Wed Dec 17 16:39:29 2008
> @@ -33,7 +33,8 @@
>    class DIDescriptor {
>    public:
>      enum {
> -      Version6    = 6 << 16,     // Current version of debug information.
> +      Version7    = 7 << 16,     // Current version of debug information.
> +      Version6    = 6 << 16,     // Constant for version 6.
>        Version5    = 5 << 16,     // Constant for version 5.
>        Version4    = 4 << 16,     // Constant for version 4.
>        VersionMask = 0xffff0000   // Mask for version number.
> @@ -156,6 +157,8 @@
>      explicit DIBasicType(GlobalVariable *GV);
>
>      unsigned getEncoding() const { return getUnsignedField(9); }
> +    std::string getFileName() const { return getStringField(10); }
> +    std::string getDirectory() const { return getStringField(11); }
>    };
>
>    /// DIDerivedType - A simple derived type, like a const qualified type,
> @@ -168,7 +171,9 @@
>      explicit DIDerivedType(GlobalVariable *GV);
>
>      DIType getTypeDerivedFrom() const { return getFieldAs<DIType>(9); }
> -
> +    std::string getFileName() const { return getStringField(10); }
> +    std::string getDirectory() const { return getStringField(11); }
> +
>      /// isDerivedType - Return true if the specified tag is legal for
>      /// DIDerivedType.
>      static bool isDerivedType(unsigned TAG);
> @@ -183,6 +188,8 @@
>      explicit DICompositeType(GlobalVariable *GV);
>
>      DIArray getTypeArray() const { return getFieldAs<DIArray>(10); }
> +    std::string getFileName() const { return getStringField(11); }
> +    std::string getDirectory() const { return getStringField(12); }
>
>      /// isCompositeType - Return true if the specified tag is legal for
>      /// DICompositeType.
> @@ -216,7 +223,8 @@
>    class DISubprogram : public DIGlobal {
>    public:
>      explicit DISubprogram(GlobalVariable *GV = 0);
> -
> +    std::string getFilename() const { return getStringField(11); }
> +    std::string getDirectory() const { return getStringField(12); }
>    };
>
>    /// DIGlobalVariable - This is a wrapper for a global variable.
> @@ -225,6 +233,8 @@
>      explicit DIGlobalVariable(GlobalVariable *GV = 0);
>
>      GlobalVariable *getGlobal() const { return getGlobalVariableField(11); }
> +    std::string getFilename() const { return getStringField(12); }
> +    std::string getDirectory() const { return getStringField(13); }
>    };
>
>
> @@ -240,6 +250,8 @@
>      DICompileUnit getCompileUnit() const{ return getFieldAs<DICompileUnit>(3); }
>      unsigned getLineNumber() const      { return getUnsignedField(4); }
>      DIType getType() const              { return getFieldAs<DIType>(5); }
> +    std::string getFilename() const { return getStringField(6); }
> +    std::string getDirectory() const { return getStringField(7); }
>
>      /// isVariable - Return true if the specified tag is legal for DIVariable.
>      static bool isVariable(unsigned Tag);
> @@ -310,7 +322,9 @@
>                                  DICompileUnit CompileUnit, unsigned LineNumber,
>                                  uint64_t SizeInBits, uint64_t AlignInBits,
>                                  uint64_t OffsetInBits, unsigned Flags,
> -                                unsigned Encoding);
> +                                unsigned Encoding,
> +                                const std::string *FileName = 0,
> +                                const std::string *Directory = 0);
>
>      /// CreateDerivedType - Create a derived type like const qualified type,
>      /// pointer, typedef, etc.
> @@ -320,7 +334,9 @@
>                                      unsigned LineNumber,
>                                      uint64_t SizeInBits, uint64_t AlignInBits,
>                                      uint64_t OffsetInBits, unsigned Flags,
> -                                    DIType DerivedFrom);
> +                                    DIType DerivedFrom,
> +                                    const std::string *FileName = 0,
> +                                    const std::string *Directory = 0);
>
>      /// CreateCompositeType - Create a composite type like array, struct, etc.
>      DICompositeType CreateCompositeType(unsigned Tag, DIDescriptor Context,
> @@ -331,7 +347,9 @@
>                                          uint64_t AlignInBits,
>                                          uint64_t OffsetInBits, unsigned Flags,
>                                          DIType DerivedFrom,
> -                                        DIArray Elements);
> +                                        DIArray Elements,
> +                                        const std::string *FileName = 0,
> +                                        const std::string *Directory = 0);
>
>      /// CreateSubprogram - Create a new descriptor for the specified subprogram.
>      /// See comments in DISubprogram for descriptions of these fields.
> @@ -340,7 +358,9 @@
>                                    const std::string &LinkageName,
>                                    DICompileUnit CompileUnit, unsigned LineNo,
>                                    DIType Type, bool isLocalToUnit,
> -                                  bool isDefinition);
> +                                  bool isDefinition,
> +                                  const std::string *FileName = 0,
> +                                  const std::string *Directory = 0);
>
>      /// CreateGlobalVariable - Create a new descriptor for the specified global.
>      DIGlobalVariable
> @@ -349,14 +369,18 @@
>                           const std::string &LinkageName,
>                           DICompileUnit CompileUnit,
>                           unsigned LineNo, DIType Type, bool isLocalToUnit,
> -                         bool isDefinition, llvm::GlobalVariable *GV);
> +                         bool isDefinition, llvm::GlobalVariable *GV,
> +                         const std::string *FileName = 0,
> +                         const std::string *Directory = 0);
>
>
>      /// CreateVariable - Create a new descriptor for the specified variable.
>      DIVariable CreateVariable(unsigned Tag, DIDescriptor Context,
>                                const std::string &Name,
>                                DICompileUnit CompileUnit, unsigned LineNo,
> -                              DIType Type);
> +                              DIType Type,
> +                              const std::string *FileName = 0,
> +                              const std::string *Directory = 0);
>
>      /// CreateBlock - This creates a descriptor for a lexical block with the
>      /// specified parent context.
>
> Modified: llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h?rev=61164&r1=61163&r2=61164&view=diff
>
> ==============================================================================
> --- llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h (original)
> +++ llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h Wed Dec 17 16:39:29 2008
> @@ -59,7 +59,8 @@
>  // Debug info constants.
>
>  enum {
> -  LLVMDebugVersion = (6 << 16),         // Current version of debug information.
> +  LLVMDebugVersion = (7 << 16),         // Current version of debug information.
> +  LLVMDebugVersion6 = (6 << 16),        // Constant for version 6.
>    LLVMDebugVersion5 = (5 << 16),        // Constant for version 5.
>    LLVMDebugVersion4 = (4 << 16),        // Constant for version 4.
>    LLVMDebugVersionMask = 0xffff0000     // Mask for version number.
>
> Modified: llvm/trunk/lib/Analysis/DebugInfo.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DebugInfo.cpp?rev=61164&r1=61163&r2=61164&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/Analysis/DebugInfo.cpp (original)
> +++ llvm/trunk/lib/Analysis/DebugInfo.cpp Wed Dec 17 16:39:29 2008
> @@ -195,7 +195,7 @@
>  Constant *DIFactory::GetTagConstant(unsigned TAG) {
>    assert((TAG & DIDescriptor::VersionMask) == 0 &&
>           "Tag too large for debug encoding!");
> -  return ConstantInt::get(Type::Int32Ty, TAG | DIDescriptor::Version6);
> +  return ConstantInt::get(Type::Int32Ty, TAG | DIDescriptor::Version7);
>  }
>
>  Constant *DIFactory::GetStringConstant(const std::string &String) {
> @@ -389,7 +389,9 @@
>                                         uint64_t SizeInBits,
>                                         uint64_t AlignInBits,
>                                         uint64_t OffsetInBits, unsigned Flags,
> -                                       unsigned Encoding) {
> +                                       unsigned Encoding,
> +                                       const std::string *FileName,
> +                                       const std::string *Directory) {
>    Constant *Elts[] = {
>      GetTagConstant(dwarf::DW_TAG_base_type),
>      getCastToEmpty(Context),
> @@ -400,7 +402,9 @@
>      ConstantInt::get(Type::Int64Ty, AlignInBits),
>      ConstantInt::get(Type::Int64Ty, OffsetInBits),
>      ConstantInt::get(Type::Int32Ty, Flags),
> -    ConstantInt::get(Type::Int32Ty, Encoding)
> +    ConstantInt::get(Type::Int32Ty, Encoding),
> +    GetStringConstant(FileName ? FileName->c_str() : ""),
> +    GetStringConstant(Directory ? Directory->c_str() : "")
>    };
>
>    Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
> @@ -424,7 +428,9 @@
>                                             uint64_t AlignInBits,
>                                             uint64_t OffsetInBits,
>                                             unsigned Flags,
> -                                           DIType DerivedFrom) {
> +                                           DIType DerivedFrom,
> +                                           const std::string *FileName,
> +                                           const std::string *Directory) {
>    Constant *Elts[] = {
>      GetTagConstant(Tag),
>      getCastToEmpty(Context),
> @@ -435,7 +441,9 @@
>      ConstantInt::get(Type::Int64Ty, AlignInBits),
>      ConstantInt::get(Type::Int64Ty, OffsetInBits),
>      ConstantInt::get(Type::Int32Ty, Flags),
> -    getCastToEmpty(DerivedFrom)
> +    getCastToEmpty(DerivedFrom),
> +    GetStringConstant(FileName ? FileName->c_str() : ""),
> +    GetStringConstant(Directory ? Directory->c_str() : "")
>    };
>
>    Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
> @@ -459,7 +467,10 @@
>                                                 uint64_t OffsetInBits,
>                                                 unsigned Flags,
>                                                 DIType DerivedFrom,
> -                                               DIArray Elements) {
> +                                               DIArray Elements,
> +                                               const std::string *FileName,
> +                                               const std::string *Directory) {
> +
>    Constant *Elts[] = {
>      GetTagConstant(Tag),
>      getCastToEmpty(Context),
> @@ -471,7 +482,9 @@
>      ConstantInt::get(Type::Int64Ty, OffsetInBits),
>      ConstantInt::get(Type::Int32Ty, Flags),
>      getCastToEmpty(DerivedFrom),
> -    getCastToEmpty(Elements)
> +    getCastToEmpty(Elements),
> +    GetStringConstant(FileName ? FileName->c_str() : ""),
> +    GetStringConstant(Directory ? Directory->c_str() : "")
>    };
>
>    Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
> @@ -495,7 +508,10 @@
>                                           DICompileUnit CompileUnit,
>                                           unsigned LineNo, DIType Type,
>                                           bool isLocalToUnit,
> -                                         bool isDefinition) {
> +                                         bool isDefinition,
> +                                         const std::string *FileName,
> +                                         const std::string *Directory) {
> +
>    Constant *Elts[] = {
>      GetTagConstant(dwarf::DW_TAG_subprogram),
>      getCastToEmpty(GetOrCreateSubprogramAnchor()),
> @@ -507,7 +523,9 @@
>      ConstantInt::get(Type::Int32Ty, LineNo),
>      getCastToEmpty(Type),
>      ConstantInt::get(Type::Int1Ty, isLocalToUnit),
> -    ConstantInt::get(Type::Int1Ty, isDefinition)
> +    ConstantInt::get(Type::Int1Ty, isDefinition),
> +    GetStringConstant(FileName ? FileName->c_str() : ""),
> +    GetStringConstant(Directory ? Directory->c_str() : "")
>    };
>
>    Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
> @@ -527,8 +545,9 @@
>                                  const std::string &LinkageName,
>                                  DICompileUnit CompileUnit,
>                                  unsigned LineNo, DIType Type,bool isLocalToUnit,
> -                                bool isDefinition, llvm::GlobalVariable *Val) {
> -
> +                                bool isDefinition, llvm::GlobalVariable *Val,
> +                                const std::string *FileName,
> +                                const std::string *Directory) {
>    Constant *Elts[] = {
>      GetTagConstant(dwarf::DW_TAG_variable),
>      getCastToEmpty(GetOrCreateGlobalVariableAnchor()),
> @@ -541,7 +560,9 @@
>      getCastToEmpty(Type),
>      ConstantInt::get(Type::Int1Ty, isLocalToUnit),
>      ConstantInt::get(Type::Int1Ty, isDefinition),
> -    ConstantExpr::getBitCast(Val, EmptyStructPtr)
> +    ConstantExpr::getBitCast(Val, EmptyStructPtr),
> +    GetStringConstant(FileName ? FileName->c_str() : ""),
> +    GetStringConstant(Directory ? Directory->c_str() : "")
>    };
>
>    Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
> @@ -559,7 +580,10 @@
>  DIVariable DIFactory::CreateVariable(unsigned Tag, DIDescriptor Context,
>                                       const std::string &Name,
>                                       DICompileUnit CompileUnit, unsigned LineNo,
> -                                     DIType Type) {
> +                                     DIType Type,
> +                                     const std::string *FileName,
> +                                     const std::string *Directory) {
> +
>
>    Constant *Elts[] = {
>      GetTagConstant(Tag),
> @@ -568,6 +592,8 @@
>      getCastToEmpty(CompileUnit),
>      ConstantInt::get(Type::Int32Ty, LineNo),
>      getCastToEmpty(Type),
> +    GetStringConstant(FileName ? FileName->c_str() : ""),
> +    GetStringConstant(Directory ? Directory->c_str() : "")
>    };
>
>    Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>   



From dpatel at apple.com  Fri Dec 19 13:46:06 2008
From: dpatel at apple.com (Devang Patel)
Date: Fri, 19 Dec 2008 11:46:06 -0800
Subject: [llvm-commits] [llvm] r61164 - in /llvm/trunk:
	include/llvm/Analysis/DebugInfo.h
	include/llvm/CodeGen/MachineModuleInfo.h lib/Analysis/DebugInfo.cpp
In-Reply-To: <494BF473.2030003@uiuc.edu>
References: <200812172239.mBHMdUc7020218@zion.cs.uiuc.edu>
	<494BF473.2030003@uiuc.edu>
Message-ID: <C096B50D-83FA-4081-BB11-2CFB6A3E0700@apple.com>


On Dec 19, 2008, at 11:22 AM, John Criswell wrote:

> Dear Devang,
>
> If the indices have not changed for stoppoint, can we update the  
> asserts
> for DbgStopPointInst::getFilename()?

Sure, go ahead.

>  I'm using this intrinsic for a
> project I'm working on, and increasing the debug info version breaks  
> it.
>
> -- John T.
>
> Devang Patel wrote:
>> Author: dpatel
>> Date: Wed Dec 17 16:39:29 2008
>> New Revision: 61164
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=61164&view=rev
>> Log:
>>
>> Today the front-ends (llvm-gcc and clang) generate multiple  
>> llvm.dbg.compile_units to identify source file for various debug  
>> entities. Each llvm.dbg.compile_unit matches one file on the disk.  
>> However, the backend only supports one DW_TAG_compile_unit per .o  
>> file. The backend selects first compile_unit from the vector to  
>> construct DW_TAG_compile_unit entry, which is not correct in all  
>> cases.
>>
>> First step to resolve this is, record file name and directory  
>> directly in debug info for various debug entities.
>>
>>
>> Modified:
>>    llvm/trunk/include/llvm/Analysis/DebugInfo.h
>>    llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h
>>    llvm/trunk/lib/Analysis/DebugInfo.cpp
>>
>> Modified: llvm/trunk/include/llvm/Analysis/DebugInfo.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/DebugInfo.h?rev=61164&r1=61163&r2=61164&view=diff
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- llvm/trunk/include/llvm/Analysis/DebugInfo.h (original)
>> +++ llvm/trunk/include/llvm/Analysis/DebugInfo.h Wed Dec 17  
>> 16:39:29 2008
>> @@ -33,7 +33,8 @@
>>   class DIDescriptor {
>>   public:
>>     enum {
>> -      Version6    = 6 << 16,     // Current version of debug  
>> information.
>> +      Version7    = 7 << 16,     // Current version of debug  
>> information.
>> +      Version6    = 6 << 16,     // Constant for version 6.
>>       Version5    = 5 << 16,     // Constant for version 5.
>>       Version4    = 4 << 16,     // Constant for version 4.
>>       VersionMask = 0xffff0000   // Mask for version number.
>> @@ -156,6 +157,8 @@
>>     explicit DIBasicType(GlobalVariable *GV);
>>
>>     unsigned getEncoding() const { return getUnsignedField(9); }
>> +    std::string getFileName() const { return getStringField(10); }
>> +    std::string getDirectory() const { return getStringField(11); }
>>   };
>>
>>   /// DIDerivedType - A simple derived type, like a const qualified  
>> type,
>> @@ -168,7 +171,9 @@
>>     explicit DIDerivedType(GlobalVariable *GV);
>>
>>     DIType getTypeDerivedFrom() const { return  
>> getFieldAs<DIType>(9); }
>> -
>> +    std::string getFileName() const { return getStringField(10); }
>> +    std::string getDirectory() const { return getStringField(11); }
>> +
>>     /// isDerivedType - Return true if the specified tag is legal for
>>     /// DIDerivedType.
>>     static bool isDerivedType(unsigned TAG);
>> @@ -183,6 +188,8 @@
>>     explicit DICompositeType(GlobalVariable *GV);
>>
>>     DIArray getTypeArray() const { return getFieldAs<DIArray>(10); }
>> +    std::string getFileName() const { return getStringField(11); }
>> +    std::string getDirectory() const { return getStringField(12); }
>>
>>     /// isCompositeType - Return true if the specified tag is legal  
>> for
>>     /// DICompositeType.
>> @@ -216,7 +223,8 @@
>>   class DISubprogram : public DIGlobal {
>>   public:
>>     explicit DISubprogram(GlobalVariable *GV = 0);
>> -
>> +    std::string getFilename() const { return getStringField(11); }
>> +    std::string getDirectory() const { return getStringField(12); }
>>   };
>>
>>   /// DIGlobalVariable - This is a wrapper for a global variable.
>> @@ -225,6 +233,8 @@
>>     explicit DIGlobalVariable(GlobalVariable *GV = 0);
>>
>>     GlobalVariable *getGlobal() const { return  
>> getGlobalVariableField(11); }
>> +    std::string getFilename() const { return getStringField(12); }
>> +    std::string getDirectory() const { return getStringField(13); }
>>   };
>>
>>
>> @@ -240,6 +250,8 @@
>>     DICompileUnit getCompileUnit() const{ return  
>> getFieldAs<DICompileUnit>(3); }
>>     unsigned getLineNumber() const      { return  
>> getUnsignedField(4); }
>>     DIType getType() const              { return  
>> getFieldAs<DIType>(5); }
>> +    std::string getFilename() const { return getStringField(6); }
>> +    std::string getDirectory() const { return getStringField(7); }
>>
>>     /// isVariable - Return true if the specified tag is legal for  
>> DIVariable.
>>     static bool isVariable(unsigned Tag);
>> @@ -310,7 +322,9 @@
>>                                 DICompileUnit CompileUnit, unsigned  
>> LineNumber,
>>                                 uint64_t SizeInBits, uint64_t  
>> AlignInBits,
>>                                 uint64_t OffsetInBits, unsigned  
>> Flags,
>> -                                unsigned Encoding);
>> +                                unsigned Encoding,
>> +                                const std::string *FileName = 0,
>> +                                const std::string *Directory = 0);
>>
>>     /// CreateDerivedType - Create a derived type like const  
>> qualified type,
>>     /// pointer, typedef, etc.
>> @@ -320,7 +334,9 @@
>>                                     unsigned LineNumber,
>>                                     uint64_t SizeInBits, uint64_t  
>> AlignInBits,
>>                                     uint64_t OffsetInBits, unsigned  
>> Flags,
>> -                                    DIType DerivedFrom);
>> +                                    DIType DerivedFrom,
>> +                                    const std::string *FileName = 0,
>> +                                    const std::string *Directory =  
>> 0);
>>
>>     /// CreateCompositeType - Create a composite type like array,  
>> struct, etc.
>>     DICompositeType CreateCompositeType(unsigned Tag, DIDescriptor  
>> Context,
>> @@ -331,7 +347,9 @@
>>                                         uint64_t AlignInBits,
>>                                         uint64_t OffsetInBits,  
>> unsigned Flags,
>>                                         DIType DerivedFrom,
>> -                                        DIArray Elements);
>> +                                        DIArray Elements,
>> +                                        const std::string  
>> *FileName = 0,
>> +                                        const std::string  
>> *Directory = 0);
>>
>>     /// CreateSubprogram - Create a new descriptor for the  
>> specified subprogram.
>>     /// See comments in DISubprogram for descriptions of these  
>> fields.
>> @@ -340,7 +358,9 @@
>>                                   const std::string &LinkageName,
>>                                   DICompileUnit CompileUnit,  
>> unsigned LineNo,
>>                                   DIType Type, bool isLocalToUnit,
>> -                                  bool isDefinition);
>> +                                  bool isDefinition,
>> +                                  const std::string *FileName = 0,
>> +                                  const std::string *Directory = 0);
>>
>>     /// CreateGlobalVariable - Create a new descriptor for the  
>> specified global.
>>     DIGlobalVariable
>> @@ -349,14 +369,18 @@
>>                          const std::string &LinkageName,
>>                          DICompileUnit CompileUnit,
>>                          unsigned LineNo, DIType Type, bool  
>> isLocalToUnit,
>> -                         bool isDefinition, llvm::GlobalVariable  
>> *GV);
>> +                         bool isDefinition, llvm::GlobalVariable  
>> *GV,
>> +                         const std::string *FileName = 0,
>> +                         const std::string *Directory = 0);
>>
>>
>>     /// CreateVariable - Create a new descriptor for the specified  
>> variable.
>>     DIVariable CreateVariable(unsigned Tag, DIDescriptor Context,
>>                               const std::string &Name,
>>                               DICompileUnit CompileUnit, unsigned  
>> LineNo,
>> -                              DIType Type);
>> +                              DIType Type,
>> +                              const std::string *FileName = 0,
>> +                              const std::string *Directory = 0);
>>
>>     /// CreateBlock - This creates a descriptor for a lexical block  
>> with the
>>     /// specified parent context.
>>
>> Modified: llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h?rev=61164&r1=61163&r2=61164&view=diff
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h (original)
>> +++ llvm/trunk/include/llvm/CodeGen/MachineModuleInfo.h Wed Dec 17  
>> 16:39:29 2008
>> @@ -59,7 +59,8 @@
>> // Debug info constants.
>>
>> enum {
>> -  LLVMDebugVersion = (6 << 16),         // Current version of  
>> debug information.
>> +  LLVMDebugVersion = (7 << 16),         // Current version of  
>> debug information.
>> +  LLVMDebugVersion6 = (6 << 16),        // Constant for version 6.
>>   LLVMDebugVersion5 = (5 << 16),        // Constant for version 5.
>>   LLVMDebugVersion4 = (4 << 16),        // Constant for version 4.
>>   LLVMDebugVersionMask = 0xffff0000     // Mask for version number.
>>
>> Modified: llvm/trunk/lib/Analysis/DebugInfo.cpp
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/DebugInfo.cpp?rev=61164&r1=61163&r2=61164&view=diff
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- llvm/trunk/lib/Analysis/DebugInfo.cpp (original)
>> +++ llvm/trunk/lib/Analysis/DebugInfo.cpp Wed Dec 17 16:39:29 2008
>> @@ -195,7 +195,7 @@
>> Constant *DIFactory::GetTagConstant(unsigned TAG) {
>>   assert((TAG & DIDescriptor::VersionMask) == 0 &&
>>          "Tag too large for debug encoding!");
>> -  return ConstantInt::get(Type::Int32Ty, TAG |  
>> DIDescriptor::Version6);
>> +  return ConstantInt::get(Type::Int32Ty, TAG |  
>> DIDescriptor::Version7);
>> }
>>
>> Constant *DIFactory::GetStringConstant(const std::string &String) {
>> @@ -389,7 +389,9 @@
>>                                        uint64_t SizeInBits,
>>                                        uint64_t AlignInBits,
>>                                        uint64_t OffsetInBits,  
>> unsigned Flags,
>> -                                       unsigned Encoding) {
>> +                                       unsigned Encoding,
>> +                                       const std::string *FileName,
>> +                                       const std::string  
>> *Directory) {
>>   Constant *Elts[] = {
>>     GetTagConstant(dwarf::DW_TAG_base_type),
>>     getCastToEmpty(Context),
>> @@ -400,7 +402,9 @@
>>     ConstantInt::get(Type::Int64Ty, AlignInBits),
>>     ConstantInt::get(Type::Int64Ty, OffsetInBits),
>>     ConstantInt::get(Type::Int32Ty, Flags),
>> -    ConstantInt::get(Type::Int32Ty, Encoding)
>> +    ConstantInt::get(Type::Int32Ty, Encoding),
>> +    GetStringConstant(FileName ? FileName->c_str() : ""),
>> +    GetStringConstant(Directory ? Directory->c_str() : "")
>>   };
>>
>>   Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/ 
>> sizeof(Elts[0]));
>> @@ -424,7 +428,9 @@
>>                                            uint64_t AlignInBits,
>>                                            uint64_t OffsetInBits,
>>                                            unsigned Flags,
>> -                                           DIType DerivedFrom) {
>> +                                           DIType DerivedFrom,
>> +                                           const std::string  
>> *FileName,
>> +                                           const std::string  
>> *Directory) {
>>   Constant *Elts[] = {
>>     GetTagConstant(Tag),
>>     getCastToEmpty(Context),
>> @@ -435,7 +441,9 @@
>>     ConstantInt::get(Type::Int64Ty, AlignInBits),
>>     ConstantInt::get(Type::Int64Ty, OffsetInBits),
>>     ConstantInt::get(Type::Int32Ty, Flags),
>> -    getCastToEmpty(DerivedFrom)
>> +    getCastToEmpty(DerivedFrom),
>> +    GetStringConstant(FileName ? FileName->c_str() : ""),
>> +    GetStringConstant(Directory ? Directory->c_str() : "")
>>   };
>>
>>   Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/ 
>> sizeof(Elts[0]));
>> @@ -459,7 +467,10 @@
>>                                                uint64_t OffsetInBits,
>>                                                unsigned Flags,
>>                                                DIType DerivedFrom,
>> -                                               DIArray Elements) {
>> +                                               DIArray Elements,
>> +                                               const std::string  
>> *FileName,
>> +                                               const std::string  
>> *Directory) {
>> +
>>   Constant *Elts[] = {
>>     GetTagConstant(Tag),
>>     getCastToEmpty(Context),
>> @@ -471,7 +482,9 @@
>>     ConstantInt::get(Type::Int64Ty, OffsetInBits),
>>     ConstantInt::get(Type::Int32Ty, Flags),
>>     getCastToEmpty(DerivedFrom),
>> -    getCastToEmpty(Elements)
>> +    getCastToEmpty(Elements),
>> +    GetStringConstant(FileName ? FileName->c_str() : ""),
>> +    GetStringConstant(Directory ? Directory->c_str() : "")
>>   };
>>
>>   Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/ 
>> sizeof(Elts[0]));
>> @@ -495,7 +508,10 @@
>>                                          DICompileUnit CompileUnit,
>>                                          unsigned LineNo, DIType  
>> Type,
>>                                          bool isLocalToUnit,
>> -                                         bool isDefinition) {
>> +                                         bool isDefinition,
>> +                                         const std::string  
>> *FileName,
>> +                                         const std::string  
>> *Directory) {
>> +
>>   Constant *Elts[] = {
>>     GetTagConstant(dwarf::DW_TAG_subprogram),
>>     getCastToEmpty(GetOrCreateSubprogramAnchor()),
>> @@ -507,7 +523,9 @@
>>     ConstantInt::get(Type::Int32Ty, LineNo),
>>     getCastToEmpty(Type),
>>     ConstantInt::get(Type::Int1Ty, isLocalToUnit),
>> -    ConstantInt::get(Type::Int1Ty, isDefinition)
>> +    ConstantInt::get(Type::Int1Ty, isDefinition),
>> +    GetStringConstant(FileName ? FileName->c_str() : ""),
>> +    GetStringConstant(Directory ? Directory->c_str() : "")
>>   };
>>
>>   Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/ 
>> sizeof(Elts[0]));
>> @@ -527,8 +545,9 @@
>>                                 const std::string &LinkageName,
>>                                 DICompileUnit CompileUnit,
>>                                 unsigned LineNo, DIType Type,bool  
>> isLocalToUnit,
>> -                                bool isDefinition,  
>> llvm::GlobalVariable *Val) {
>> -
>> +                                bool isDefinition,  
>> llvm::GlobalVariable *Val,
>> +                                const std::string *FileName,
>> +                                const std::string *Directory) {
>>   Constant *Elts[] = {
>>     GetTagConstant(dwarf::DW_TAG_variable),
>>     getCastToEmpty(GetOrCreateGlobalVariableAnchor()),
>> @@ -541,7 +560,9 @@
>>     getCastToEmpty(Type),
>>     ConstantInt::get(Type::Int1Ty, isLocalToUnit),
>>     ConstantInt::get(Type::Int1Ty, isDefinition),
>> -    ConstantExpr::getBitCast(Val, EmptyStructPtr)
>> +    ConstantExpr::getBitCast(Val, EmptyStructPtr),
>> +    GetStringConstant(FileName ? FileName->c_str() : ""),
>> +    GetStringConstant(Directory ? Directory->c_str() : "")
>>   };
>>
>>   Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/ 
>> sizeof(Elts[0]));
>> @@ -559,7 +580,10 @@
>> DIVariable DIFactory::CreateVariable(unsigned Tag, DIDescriptor  
>> Context,
>>                                      const std::string &Name,
>>                                      DICompileUnit CompileUnit,  
>> unsigned LineNo,
>> -                                     DIType Type) {
>> +                                     DIType Type,
>> +                                     const std::string *FileName,
>> +                                     const std::string *Directory) {
>> +
>>
>>   Constant *Elts[] = {
>>     GetTagConstant(Tag),
>> @@ -568,6 +592,8 @@
>>     getCastToEmpty(CompileUnit),
>>     ConstantInt::get(Type::Int32Ty, LineNo),
>>     getCastToEmpty(Type),
>> +    GetStringConstant(FileName ? FileName->c_str() : ""),
>> +    GetStringConstant(Directory ? Directory->c_str() : "")
>>   };
>>
>>   Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/ 
>> sizeof(Elts[0]));
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

-
Devang





From criswell at uiuc.edu  Fri Dec 19 13:56:38 2008
From: criswell at uiuc.edu (John Criswell)
Date: Fri, 19 Dec 2008 19:56:38 -0000
Subject: [llvm-commits] [llvm] r61257 -
	/llvm/trunk/lib/VMCore/IntrinsicInst.cpp
Message-ID: <200812191956.mBJJucHe032637@zion.cs.uiuc.edu>

Author: criswell
Date: Fri Dec 19 13:56:36 2008
New Revision: 61257

URL: http://llvm.org/viewvc/llvm-project?rev=61257&view=rev
Log:
The fields for the stoppoint debug intrinsic have not changed, so update the
version number assertions.

Modified:
    llvm/trunk/lib/VMCore/IntrinsicInst.cpp

Modified: llvm/trunk/lib/VMCore/IntrinsicInst.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/IntrinsicInst.cpp?rev=61257&r1=61256&r2=61257&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/IntrinsicInst.cpp (original)
+++ llvm/trunk/lib/VMCore/IntrinsicInst.cpp Fri Dec 19 13:56:36 2008
@@ -60,7 +60,7 @@
 
 Value *DbgStopPointInst::getFileName() const {
   // Once the operand indices are verified, update this assert
-  assert(LLVMDebugVersion == (6 << 16) && "Verify operand indices");
+  assert(LLVMDebugVersion == (7 << 16) && "Verify operand indices");
   GlobalVariable *GV = cast<GlobalVariable>(getContext());
   if (!GV->hasInitializer()) return NULL;
   ConstantStruct *CS = cast<ConstantStruct>(GV->getInitializer());
@@ -69,7 +69,7 @@
 
 Value *DbgStopPointInst::getDirectory() const {
   // Once the operand indices are verified, update this assert
-  assert(LLVMDebugVersion == (6 << 16) && "Verify operand indices");
+  assert(LLVMDebugVersion == (7 << 16) && "Verify operand indices");
   GlobalVariable *GV = cast<GlobalVariable>(getContext());
   if (!GV->hasInitializer()) return NULL;
   ConstantStruct *CS = cast<ConstantStruct>(GV->getInitializer());




From isanbard at gmail.com  Fri Dec 19 14:53:09 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 19 Dec 2008 12:53:09 -0800
Subject: [llvm-commits] [llvm] r61257 -
	/llvm/trunk/lib/VMCore/IntrinsicInst.cpp
In-Reply-To: <200812191956.mBJJucHe032637@zion.cs.uiuc.edu>
References: <200812191956.mBJJucHe032637@zion.cs.uiuc.edu>
Message-ID: <16e5fdf90812191253s56caee0cl79235e29b7befd72@mail.gmail.com>

John,

This is causing an XPASS on Darwin (Leopard). Could you investigate?

Running /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.src/test/DebugInfo/dg.exp
...
XPASS: /Volumes/Sandbox/Buildbot/llvm/full-llvm/build/llvm.src/test/DebugInfo/printdbginfo.ll


-bw

On Fri, Dec 19, 2008 at 11:56 AM, John Criswell <criswell at uiuc.edu> wrote:
> Author: criswell
> Date: Fri Dec 19 13:56:36 2008
> New Revision: 61257
>
> URL: http://llvm.org/viewvc/llvm-project?rev=61257&view=rev
> Log:
> The fields for the stoppoint debug intrinsic have not changed, so update the
> version number assertions.
>
> Modified:
>    llvm/trunk/lib/VMCore/IntrinsicInst.cpp
>
> Modified: llvm/trunk/lib/VMCore/IntrinsicInst.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/IntrinsicInst.cpp?rev=61257&r1=61256&r2=61257&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/VMCore/IntrinsicInst.cpp (original)
> +++ llvm/trunk/lib/VMCore/IntrinsicInst.cpp Fri Dec 19 13:56:36 2008
> @@ -60,7 +60,7 @@
>
>  Value *DbgStopPointInst::getFileName() const {
>   // Once the operand indices are verified, update this assert
> -  assert(LLVMDebugVersion == (6 << 16) && "Verify operand indices");
> +  assert(LLVMDebugVersion == (7 << 16) && "Verify operand indices");
>   GlobalVariable *GV = cast<GlobalVariable>(getContext());
>   if (!GV->hasInitializer()) return NULL;
>   ConstantStruct *CS = cast<ConstantStruct>(GV->getInitializer());
> @@ -69,7 +69,7 @@
>
>  Value *DbgStopPointInst::getDirectory() const {
>   // Once the operand indices are verified, update this assert
> -  assert(LLVMDebugVersion == (6 << 16) && "Verify operand indices");
> +  assert(LLVMDebugVersion == (7 << 16) && "Verify operand indices");
>   GlobalVariable *GV = cast<GlobalVariable>(getContext());
>   if (!GV->hasInitializer()) return NULL;
>   ConstantStruct *CS = cast<ConstantStruct>(GV->getInitializer());
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>


From evan.cheng at apple.com  Fri Dec 19 14:58:02 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Fri, 19 Dec 2008 20:58:02 -0000
Subject: [llvm-commits] [llvm] r61259 - in /llvm/trunk:
 include/llvm/CodeGen/LiveInterval.h lib/CodeGen/LiveIntervalAnalysis.cpp
 lib/CodeGen/SimpleRegisterCoalescing.cpp
 test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll
 test/CodeGen/X86/2008-12-19-EarlyClobberBug.ll
Message-ID: <200812192058.mBJKw3pA002105@zion.cs.uiuc.edu>

Author: evancheng
Date: Fri Dec 19 14:58:01 2008
New Revision: 61259

URL: http://llvm.org/viewvc/llvm-project?rev=61259&view=rev
Log:
Fix PR3149. If an early clobber def is a physical register and it is tied to an input operand, it effectively extends the live range of the physical register. Currently we do not have a good way to represent this.

172     %ECX<def> = MOV32rr %reg1039<kill>
180     INLINEASM <es:subl $5,$1
        sbbl $3,$0>, 10, %EAX<def>, 14, %ECX<earlyclobber,def>, 9, %EAX<kill>,
36, <fi#0>, 1, %reg0, 0, 9, %ECX<kill>, 36, <fi#1>, 1, %reg0, 0
188     %EAX<def> = MOV32rr %EAX<kill>
196     %ECX<def> = MOV32rr %ECX<kill>
204     %ECX<def> = MOV32rr %ECX<kill>
212     %EAX<def> = MOV32rr %EAX<kill>
220     %EAX<def> = MOV32rr %EAX
228     %reg1039<def> = MOV32rr %ECX<kill>

The early clobber operand ties ECX input to the ECX def.

The live interval of ECX is represented as this:
%reg20,inf = [46,47:1)[174,230:0)  0 at 174-(230) 1 at 46-(47)

The right way to represent this is something like
%reg20,inf = [46,47:2)[174,182:1)[181:230:0)  0 at 174-(182) 1 at 181-230 @2 at 46-(47)

Of course that won't work since that means overlapping live ranges defined by two val#.

The workaround for now is to add a bit to val# which says the val# is redefined by a early clobber def somewhere. This prevents the move at 228 from being optimized away by SimpleRegisterCoalescing::AdjustCopiesBackFrom.

Added:
    llvm/trunk/test/CodeGen/X86/2008-12-19-EarlyClobberBug.ll
Modified:
    llvm/trunk/include/llvm/CodeGen/LiveInterval.h
    llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
    llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp
    llvm/trunk/test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll

Modified: llvm/trunk/include/llvm/CodeGen/LiveInterval.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveInterval.h?rev=61259&r1=61258&r2=61259&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/LiveInterval.h (original)
+++ llvm/trunk/include/llvm/CodeGen/LiveInterval.h Fri Dec 19 14:58:01 2008
@@ -38,16 +38,19 @@
   ///         - or reg # of the definition if it's a stack slot liveinterval.
   ///   copy  - Copy iff val# is defined by a copy; zero otherwise.
   ///   hasPHIKill - One or more of the kills are PHI nodes.
+  ///   redefByEC - Re-defined by early clobber somewhere during the live range.
   ///   kills - Instruction # of the kills.
   struct VNInfo {
     unsigned id;
     unsigned def;
     MachineInstr *copy;
-    bool hasPHIKill;
+    bool hasPHIKill : 1;
+    bool redefByEC : 1;
     SmallVector<unsigned, 4> kills;
-    VNInfo() : id(~1U), def(~1U), copy(0), hasPHIKill(false) {}
+    VNInfo()
+      : id(~1U), def(~1U), copy(0), hasPHIKill(false), redefByEC(false) {}
     VNInfo(unsigned i, unsigned d, MachineInstr *c)
-      : id(i), def(d), copy(c), hasPHIKill(false) {}
+      : id(i), def(d), copy(c), hasPHIKill(false), redefByEC(false) {}
   };
 
   /// LiveRange structure - This represents a simple register range in the
@@ -177,6 +180,7 @@
       DstValNo->def = SrcValNo->def;
       DstValNo->copy = SrcValNo->copy;
       DstValNo->hasPHIKill = SrcValNo->hasPHIKill;
+      DstValNo->redefByEC = SrcValNo->redefByEC;
       DstValNo->kills = SrcValNo->kills;
     }
 

Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=61259&r1=61258&r2=61259&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original)
+++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Fri Dec 19 14:58:01 2008
@@ -360,6 +360,7 @@
         mi->getOpcode() == TargetInstrInfo::INSERT_SUBREG ||
         tii_->isMoveInstr(*mi, SrcReg, DstReg))
       CopyMI = mi;
+    // Earlyclobbers move back one.
     ValNo = interval.getNextValue(defIndex, CopyMI, VNInfoAllocator);
 
     assert(ValNo->id == 0 && "First value in interval is not 0?");
@@ -435,9 +436,8 @@
       assert(interval.containsOneValue());
       unsigned DefIndex = getDefIndex(interval.getValNumInfo(0)->def);
       unsigned RedefIndex = getDefIndex(MIIdx);
-      // Earlyclobbers move back one.
-      if (MO.isEarlyClobber())
-        RedefIndex = getUseIndex(MIIdx);
+      // It cannot be an early clobber MO.
+      assert(!MO.isEarlyClobber() && "Unexpected early clobber!");
 
       const LiveRange *OldLR = interval.getLiveRangeContaining(RedefIndex-1);
       VNInfo *OldValNo = OldLR->valno;
@@ -505,9 +505,8 @@
       // live until the end of the block.  We've already taken care of the
       // rest of the live range.
       unsigned defIndex = getDefIndex(MIIdx);
-      // Earlyclobbers move back one.
-      if (MO.isEarlyClobber())
-        defIndex = getUseIndex(MIIdx);
+      // It cannot be an early clobber MO.
+      assert(!MO.isEarlyClobber() && "Unexpected early clobber!");
       
       VNInfo *ValNo;
       MachineInstr *CopyMI = NULL;
@@ -592,8 +591,11 @@
 
   // Already exists? Extend old live interval.
   LiveInterval::iterator OldLR = interval.FindLiveRangeContaining(start);
-  VNInfo *ValNo = (OldLR != interval.end())
+  bool Extend = OldLR != interval.end();
+  VNInfo *ValNo = Extend
     ? OldLR->valno : interval.getNextValue(start, CopyMI, VNInfoAllocator);
+  if (MO.isEarlyClobber() && Extend)
+    ValNo->redefByEC = true;
   LiveRange LR(start, end, ValNo);
   interval.addRange(LR);
   interval.addKill(LR.valno, end);

Modified: llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp?rev=61259&r1=61258&r2=61259&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp (original)
+++ llvm/trunk/lib/CodeGen/SimpleRegisterCoalescing.cpp Fri Dec 19 14:58:01 2008
@@ -119,6 +119,26 @@
   if (ALR == IntA.end()) // Should never happen!
     return false;
   VNInfo *AValNo = ALR->valno;
+  // If it's re-defined by an early clobber somewhere in the live range, then
+  // it's not safe to eliminate the copy. FIXME: This is a temporary workaround.
+  // See PR3149:
+  // 172     %ECX<def> = MOV32rr %reg1039<kill>
+  // 180     INLINEASM <es:subl $5,$1
+  //         sbbl $3,$0>, 10, %EAX<def>, 14, %ECX<earlyclobber,def>, 9, %EAX<kill>,
+  // 36, <fi#0>, 1, %reg0, 0, 9, %ECX<kill>, 36, <fi#1>, 1, %reg0, 0
+  // 188     %EAX<def> = MOV32rr %EAX<kill>
+  // 196     %ECX<def> = MOV32rr %ECX<kill>
+  // 204     %ECX<def> = MOV32rr %ECX<kill>
+  // 212     %EAX<def> = MOV32rr %EAX<kill>
+  // 220     %EAX<def> = MOV32rr %EAX
+  // 228     %reg1039<def> = MOV32rr %ECX<kill>
+  // The early clobber operand ties ECX input to the ECX def.
+  //
+  // The live interval of ECX is represented as this:
+  // %reg20,inf = [46,47:1)[174,230:0)  0 at 174-(230) 1 at 46-(47)
+  // The coalescer has no idea there was a def in the middle of [174,230].
+  if (AValNo->redefByEC)
+    return false;
   
   // If AValNo is defined as a copy from IntB, we can potentially process this.  
   // Get the instruction that defines this value number.

Modified: llvm/trunk/test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll?rev=61259&r1=61258&r2=61259&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll (original)
+++ llvm/trunk/test/CodeGen/PowerPC/2007-04-30-InlineAsmEarlyClobber.ll Fri Dec 19 14:58:01 2008
@@ -17,7 +17,7 @@
 ;  return ((long long)Y << 32) | X;
 ;}
 
-define i64 @test(i32 %A, i32 %B, i32 %C) {
+define i64 @test(i32 %A, i32 %B, i32 %C) nounwind {
 entry:
 	%Y = alloca i32, align 4		; <i32*> [#uses=2]
 	%tmp4 = call i32 asm "subf${3:I}c $1,$4,$3\0A\09subfze $0,$2", "=r,=*&r,r,rI,r"( i32* %Y, i32 %A, i32 %B, i32 %C )		; <i32> [#uses=1]

Added: llvm/trunk/test/CodeGen/X86/2008-12-19-EarlyClobberBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-12-19-EarlyClobberBug.ll?rev=61259&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/2008-12-19-EarlyClobberBug.ll (added)
+++ llvm/trunk/test/CodeGen/X86/2008-12-19-EarlyClobberBug.ll Fri Dec 19 14:58:01 2008
@@ -0,0 +1,32 @@
+; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin | %prcontext End 1 | grep {movl.*%ecx}
+; PR3149
+
+@"\01LC" = internal constant [7 x i8] c"n0=%d\0A\00"		; <[7 x i8]*> [#uses=1]
+ at llvm.used = appending global [1 x i8*] [ i8* bitcast (i32 (i64, i64)* @umoddi3 to i8*) ], section "llvm.metadata"		; <[1 x i8*]*> [#uses=0]
+
+define i32 @umoddi3(i64 %u, i64 %v) nounwind noinline {
+entry:
+	%0 = trunc i64 %v to i32		; <i32> [#uses=2]
+	%1 = trunc i64 %u to i32		; <i32> [#uses=4]
+	%2 = lshr i64 %u, 32		; <i64> [#uses=1]
+	%3 = trunc i64 %2 to i32		; <i32> [#uses=2]
+	%4 = tail call i32 (i8*, ...)* @printf(i8* getelementptr ([7 x i8]* @"\01LC", i32 0, i32 0), i32 %1) nounwind		; <i32> [#uses=0]
+	%5 = icmp ult i32 %1, %0		; <i1> [#uses=1]
+	br i1 %5, label %bb2, label %bb
+
+bb:		; preds = %entry
+	%6 = lshr i64 %v, 32		; <i64> [#uses=1]
+	%7 = trunc i64 %6 to i32		; <i32> [#uses=1]
+	%asmtmp = tail call { i32, i32 } asm "subl $5,$1\0A\09sbbl $3,$0", "=r,=&r,0,imr,1,imr,~{dirflag},~{fpsr},~{flags}"(i32 %3, i32 %7, i32 %1, i32 %0) nounwind		; <{ i32, i32 }> [#uses=2]
+	%asmresult = extractvalue { i32, i32 } %asmtmp, 0		; <i32> [#uses=1]
+	%asmresult1 = extractvalue { i32, i32 } %asmtmp, 1		; <i32> [#uses=1]
+	br label %bb2
+
+bb2:		; preds = %bb, %entry
+	%n1.0 = phi i32 [ %asmresult, %bb ], [ %3, %entry ]		; <i32> [#uses=1]
+	%n0.0 = phi i32 [ %asmresult1, %bb ], [ %1, %entry ]		; <i32> [#uses=1]
+	%8 = add i32 %n0.0, %n1.0		; <i32> [#uses=1]
+	ret i32 %8
+}
+
+declare i32 @printf(i8*, ...) nounwind




From criswell at uiuc.edu  Fri Dec 19 15:52:27 2008
From: criswell at uiuc.edu (John Criswell)
Date: Fri, 19 Dec 2008 21:52:27 -0000
Subject: [llvm-commits] [poolalloc] r61261 -
 /poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h
Message-ID: <200812192152.mBJLqSGA003945@zion.cs.uiuc.edu>

Author: criswell
Date: Fri Dec 19 15:52:25 2008
New Revision: 61261

URL: http://llvm.org/viewvc/llvm-project?rev=61261&view=rev
Log:
Modified __clear_internal() method to use tail recursion.  This fixes
197.parser.
Added comments.

Modified:
    poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h

Modified: poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h?rev=61261&r1=61260&r2=61261&view=diff

==============================================================================
--- poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h (original)
+++ poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h Fri Dec 19 15:52:25 2008
@@ -1,4 +1,21 @@
+//===-- SplayTree.h - Splay Tree Implementation -----------------*- C++ -*-===//
+// 
+//                         Automatic Pool Allocation
+//
+// This file was developed by the LLVM research group and is distributed under
+// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// 
+//===----------------------------------------------------------------------===//
+//
+// This file implements several splay tree classes.
+//
+//===----------------------------------------------------------------------===//
+
 #include <memory>
+#include <vector>
+
+#ifndef SUPPORT_SPLAYTREE_H
+#define SUPPORT_SPLAYTREE_H
 
 template<typename dataTy>
 struct range_tree_node {
@@ -101,12 +118,40 @@
     return 0;
   }
 
-  void __clear_internal(tree_node* t) {
-    if (!t) return;
-    __clear_internal(t->left);
-    __clear_internal(t->right);
+  void __clear_internal(std::vector<tree_node *> & stack) {
+    //
+    // If the stack has no elements, we are done.
+    //
+    if (stack.size() == 0)
+      return;
+
+    //
+    // Otherwise, pop off the last element, add its children to the stack,
+    // and delete it.
+    //
+    tree_node * t = stack.back();
+    if (t == 0)
+      return;
+    stack.pop_back();
+    stack.push_back (t->left);
+    stack.push_back (t->right);
     __node_alloc.destroy(t);
     __node_alloc.deallocate(t, 1);
+    __clear_internal (stack);
+  }
+
+  void __clear_internal(tree_node* t) {
+    //
+    // If there is no node, then simply return.
+    //
+    if (!t) return;
+
+    //
+    // Otherwise, start deleting elements!
+    //
+    std::vector<tree_node *> stack;
+    stack.push_back (t);
+    __clear_internal (stack);
   }
 
   template<class O>
@@ -201,6 +246,16 @@
   explicit RangeSplaySet(const Allocator& A = Allocator() )
   : Tree(A) {}
   
+  //
+  // Method: insert()
+  //
+  // Description:
+  //  Insert an element into the splay set.
+  //
+  // Inputs:
+  //  start - The first valid address of the object.
+  //  end   - The last valid address of the object.
+  //
   bool insert(void* start, void* end) {
     return 0 != Tree.__insert(start,end);
   }
@@ -270,3 +325,5 @@
     return true;
   }
 };
+
+#endif




From gohman at apple.com  Fri Dec 19 16:23:44 2008
From: gohman at apple.com (Dan Gohman)
Date: Fri, 19 Dec 2008 22:23:44 -0000
Subject: [llvm-commits] [llvm] r61263 -
	/llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp
Message-ID: <200812192223.mBJMNiIO004930@zion.cs.uiuc.edu>

Author: djg
Date: Fri Dec 19 16:23:43 2008
New Revision: 61263

URL: http://llvm.org/viewvc/llvm-project?rev=61263&view=rev
Log:
Use ~0u instead of -1u as the special value, to hopefully avoid
warnings on compilers that warn about such things.

Modified:
    llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp

Modified: llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp?rev=61263&r1=61262&r2=61263&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp (original)
+++ llvm/trunk/lib/CodeGen/PostRASchedulerList.cpp Fri Dec 19 16:23:43 2008
@@ -217,11 +217,11 @@
   // Map registers to all their references within a live range.
   std::multimap<unsigned, MachineOperand *> RegRefs;
 
-  // The index of the most recent kill (proceding bottom-up), or -1 if
+  // The index of the most recent kill (proceding bottom-up), or ~0u if
   // the register is not live.
   unsigned KillIndices[TargetRegisterInfo::FirstVirtualRegister];
-  std::fill(KillIndices, array_endof(KillIndices), -1);
-  // The index of the most recent complete def (proceding bottom up), or -1 if
+  std::fill(KillIndices, array_endof(KillIndices), ~0u);
+  // The index of the most recent complete def (proceding bottom up), or ~0u if
   // the register is live.
   unsigned DefIndices[TargetRegisterInfo::FirstVirtualRegister];
   std::fill(DefIndices, array_endof(DefIndices), BB->size());
@@ -234,13 +234,13 @@
       unsigned Reg = *I;
       Classes[Reg] = reinterpret_cast<TargetRegisterClass *>(-1);
       KillIndices[Reg] = BB->size();
-      DefIndices[Reg] = -1;
+      DefIndices[Reg] = ~0u;
       // Repeat, for all aliases.
       for (const unsigned *Alias = TRI->getAliasSet(Reg); *Alias; ++Alias) {
         unsigned AliasReg = *Alias;
         Classes[AliasReg] = reinterpret_cast<TargetRegisterClass *>(-1);
         KillIndices[AliasReg] = BB->size();
-        DefIndices[AliasReg] = -1;
+        DefIndices[AliasReg] = ~0u;
       }
     }
   else
@@ -252,13 +252,13 @@
         unsigned Reg = *I;
         Classes[Reg] = reinterpret_cast<TargetRegisterClass *>(-1);
         KillIndices[Reg] = BB->size();
-        DefIndices[Reg] = -1;
+        DefIndices[Reg] = ~0u;
         // Repeat, for all aliases.
         for (const unsigned *Alias = TRI->getAliasSet(Reg); *Alias; ++Alias) {
           unsigned AliasReg = *Alias;
           Classes[AliasReg] = reinterpret_cast<TargetRegisterClass *>(-1);
           KillIndices[AliasReg] = BB->size();
-          DefIndices[AliasReg] = -1;
+          DefIndices[AliasReg] = ~0u;
         }
       }
 
@@ -275,13 +275,13 @@
     unsigned Reg = *I;
     Classes[Reg] = reinterpret_cast<TargetRegisterClass *>(-1);
     KillIndices[Reg] = BB->size();
-    DefIndices[Reg] = -1;
+    DefIndices[Reg] = ~0u;
     // Repeat, for all aliases.
     for (const unsigned *Alias = TRI->getAliasSet(Reg); *Alias; ++Alias) {
       unsigned AliasReg = *Alias;
       Classes[AliasReg] = reinterpret_cast<TargetRegisterClass *>(-1);
       KillIndices[AliasReg] = BB->size();
-      DefIndices[AliasReg] = -1;
+      DefIndices[AliasReg] = ~0u;
     }
   }
 
@@ -458,11 +458,11 @@
         if (NewReg == LastNewReg[AntiDepReg]) continue;
         // If NewReg is dead and NewReg's most recent def is not before
         // AntiDepReg's kill, it's safe to replace AntiDepReg with NewReg.
-        assert(((KillIndices[AntiDepReg] == -1u) != (DefIndices[AntiDepReg] == -1u)) &&
+        assert(((KillIndices[AntiDepReg] == ~0u) != (DefIndices[AntiDepReg] == ~0u)) &&
                "Kill and Def maps aren't consistent for AntiDepReg!");
-        assert(((KillIndices[NewReg] == -1u) != (DefIndices[NewReg] == -1u)) &&
+        assert(((KillIndices[NewReg] == ~0u) != (DefIndices[NewReg] == ~0u)) &&
                "Kill and Def maps aren't consistent for NewReg!");
-        if (KillIndices[NewReg] == -1u &&
+        if (KillIndices[NewReg] == ~0u &&
             Classes[NewReg] != reinterpret_cast<TargetRegisterClass *>(-1) &&
             KillIndices[AntiDepReg] <= DefIndices[NewReg]) {
           DOUT << "Breaking anti-dependence edge on "
@@ -488,7 +488,7 @@
 
           Classes[AntiDepReg] = 0;
           DefIndices[AntiDepReg] = KillIndices[AntiDepReg];
-          KillIndices[AntiDepReg] = -1;
+          KillIndices[AntiDepReg] = ~0u;
 
           RegRefs.erase(AntiDepReg);
           Changed = true;
@@ -511,7 +511,7 @@
       if (MI->isRegReDefinedByTwoAddr(i)) continue;
 
       DefIndices[Reg] = Count;
-      KillIndices[Reg] = -1;
+      KillIndices[Reg] = ~0u;
       Classes[Reg] = 0;
       RegRefs.erase(Reg);
       // Repeat, for all subregs.
@@ -519,7 +519,7 @@
            *Subreg; ++Subreg) {
         unsigned SubregReg = *Subreg;
         DefIndices[SubregReg] = Count;
-        KillIndices[SubregReg] = -1;
+        KillIndices[SubregReg] = ~0u;
         Classes[SubregReg] = 0;
         RegRefs.erase(SubregReg);
       }
@@ -550,21 +550,21 @@
       RegRefs.insert(std::make_pair(Reg, &MO));
 
       // It wasn't previously live but now it is, this is a kill.
-      if (KillIndices[Reg] == -1u) {
+      if (KillIndices[Reg] == ~0u) {
         KillIndices[Reg] = Count;
-        DefIndices[Reg] = -1u;
+        DefIndices[Reg] = ~0u;
       }
       // Repeat, for all aliases.
       for (const unsigned *Alias = TRI->getAliasSet(Reg); *Alias; ++Alias) {
         unsigned AliasReg = *Alias;
-        if (KillIndices[AliasReg] == -1u) {
+        if (KillIndices[AliasReg] == ~0u) {
           KillIndices[AliasReg] = Count;
-          DefIndices[AliasReg] = -1u;
+          DefIndices[AliasReg] = ~0u;
         }
       }
     }
   }
-  assert(Count == -1u && "Count mismatch!");
+  assert(Count == ~0u && "Count mismatch!");
 
   return Changed;
 }




From isanbard at gmail.com  Fri Dec 19 16:25:01 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 19 Dec 2008 22:25:01 -0000
Subject: [llvm-commits] [llvm] r61264 -
	/llvm/trunk/test/DebugInfo/printdbginfo.ll
Message-ID: <200812192225.mBJMP2Rw004981@zion.cs.uiuc.edu>

Author: void
Date: Fri Dec 19 16:25:01 2008
New Revision: 61264

URL: http://llvm.org/viewvc/llvm-project?rev=61264&view=rev
Log:
Un-XFAIL this test because it's passing and John doesn't seem interested in un-XFAILing it.

Modified:
    llvm/trunk/test/DebugInfo/printdbginfo.ll

Modified: llvm/trunk/test/DebugInfo/printdbginfo.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/printdbginfo.ll?rev=61264&r1=61263&r2=61264&view=diff

==============================================================================
--- llvm/trunk/test/DebugInfo/printdbginfo.ll (original)
+++ llvm/trunk/test/DebugInfo/printdbginfo.ll Fri Dec 19 16:25:01 2008
@@ -2,7 +2,6 @@
 ; RUN: %prcontext {function name: Bar::bar return type: int at line 12} 1 < %t1 | grep {(tst.cpp:14)}
 ; RUN: %prcontext {%%tmp1} 1 < %t1 | grep -E {variable tmp.+at line 23}
 ; RUN: %prcontext {; tst.cpp:24} 2 < %t1 | grep {%%6}
-; XFAIL: *
 	%llvm.dbg.anchor.type = type { i32, i32 }
 	%llvm.dbg.basictype.type = type { i32, { }*, i8*, { }*, i32, i64, i64, i64, i32, i32 }
 	%llvm.dbg.compile_unit.type = type { i32, { }*, i32, i8*, i8*, i8* }




From isanbard at gmail.com  Fri Dec 19 16:28:24 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 19 Dec 2008 22:28:24 -0000
Subject: [llvm-commits] [llvm] r61265 -
	/llvm/trunk/test/DebugInfo/printdbginfo.ll
Message-ID: <200812192228.mBJMSOsD005101@zion.cs.uiuc.edu>

Author: void
Date: Fri Dec 19 16:28:23 2008
New Revision: 61265

URL: http://llvm.org/viewvc/llvm-project?rev=61265&view=rev
Log:
More precise XFAIL.

Modified:
    llvm/trunk/test/DebugInfo/printdbginfo.ll

Modified: llvm/trunk/test/DebugInfo/printdbginfo.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/printdbginfo.ll?rev=61265&r1=61264&r2=61265&view=diff

==============================================================================
--- llvm/trunk/test/DebugInfo/printdbginfo.ll (original)
+++ llvm/trunk/test/DebugInfo/printdbginfo.ll Fri Dec 19 16:28:23 2008
@@ -2,6 +2,7 @@
 ; RUN: %prcontext {function name: Bar::bar return type: int at line 12} 1 < %t1 | grep {(tst.cpp:14)}
 ; RUN: %prcontext {%%tmp1} 1 < %t1 | grep -E {variable tmp.+at line 23}
 ; RUN: %prcontext {; tst.cpp:24} 2 < %t1 | grep {%%6}
+; XFAIL: alpha|ia64|arm|linux
 	%llvm.dbg.anchor.type = type { i32, i32 }
 	%llvm.dbg.basictype.type = type { i32, { }*, i8*, { }*, i32, i64, i64, i64, i32, i32 }
 	%llvm.dbg.compile_unit.type = type { i32, { }*, i32, i8*, i8*, i8* }




From criswell at uiuc.edu  Fri Dec 19 17:08:13 2008
From: criswell at uiuc.edu (John Criswell)
Date: Fri, 19 Dec 2008 23:08:13 -0000
Subject: [llvm-commits] [poolalloc] r61267 -
 /poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h
Message-ID: <200812192308.mBJN8ETv006433@zion.cs.uiuc.edu>

Author: criswell
Date: Fri Dec 19 17:08:12 2008
New Revision: 61267

URL: http://llvm.org/viewvc/llvm-project?rev=61267&view=rev
Log:
Changed __clear_internal() to use a completely iterative implementation.

Modified:
    poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h

Modified: poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h?rev=61267&r1=61266&r2=61267&view=diff

==============================================================================
--- poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h (original)
+++ poolalloc/trunk/include/poolalloc_runtime/Support/SplayTree.h Fri Dec 19 17:08:12 2008
@@ -118,40 +118,38 @@
     return 0;
   }
 
-  void __clear_internal(std::vector<tree_node *> & stack) {
-    //
-    // If the stack has no elements, we are done.
-    //
-    if (stack.size() == 0)
-      return;
-
-    //
-    // Otherwise, pop off the last element, add its children to the stack,
-    // and delete it.
-    //
-    tree_node * t = stack.back();
-    if (t == 0)
-      return;
-    stack.pop_back();
-    stack.push_back (t->left);
-    stack.push_back (t->right);
-    __node_alloc.destroy(t);
-    __node_alloc.deallocate(t, 1);
-    __clear_internal (stack);
-  }
-
-  void __clear_internal(tree_node* t) {
+  void __clear_internal(tree_node* tree) {
     //
     // If there is no node, then simply return.
     //
-    if (!t) return;
+    if (!tree) return;
+
+    // The set of elements yet to process
+    std::vector<tree_node *> stack;
+    stack.push_back (tree);
 
     //
-    // Otherwise, start deleting elements!
+    // Begin deleting elements.
     //
-    std::vector<tree_node *> stack;
-    stack.push_back (t);
-    __clear_internal (stack);
+    while (stack.size()) {
+      //
+      // Remove the last node of the tree.
+      //
+      tree_node * t = stack.back();
+      stack.pop_back();
+
+      //
+      // Push on to the stack for later processing the children.
+      //
+      if (t->left)  stack.push_back (t->left);
+      if (t->right) stack.push_back (t->right);
+
+      //
+      // Delete the element.
+      //
+      __node_alloc.destroy(t);
+      __node_alloc.deallocate(t, 1);
+    }
   }
 
   template<class O>




From clattner at apple.com  Fri Dec 19 17:21:20 2008
From: clattner at apple.com (Chris Lattner)
Date: Fri, 19 Dec 2008 15:21:20 -0800
Subject: [llvm-commits] [llvm] r61248 - in /llvm/trunk:
	lib/Transforms/Scalar/CodeGenPrepare.cpp
	test/CodeGen/X86/critical-edge-split.ll
	test/CodeGen/X86/remat-mov0.ll
In-Reply-To: <200812191803.mBJI3Q6l028812@zion.cs.uiuc.edu>
References: <200812191803.mBJI3Q6l028812@zion.cs.uiuc.edu>
Message-ID: <20F15299-12D5-425C-BDE7-19DF9565A06B@apple.com>


On Dec 19, 2008, at 10:03 AM, Evan Cheng wrote:

> Author: evancheng
> Date: Fri Dec 19 12:03:11 2008
> New Revision: 61248
>
> URL: http://llvm.org/viewvc/llvm-project?rev=61248&view=rev
> Log:
> - CodeGenPrepare does not split loop back edges but it only knows  
> about back edges of single block loops. It now does a DFS walk to  
> find loop back edges.
> - Use SplitBlockPredecessors to factor out common predecessors of  
> the critical edge destination. This is disabled for now due to some  
> regressions.

hi Evan,

Does EliminateMostlyEmptyBlocks or anything else delete blocks from  
the function?  If so, can it delete backedges?  If so, you should  
remove them from the backedge set.

-Chris



From evan.cheng at apple.com  Fri Dec 19 18:51:46 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Fri, 19 Dec 2008 16:51:46 -0800
Subject: [llvm-commits] [llvm] r61250 -
	/llvm/trunk/lib/Target/X86/X86Instr64bit.td
In-Reply-To: <200812191825.mBJIPWYT029509@zion.cs.uiuc.edu>
References: <200812191825.mBJIPWYT029509@zion.cs.uiuc.edu>
Message-ID: <7E63845A-86B2-4CD0-A538-180D58BF88A6@apple.com>


On Dec 19, 2008, at 10:25 AM, Dan Gohman wrote:

> Author: djg
> Date: Fri Dec 19 12:25:21 2008
> New Revision: 61250
>
> URL: http://llvm.org/viewvc/llvm-project?rev=61250&view=rev
> Log:
> Move the patterns which have i8 immediates before the patterns
> that have i32 immediates so that they get selected first. This
> currently only matters in the JIT, as assemblers will
> automatically use the smallest encoding.


Ugh. We can't assume source order has anything to do with selection  
order. Perhaps we can add some kind of code to these PatLeaf's?

Evan

>
>
> Modified:
>    llvm/trunk/lib/Target/X86/X86Instr64bit.td
>
> Modified: llvm/trunk/lib/Target/X86/X86Instr64bit.td
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Instr64bit.td?rev=61250&r1=61249&r2=61250&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm/trunk/lib/Target/X86/X86Instr64bit.td (original)
> +++ llvm/trunk/lib/Target/X86/X86Instr64bit.td Fri Dec 19 12:25:21  
> 2008
> @@ -43,6 +43,12 @@
> // Pattern fragments.
> //
>
> +def i64immSExt8  : PatLeaf<(i64 imm), [{
> +  // i64immSExt8 predicate - True if the 64-bit immediate fits in a  
> 8-bit
> +  // sign extended field.
> +  return (int64_t)N->getZExtValue() == (int8_t)N->getZExtValue();
> +}]>;
> +
> def i64immSExt32  : PatLeaf<(i64 imm), [{
>   // i64immSExt32 predicate - True if the 64-bit immediate fits in a  
> 32-bit
>   // sign extended field.
> @@ -55,12 +61,6 @@
>   return (uint64_t)N->getZExtValue() == (uint32_t)N->getZExtValue();
> }]>;
>
> -def i64immSExt8  : PatLeaf<(i64 imm), [{
> -  // i64immSExt8 predicate - True if the 64-bit immediate fits in a  
> 8-bit
> -  // sign extended field.
> -  return (int64_t)N->getZExtValue() == (int8_t)N->getZExtValue();
> -}]>;
> -
> def sextloadi64i8  : PatFrag<(ops node:$ptr), (i64 (sextloadi8 node: 
> $ptr))>;
> def sextloadi64i16 : PatFrag<(ops node:$ptr), (i64 (sextloadi16 node: 
> $ptr))>;
> def sextloadi64i32 : PatFrag<(ops node:$ptr), (i64 (sextloadi32 node: 
> $ptr))>;
> @@ -319,14 +319,14 @@
>                      (implicit EFLAGS)]>;
>
> // Register-Integer Addition
> -def ADD64ri32 : RIi32<0x81, MRM0r, (outs GR64:$dst), (ins  
> GR64:$src1, i64i32imm:$src2),
> -                      "add{q}\t{$src2, $dst|$dst, $src2}",
> -                      [(set GR64:$dst, (add GR64:$src1,  
> i64immSExt32:$src2)),
> -                       (implicit EFLAGS)]>;
> def ADD64ri8  : RIi8<0x83, MRM0r, (outs GR64:$dst), (ins GR64:$src1,  
> i64i8imm:$src2),
>                      "add{q}\t{$src2, $dst|$dst, $src2}",
>                      [(set GR64:$dst, (add GR64:$src1,  
> i64immSExt8:$src2)),
>                       (implicit EFLAGS)]>;
> +def ADD64ri32 : RIi32<0x81, MRM0r, (outs GR64:$dst), (ins  
> GR64:$src1, i64i32imm:$src2),
> +                      "add{q}\t{$src2, $dst|$dst, $src2}",
> +                      [(set GR64:$dst, (add GR64:$src1,  
> i64immSExt32:$src2)),
> +                       (implicit EFLAGS)]>;
> } // isConvertibleToThreeAddress
>
> // Register-Memory Addition
> @@ -341,14 +341,14 @@
>                   "add{q}\t{$src2, $dst|$dst, $src2}",
>                   [(store (add (load addr:$dst), GR64:$src2), addr: 
> $dst),
>                    (implicit EFLAGS)]>;
> -def ADD64mi32 : RIi32<0x81, MRM0m, (outs), (ins i64mem:$dst,  
> i64i32imm :$src2),
> -                      "add{q}\t{$src2, $dst|$dst, $src2}",
> -               [(store (add (load addr:$dst), i64immSExt32:$src2),  
> addr:$dst),
> -                (implicit EFLAGS)]>;
> def ADD64mi8 : RIi8<0x83, MRM0m, (outs), (ins i64mem:$dst, i64i8imm : 
> $src2),
>                     "add{q}\t{$src2, $dst|$dst, $src2}",
>                 [(store (add (load addr:$dst), i64immSExt8:$src2),  
> addr:$dst),
>                  (implicit EFLAGS)]>;
> +def ADD64mi32 : RIi32<0x81, MRM0m, (outs), (ins i64mem:$dst,  
> i64i32imm :$src2),
> +                      "add{q}\t{$src2, $dst|$dst, $src2}",
> +               [(store (add (load addr:$dst), i64immSExt32:$src2),  
> addr:$dst),
> +                (implicit EFLAGS)]>;
>
> let Uses = [EFLAGS] in {
> let isTwoAddress = 1 in {
> @@ -361,23 +361,23 @@
>                   "adc{q}\t{$src2, $dst|$dst, $src2}",
>                   [(set GR64:$dst, (adde GR64:$src1, (load addr: 
> $src2)))]>;
>
> -def ADC64ri32 : RIi32<0x81, MRM2r, (outs GR64:$dst), (ins  
> GR64:$src1, i64i32imm:$src2),
> -                      "adc{q}\t{$src2, $dst|$dst, $src2}",
> -                      [(set GR64:$dst, (adde GR64:$src1,  
> i64immSExt32:$src2))]>;
> def ADC64ri8 : RIi8<0x83, MRM2r, (outs GR64:$dst), (ins GR64:$src1,  
> i64i8imm:$src2),
>                     "adc{q}\t{$src2, $dst|$dst, $src2}",
>                     [(set GR64:$dst, (adde GR64:$src1,  
> i64immSExt8:$src2))]>;
> +def ADC64ri32 : RIi32<0x81, MRM2r, (outs GR64:$dst), (ins  
> GR64:$src1, i64i32imm:$src2),
> +                      "adc{q}\t{$src2, $dst|$dst, $src2}",
> +                      [(set GR64:$dst, (adde GR64:$src1,  
> i64immSExt32:$src2))]>;
> } // isTwoAddress
>
> def ADC64mr  : RI<0x11, MRMDestMem, (outs), (ins i64mem:$dst,  
> GR64:$src2),
>                   "adc{q}\t{$src2, $dst|$dst, $src2}",
>                   [(store (adde (load addr:$dst), GR64:$src2), addr: 
> $dst)]>;
> -def ADC64mi32 : RIi32<0x81, MRM2m, (outs), (ins i64mem:$dst,  
> i64i32imm:$src2),
> -                      "adc{q}\t{$src2, $dst|$dst, $src2}",
> -                 [(store (adde (load addr:$dst),  
> i64immSExt8:$src2), addr:$dst)]>;
> def ADC64mi8 : RIi8<0x83, MRM2m, (outs), (ins i64mem:$dst, i64i8imm : 
> $src2),
>                     "adc{q}\t{$src2, $dst|$dst, $src2}",
>                  [(store (adde (load addr:$dst), i64immSExt8:$src2),  
> addr:$dst)]>;
> +def ADC64mi32 : RIi32<0x81, MRM2m, (outs), (ins i64mem:$dst,  
> i64i32imm:$src2),
> +                      "adc{q}\t{$src2, $dst|$dst, $src2}",
> +                 [(store (adde (load addr:$dst),  
> i64immSExt8:$src2), addr:$dst)]>;
> } // Uses = [EFLAGS]
>
> let isTwoAddress = 1 in {
> @@ -394,16 +394,16 @@
>                    (implicit EFLAGS)]>;
>
> // Register-Integer Subtraction
> -def SUB64ri32 : RIi32<0x81, MRM5r, (outs GR64:$dst),
> -                                   (ins GR64:$src1, i64i32imm:$src2),
> -                      "sub{q}\t{$src2, $dst|$dst, $src2}",
> -                      [(set GR64:$dst, (sub GR64:$src1,  
> i64immSExt32:$src2)),
> -                       (implicit EFLAGS)]>;
> def SUB64ri8 : RIi8<0x83, MRM5r, (outs GR64:$dst),
>                                  (ins GR64:$src1, i64i8imm:$src2),
>                     "sub{q}\t{$src2, $dst|$dst, $src2}",
>                     [(set GR64:$dst, (sub GR64:$src1,  
> i64immSExt8:$src2)),
>                      (implicit EFLAGS)]>;
> +def SUB64ri32 : RIi32<0x81, MRM5r, (outs GR64:$dst),
> +                                   (ins GR64:$src1, i64i32imm:$src2),
> +                      "sub{q}\t{$src2, $dst|$dst, $src2}",
> +                      [(set GR64:$dst, (sub GR64:$src1,  
> i64immSExt32:$src2)),
> +                       (implicit EFLAGS)]>;
> } // isTwoAddress
>
> // Memory-Register Subtraction
> @@ -413,16 +413,16 @@
>                    (implicit EFLAGS)]>;
>
> // Memory-Integer Subtraction
> -def SUB64mi32 : RIi32<0x81, MRM5m, (outs), (ins i64mem:$dst,  
> i64i32imm:$src2),
> -                      "sub{q}\t{$src2, $dst|$dst, $src2}",
> -                      [(store (sub (load addr:$dst),  
> i64immSExt32:$src2),
> -                              addr:$dst),
> -                       (implicit EFLAGS)]>;
> def SUB64mi8 : RIi8<0x83, MRM5m, (outs), (ins i64mem:$dst, i64i8imm : 
> $src2),
>                     "sub{q}\t{$src2, $dst|$dst, $src2}",
>                     [(store (sub (load addr:$dst), i64immSExt8:$src2),
>                             addr:$dst),
>                      (implicit EFLAGS)]>;
> +def SUB64mi32 : RIi32<0x81, MRM5m, (outs), (ins i64mem:$dst,  
> i64i32imm:$src2),
> +                      "sub{q}\t{$src2, $dst|$dst, $src2}",
> +                      [(store (sub (load addr:$dst),  
> i64immSExt32:$src2),
> +                              addr:$dst),
> +                       (implicit EFLAGS)]>;
>
> let Uses = [EFLAGS] in {
> let isTwoAddress = 1 in {
> @@ -434,23 +434,23 @@
>                   "sbb{q}\t{$src2, $dst|$dst, $src2}",
>                   [(set GR64:$dst, (sube GR64:$src1, (load addr: 
> $src2)))]>;
>
> -def SBB64ri32 : RIi32<0x81, MRM3r, (outs GR64:$dst), (ins  
> GR64:$src1, i64i32imm:$src2),
> -                      "sbb{q}\t{$src2, $dst|$dst, $src2}",
> -                      [(set GR64:$dst, (sube GR64:$src1,  
> i64immSExt32:$src2))]>;
> def SBB64ri8 : RIi8<0x83, MRM3r, (outs GR64:$dst), (ins GR64:$src1,  
> i64i8imm:$src2),
>                     "sbb{q}\t{$src2, $dst|$dst, $src2}",
>                     [(set GR64:$dst, (sube GR64:$src1,  
> i64immSExt8:$src2))]>;
> +def SBB64ri32 : RIi32<0x81, MRM3r, (outs GR64:$dst), (ins  
> GR64:$src1, i64i32imm:$src2),
> +                      "sbb{q}\t{$src2, $dst|$dst, $src2}",
> +                      [(set GR64:$dst, (sube GR64:$src1,  
> i64immSExt32:$src2))]>;
> } // isTwoAddress
>
> def SBB64mr  : RI<0x19, MRMDestMem, (outs), (ins i64mem:$dst,  
> GR64:$src2),
>                   "sbb{q}\t{$src2, $dst|$dst, $src2}",
>                   [(store (sube (load addr:$dst), GR64:$src2), addr: 
> $dst)]>;
> -def SBB64mi32 : RIi32<0x81, MRM3m, (outs), (ins i64mem:$dst,  
> i64i32imm:$src2),
> -                      "sbb{q}\t{$src2, $dst|$dst, $src2}",
> -              [(store (sube (load addr:$dst), i64immSExt32:$src2),  
> addr:$dst)]>;
> def SBB64mi8 : RIi8<0x83, MRM3m, (outs), (ins i64mem:$dst, i64i8imm : 
> $src2),
>                     "sbb{q}\t{$src2, $dst|$dst, $src2}",
>                [(store (sube (load addr:$dst), i64immSExt8:$src2),  
> addr:$dst)]>;
> +def SBB64mi32 : RIi32<0x81, MRM3m, (outs), (ins i64mem:$dst,  
> i64i32imm:$src2),
> +                      "sbb{q}\t{$src2, $dst|$dst, $src2}",
> +              [(store (sube (load addr:$dst), i64immSExt32:$src2),  
> addr:$dst)]>;
> } // Uses = [EFLAGS]
> } // Defs = [EFLAGS]
>
> @@ -491,30 +491,30 @@
> // Suprisingly enough, these are not two address instructions!
>
> // Register-Integer Signed Integer Multiplication
> -def IMUL64rri32 : RIi32<0x69, MRMSrcReg,                    // GR64  
> = GR64*I32
> -                        (outs GR64:$dst), (ins GR64:$src1,  
> i64i32imm:$src2),
> -                        "imul{q}\t{$src2, $src1, $dst|$dst, $src1,  
> $src2}",
> -                       [(set GR64:$dst, (mul GR64:$src1,  
> i64immSExt32:$src2)),
> -                        (implicit EFLAGS)]>;
> def IMUL64rri8 : RIi8<0x6B, MRMSrcReg,                      // GR64  
> = GR64*I8
>                       (outs GR64:$dst), (ins GR64:$src1, i64i8imm: 
> $src2),
>                       "imul{q}\t{$src2, $src1, $dst|$dst, $src1,  
> $src2}",
>                       [(set GR64:$dst, (mul GR64:$src1,  
> i64immSExt8:$src2)),
>                        (implicit EFLAGS)]>;
> +def IMUL64rri32 : RIi32<0x69, MRMSrcReg,                    // GR64  
> = GR64*I32
> +                        (outs GR64:$dst), (ins GR64:$src1,  
> i64i32imm:$src2),
> +                        "imul{q}\t{$src2, $src1, $dst|$dst, $src1,  
> $src2}",
> +                       [(set GR64:$dst, (mul GR64:$src1,  
> i64immSExt32:$src2)),
> +                        (implicit EFLAGS)]>;
>
> // Memory-Integer Signed Integer Multiplication
> -def IMUL64rmi32 : RIi32<0x69, MRMSrcMem,                   // GR64  
> = [mem64]*I32
> -                        (outs GR64:$dst), (ins i64mem:$src1,  
> i64i32imm:$src2),
> -                        "imul{q}\t{$src2, $src1, $dst|$dst, $src1,  
> $src2}",
> -                        [(set GR64:$dst, (mul (load addr:$src1),
> -                                              i64immSExt32:$src2)),
> -                         (implicit EFLAGS)]>;
> def IMUL64rmi8 : RIi8<0x6B, MRMSrcMem,                      // GR64  
> = [mem64]*I8
>                       (outs GR64:$dst), (ins i64mem:$src1, i64i8imm:  
> $src2),
>                       "imul{q}\t{$src2, $src1, $dst|$dst, $src1,  
> $src2}",
>                       [(set GR64:$dst, (mul (load addr:$src1),
>                                             i64immSExt8:$src2)),
>                        (implicit EFLAGS)]>;
> +def IMUL64rmi32 : RIi32<0x69, MRMSrcMem,                   // GR64  
> = [mem64]*I32
> +                        (outs GR64:$dst), (ins i64mem:$src1,  
> i64i32imm:$src2),
> +                        "imul{q}\t{$src2, $src1, $dst|$dst, $src1,  
> $src2}",
> +                        [(set GR64:$dst, (mul (load addr:$src1),
> +                                              i64immSExt32:$src2)),
> +                         (implicit EFLAGS)]>;
> } // Defs = [EFLAGS]
>
> // Unsigned division / remainder
> @@ -783,28 +783,28 @@
>                   (outs GR64:$dst), (ins GR64:$src1, i64mem:$src2),
>                   "and{q}\t{$src2, $dst|$dst, $src2}",
>                   [(set GR64:$dst, (and GR64:$src1, (load addr: 
> $src2)))]>;
> -def AND64ri32  : RIi32<0x81, MRM4r,
> -                       (outs GR64:$dst), (ins GR64:$src1, i64i32imm: 
> $src2),
> -                       "and{q}\t{$src2, $dst|$dst, $src2}",
> -                       [(set GR64:$dst, (and GR64:$src1,  
> i64immSExt32:$src2))]>;
> def AND64ri8 : RIi8<0x83, MRM4r,
>                     (outs GR64:$dst), (ins GR64:$src1, i64i8imm: 
> $src2),
>                     "and{q}\t{$src2, $dst|$dst, $src2}",
>                     [(set GR64:$dst, (and GR64:$src1,  
> i64immSExt8:$src2))]>;
> +def AND64ri32  : RIi32<0x81, MRM4r,
> +                       (outs GR64:$dst), (ins GR64:$src1, i64i32imm: 
> $src2),
> +                       "and{q}\t{$src2, $dst|$dst, $src2}",
> +                       [(set GR64:$dst, (and GR64:$src1,  
> i64immSExt32:$src2))]>;
> } // isTwoAddress
>
> def AND64mr  : RI<0x21, MRMDestMem,
>                   (outs), (ins i64mem:$dst, GR64:$src),
>                   "and{q}\t{$src, $dst|$dst, $src}",
>                   [(store (and (load addr:$dst), GR64:$src), addr: 
> $dst)]>;
> -def AND64mi32  : RIi32<0x81, MRM4m,
> -                       (outs), (ins i64mem:$dst, i64i32imm:$src),
> -                       "and{q}\t{$src, $dst|$dst, $src}",
> -             [(store (and (loadi64 addr:$dst), i64immSExt32:$src),  
> addr:$dst)]>;
> def AND64mi8 : RIi8<0x83, MRM4m,
>                     (outs), (ins i64mem:$dst, i64i8imm :$src),
>                     "and{q}\t{$src, $dst|$dst, $src}",
>                  [(store (and (load addr:$dst), i64immSExt8:$src),  
> addr:$dst)]>;
> +def AND64mi32  : RIi32<0x81, MRM4m,
> +                       (outs), (ins i64mem:$dst, i64i32imm:$src),
> +                       "and{q}\t{$src, $dst|$dst, $src}",
> +             [(store (and (loadi64 addr:$dst), i64immSExt32:$src),  
> addr:$dst)]>;
>
> let isTwoAddress = 1 in {
> let isCommutable = 1 in
> @@ -814,23 +814,23 @@
> def OR64rm   : RI<0x0B, MRMSrcMem , (outs GR64:$dst), (ins  
> GR64:$src1, i64mem:$src2),
>                   "or{q}\t{$src2, $dst|$dst, $src2}",
>                   [(set GR64:$dst, (or GR64:$src1, (load addr: 
> $src2)))]>;
> -def OR64ri32 : RIi32<0x81, MRM1r, (outs GR64:$dst), (ins  
> GR64:$src1, i64i32imm:$src2),
> -                     "or{q}\t{$src2, $dst|$dst, $src2}",
> -                     [(set GR64:$dst, (or GR64:$src1,  
> i64immSExt32:$src2))]>;
> def OR64ri8  : RIi8<0x83, MRM1r, (outs GR64:$dst), (ins GR64:$src1,  
> i64i8imm:$src2),
>                     "or{q}\t{$src2, $dst|$dst, $src2}",
>                     [(set GR64:$dst, (or GR64:$src1,  
> i64immSExt8:$src2))]>;
> +def OR64ri32 : RIi32<0x81, MRM1r, (outs GR64:$dst), (ins  
> GR64:$src1, i64i32imm:$src2),
> +                     "or{q}\t{$src2, $dst|$dst, $src2}",
> +                     [(set GR64:$dst, (or GR64:$src1,  
> i64immSExt32:$src2))]>;
> } // isTwoAddress
>
> def OR64mr : RI<0x09, MRMDestMem, (outs), (ins i64mem:$dst,  
> GR64:$src),
>                 "or{q}\t{$src, $dst|$dst, $src}",
>                 [(store (or (load addr:$dst), GR64:$src), addr: 
> $dst)]>;
> -def OR64mi32 : RIi32<0x81, MRM1m, (outs), (ins i64mem:$dst,  
> i64i32imm:$src),
> -                     "or{q}\t{$src, $dst|$dst, $src}",
> -              [(store (or (loadi64 addr:$dst), i64immSExt32:$src),  
> addr:$dst)]>;
> def OR64mi8  : RIi8<0x83, MRM1m, (outs), (ins i64mem:$dst, i64i8imm: 
> $src),
>                     "or{q}\t{$src, $dst|$dst, $src}",
>                   [(store (or (load addr:$dst), i64immSExt8:$src),  
> addr:$dst)]>;
> +def OR64mi32 : RIi32<0x81, MRM1m, (outs), (ins i64mem:$dst,  
> i64i32imm:$src),
> +                     "or{q}\t{$src, $dst|$dst, $src}",
> +              [(store (or (loadi64 addr:$dst), i64immSExt32:$src),  
> addr:$dst)]>;
>
> let isTwoAddress = 1 in {
> let isCommutable = 1 in
> @@ -840,24 +840,24 @@
> def XOR64rm  : RI<0x33, MRMSrcMem, (outs GR64:$dst), (ins  
> GR64:$src1, i64mem:$src2),
>                   "xor{q}\t{$src2, $dst|$dst, $src2}",
>                   [(set GR64:$dst, (xor GR64:$src1, (load addr: 
> $src2)))]>;
> +def XOR64ri8 : RIi8<0x83, MRM6r,  (outs GR64:$dst), (ins  
> GR64:$src1, i64i8imm:$src2),
> +                    "xor{q}\t{$src2, $dst|$dst, $src2}",
> +                    [(set GR64:$dst, (xor GR64:$src1,  
> i64immSExt8:$src2))]>;
> def XOR64ri32 : RIi32<0x81, MRM6r,
>                       (outs GR64:$dst), (ins GR64:$src1, i64i32imm: 
> $src2),
>                       "xor{q}\t{$src2, $dst|$dst, $src2}",
>                       [(set GR64:$dst, (xor GR64:$src1,  
> i64immSExt32:$src2))]>;
> -def XOR64ri8 : RIi8<0x83, MRM6r,  (outs GR64:$dst), (ins  
> GR64:$src1, i64i8imm:$src2),
> -                    "xor{q}\t{$src2, $dst|$dst, $src2}",
> -                    [(set GR64:$dst, (xor GR64:$src1,  
> i64immSExt8:$src2))]>;
> } // isTwoAddress
>
> def XOR64mr  : RI<0x31, MRMDestMem, (outs), (ins i64mem:$dst,  
> GR64:$src),
>                   "xor{q}\t{$src, $dst|$dst, $src}",
>                   [(store (xor (load addr:$dst), GR64:$src), addr: 
> $dst)]>;
> -def XOR64mi32 : RIi32<0x81, MRM6m, (outs), (ins i64mem:$dst,  
> i64i32imm:$src),
> -                      "xor{q}\t{$src, $dst|$dst, $src}",
> -             [(store (xor (loadi64 addr:$dst), i64immSExt32:$src),  
> addr:$dst)]>;
> def XOR64mi8 : RIi8<0x83, MRM6m, (outs), (ins i64mem:$dst, i64i8imm : 
> $src),
>                     "xor{q}\t{$src, $dst|$dst, $src}",
>                  [(store (xor (load addr:$dst), i64immSExt8:$src),  
> addr:$dst)]>;
> +def XOR64mi32 : RIi32<0x81, MRM6m, (outs), (ins i64mem:$dst,  
> i64i32imm:$src),
> +                      "xor{q}\t{$src, $dst|$dst, $src}",
> +             [(store (xor (loadi64 addr:$dst), i64immSExt32:$src),  
> addr:$dst)]>;
> } // Defs = [EFLAGS]
>
> // 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> @@ -898,23 +898,23 @@
>                  "cmp{q}\t{$src2, $src1|$src1, $src2}",
>                  [(X86cmp GR64:$src1, (loadi64 addr:$src2)),
>                   (implicit EFLAGS)]>;
> +def CMP64ri8 : RIi8<0x83, MRM7r, (outs), (ins GR64:$src1, i64i8imm: 
> $src2),
> +                    "cmp{q}\t{$src2, $src1|$src1, $src2}",
> +                    [(X86cmp GR64:$src1, i64immSExt8:$src2),
> +                     (implicit EFLAGS)]>;
> def CMP64ri32 : RIi32<0x81, MRM7r, (outs), (ins GR64:$src1,  
> i64i32imm:$src2),
>                       "cmp{q}\t{$src2, $src1|$src1, $src2}",
>                       [(X86cmp GR64:$src1, i64immSExt32:$src2),
>                        (implicit EFLAGS)]>;
> +def CMP64mi8 : RIi8<0x83, MRM7m, (outs), (ins i64mem:$src1,  
> i64i8imm:$src2),
> +                    "cmp{q}\t{$src2, $src1|$src1, $src2}",
> +                    [(X86cmp (loadi64 addr:$src1),  
> i64immSExt8:$src2),
> +                     (implicit EFLAGS)]>;
> def CMP64mi32 : RIi32<0x81, MRM7m, (outs),
>                                        (ins i64mem:$src1, i64i32imm: 
> $src2),
>                       "cmp{q}\t{$src2, $src1|$src1, $src2}",
>                       [(X86cmp (loadi64 addr:$src1),  
> i64immSExt32:$src2),
>                        (implicit EFLAGS)]>;
> -def CMP64mi8 : RIi8<0x83, MRM7m, (outs), (ins i64mem:$src1,  
> i64i8imm:$src2),
> -                    "cmp{q}\t{$src2, $src1|$src1, $src2}",
> -                    [(X86cmp (loadi64 addr:$src1),  
> i64immSExt8:$src2),
> -                     (implicit EFLAGS)]>;
> -def CMP64ri8 : RIi8<0x83, MRM7r, (outs), (ins GR64:$src1, i64i8imm: 
> $src2),
> -                    "cmp{q}\t{$src2, $src1|$src1, $src2}",
> -                    [(X86cmp GR64:$src1, i64immSExt8:$src2),
> -                     (implicit EFLAGS)]>;
> } // Defs = [EFLAGS]
>
> // Conditional moves
> @@ -1492,19 +1492,19 @@
>           (ADD64rr GR64:$src1, GR64:$src2)>;
> def : Pat<(addc GR64:$src1, (load addr:$src2)),
>           (ADD64rm GR64:$src1, addr:$src2)>;
> -def : Pat<(addc GR64:$src1, i64immSExt32:$src2),
> -          (ADD64ri32 GR64:$src1, imm:$src2)>;
> def : Pat<(addc GR64:$src1, i64immSExt8:$src2),
>           (ADD64ri8 GR64:$src1, i64immSExt8:$src2)>;
> +def : Pat<(addc GR64:$src1, i64immSExt32:$src2),
> +          (ADD64ri32 GR64:$src1, imm:$src2)>;
>
> def : Pat<(subc GR64:$src1, GR64:$src2),
>           (SUB64rr GR64:$src1, GR64:$src2)>;
> def : Pat<(subc GR64:$src1, (load addr:$src2)),
>           (SUB64rm GR64:$src1, addr:$src2)>;
> -def : Pat<(subc GR64:$src1, imm:$src2),
> -          (SUB64ri32 GR64:$src1, i64immSExt32:$src2)>;
> def : Pat<(subc GR64:$src1, i64immSExt8:$src2),
>           (SUB64ri8 GR64:$src1, i64immSExt8:$src2)>;
> +def : Pat<(subc GR64:$src1, imm:$src2),
> +          (SUB64ri32 GR64:$src1, i64immSExt32:$src2)>;
>
> // 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> // Overflow Patterns
> @@ -1516,12 +1516,12 @@
>           (ADD64rr GR64:$src1, GR64:$src2)>;
>
> // Register-Integer Addition with Overflow
> -def : Pat<(parallel (X86add_ovf GR64:$src1, i64immSExt32:$src2),
> -                    (implicit EFLAGS)),
> -          (ADD64ri32 GR64:$src1, i64immSExt32:$src2)>;
> def : Pat<(parallel (X86add_ovf GR64:$src1, i64immSExt8:$src2),
>                     (implicit EFLAGS)),
>           (ADD64ri8 GR64:$src1, i64immSExt8:$src2)>;
> +def : Pat<(parallel (X86add_ovf GR64:$src1, i64immSExt32:$src2),
> +                    (implicit EFLAGS)),
> +          (ADD64ri32 GR64:$src1, i64immSExt32:$src2)>;
>
> // Register-Memory Addition with Overflow
> def : Pat<(parallel (X86add_ovf GR64:$src1, (load addr:$src2)),
> @@ -1533,14 +1533,14 @@
>                            addr:$dst),
>                     (implicit EFLAGS)),
>           (ADD64mr addr:$dst, GR64:$src2)>;
> -def : Pat<(parallel (store (X86add_ovf (load addr:$dst),  
> i64immSExt32:$src2),
> -                           addr:$dst),
> -                    (implicit EFLAGS)),
> -          (ADD64mi32 addr:$dst, i64immSExt32:$src2)>;
> def : Pat<(parallel (store (X86add_ovf (load addr:$dst),  
> i64immSExt8:$src2),
>                            addr:$dst),
>                     (implicit EFLAGS)),
>           (ADD64mi8 addr:$dst, i64immSExt8:$src2)>;
> +def : Pat<(parallel (store (X86add_ovf (load addr:$dst),  
> i64immSExt32:$src2),
> +                           addr:$dst),
> +                    (implicit EFLAGS)),
> +          (ADD64mi32 addr:$dst, i64immSExt32:$src2)>;
>
> // Register-Register Subtraction with Overflow
> def : Pat<(parallel (X86sub_ovf GR64:$src1, GR64:$src2),
> @@ -1553,12 +1553,12 @@
>           (SUB64rm GR64:$src1, addr:$src2)>;
>
> // Register-Integer Subtraction with Overflow
> -def : Pat<(parallel (X86sub_ovf GR64:$src1, i64immSExt32:$src2),
> -                    (implicit EFLAGS)),
> -          (SUB64ri32 GR64:$src1, i64immSExt32:$src2)>;
> def : Pat<(parallel (X86sub_ovf GR64:$src1, i64immSExt8:$src2),
>                     (implicit EFLAGS)),
>           (SUB64ri8 GR64:$src1, i64immSExt8:$src2)>;
> +def : Pat<(parallel (X86sub_ovf GR64:$src1, i64immSExt32:$src2),
> +                    (implicit EFLAGS)),
> +          (SUB64ri32 GR64:$src1, i64immSExt32:$src2)>;
>
> // Memory-Register Subtraction with Overflow
> def : Pat<(parallel (store (X86sub_ovf (load addr:$dst), GR64:$src2),
> @@ -1567,14 +1567,14 @@
>           (SUB64mr addr:$dst, GR64:$src2)>;
>
> // Memory-Integer Subtraction with Overflow
> -def : Pat<(parallel (store (X86sub_ovf (load addr:$dst),  
> i64immSExt32:$src2),
> -                           addr:$dst),
> -                    (implicit EFLAGS)),
> -          (SUB64mi32 addr:$dst, i64immSExt32:$src2)>;
> def : Pat<(parallel (store (X86sub_ovf (load addr:$dst),  
> i64immSExt8:$src2),
>                            addr:$dst),
>                     (implicit EFLAGS)),
>           (SUB64mi8 addr:$dst, i64immSExt8:$src2)>;
> +def : Pat<(parallel (store (X86sub_ovf (load addr:$dst),  
> i64immSExt32:$src2),
> +                           addr:$dst),
> +                    (implicit EFLAGS)),
> +          (SUB64mi32 addr:$dst, i64immSExt32:$src2)>;
>
> // Register-Register Signed Integer Multiplication with Overflow
> def : Pat<(parallel (X86smul_ovf GR64:$src1, GR64:$src2),
> @@ -1587,20 +1587,20 @@
>           (IMUL64rm GR64:$src1, addr:$src2)>;
>
> // Register-Integer Signed Integer Multiplication with Overflow
> -def : Pat<(parallel (X86smul_ovf GR64:$src1, i64immSExt32:$src2),
> -                    (implicit EFLAGS)),
> -          (IMUL64rri32 GR64:$src1, i64immSExt32:$src2)>;
> def : Pat<(parallel (X86smul_ovf GR64:$src1, i64immSExt8:$src2),
>                     (implicit EFLAGS)),
>           (IMUL64rri8 GR64:$src1, i64immSExt8:$src2)>;
> +def : Pat<(parallel (X86smul_ovf GR64:$src1, i64immSExt32:$src2),
> +                    (implicit EFLAGS)),
> +          (IMUL64rri32 GR64:$src1, i64immSExt32:$src2)>;
>
> // Memory-Integer Signed Integer Multiplication with Overflow
> -def : Pat<(parallel (X86smul_ovf (load addr:$src1),  
> i64immSExt32:$src2),
> -                    (implicit EFLAGS)),
> -          (IMUL64rmi32 addr:$src1, i64immSExt32:$src2)>;
> def : Pat<(parallel (X86smul_ovf (load addr:$src1),  
> i64immSExt8:$src2),
>                     (implicit EFLAGS)),
>           (IMUL64rmi8 addr:$src1, i64immSExt8:$src2)>;
> +def : Pat<(parallel (X86smul_ovf (load addr:$src1),  
> i64immSExt32:$src2),
> +                    (implicit EFLAGS)),
> +          (IMUL64rmi32 addr:$src1, i64immSExt32:$src2)>;
>
> // 
> = 
> = 
> = 
> ----------------------------------------------------------------------= 
> ==//
> // X86-64 SSE Instructions
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From gohman at apple.com  Fri Dec 19 19:08:14 2008
From: gohman at apple.com (Dan Gohman)
Date: Fri, 19 Dec 2008 17:08:14 -0800
Subject: [llvm-commits] [llvm] r61250 -
	/llvm/trunk/lib/Target/X86/X86Instr64bit.td
In-Reply-To: <7E63845A-86B2-4CD0-A538-180D58BF88A6@apple.com>
References: <200812191825.mBJIPWYT029509@zion.cs.uiuc.edu>
	<7E63845A-86B2-4CD0-A538-180D58BF88A6@apple.com>
Message-ID: <89CA9C1F-A80C-4FAE-BAC8-AA5E94AF24F2@apple.com>


On Dec 19, 2008, at 4:51 PM, Evan Cheng wrote:

>
> On Dec 19, 2008, at 10:25 AM, Dan Gohman wrote:
>
>> Author: djg
>> Date: Fri Dec 19 12:25:21 2008
>> New Revision: 61250
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=61250&view=rev
>> Log:
>> Move the patterns which have i8 immediates before the patterns
>> that have i32 immediates so that they get selected first. This
>> currently only matters in the JIT, as assemblers will
>> automatically use the smallest encoding.
>
>
> Ugh. We can't assume source order has anything to do with selection
> order. Perhaps we can add some kind of code to these PatLeaf's?

I briefly looked at some fancier ways of doing this, but didn't find
anything simple, and I wasn't looking to do anything complicated.
Tablegen uses stable_sort, so source order is effectively
used as a tie-breaker.

Dan



From espindola at google.com  Fri Dec 19 19:38:20 2008
From: espindola at google.com (Rafael Espindola)
Date: Sat, 20 Dec 2008 01:38:20 +0000
Subject: [llvm-commits] [llvm-gcc-4.2] r61128 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
In-Reply-To: <200812170738.mBH7cG9Y013859@zion.cs.uiuc.edu>
References: <200812170738.mBH7cG9Y013859@zion.cs.uiuc.edu>
Message-ID: <38a0d8450812191738v2250c2e1l799b69e6e8c36fa6@mail.gmail.com>

2008/12/17 Evan Cheng <evan.cheng at apple.com>:
> Author: evancheng
> Date: Wed Dec 17 01:37:53 2008
> New Revision: 61128
>
> URL: http://llvm.org/viewvc/llvm-project?rev=61128&view=rev
> Log:
> If this input operand is matching an output operand, e.g. '0', check if this is something that llvm supports. If the operand types are different, then emit an error if 1) one of the types is not integer, 2) if size of input type is larger than the output type. If the size of the integer input size is smaller than the integer output type, then cast it to the larger type and shift the value if the target is big endian.


This broke FD_SET on linux.  An example of preprocessed code

----------------------------------------------------------------
typedef long int __fd_mask;
typedef struct   {
 __fd_mask __fds_bits[1024 / (8 * sizeof (__fd_mask))];
}
 fd_set;
int xmlNanoFTPCheckResponse(void *ctx) {
 fd_set rfd;
 int __d0, __d1;
 __asm__ __volatile__ ("cld; rep; stosl" : "=c" (__d0), "=D" (__d1) :
"a" (0), "0" (sizeof (fd_set) / sizeof (__fd_mask)), "1"
(&(((&rfd))->__fds_bits)[0]) : "memory");
}
-----------------------------------------------------------------------------------------

This is the intended consequence of your patch? Should there be an
explicit cast to intptr_t in the C code?
-- 
Rafael Avila de Espindola

Google | Gordon House | Barrow Street | Dublin 4 | Ireland
Registered in Dublin, Ireland | Registration Number: 368047



From kremenek at apple.com  Fri Dec 19 19:42:36 2008
From: kremenek at apple.com (Ted Kremenek)
Date: Sat, 20 Dec 2008 01:42:36 -0000
Subject: [llvm-commits] [llvm] r61271 - /llvm/tags/checker/checker-137/
Message-ID: <200812200142.mBK1gasX010837@zion.cs.uiuc.edu>

Author: kremenek
Date: Fri Dec 19 19:42:35 2008
New Revision: 61271

URL: http://llvm.org/viewvc/llvm-project?rev=61271&view=rev
Log:
Tagging checker-137.

Added:
    llvm/tags/checker/checker-137/
      - copied from r61270, llvm/trunk/



From gohman at apple.com  Sat Dec 20 10:34:59 2008
From: gohman at apple.com (Dan Gohman)
Date: Sat, 20 Dec 2008 16:34:59 -0000
Subject: [llvm-commits] [llvm] r61276 - in /llvm/trunk:
 lib/CodeGen/ScheduleDAG.cpp test/CodeGen/X86/fold-pcmpeqd-0.ll
 test/CodeGen/X86/pr3241.ll
Message-ID: <200812201634.mBKGYxqJ014919@zion.cs.uiuc.edu>

Author: djg
Date: Sat Dec 20 10:34:57 2008
New Revision: 61276

URL: http://llvm.org/viewvc/llvm-project?rev=61276&view=rev
Log:
Use the correct Preds and Succs lists in setHeightDirty()
and setDepthDirty(), respectively. This fixes PR3241.

Added:
    llvm/trunk/test/CodeGen/X86/pr3241.ll
Modified:
    llvm/trunk/lib/CodeGen/ScheduleDAG.cpp
    llvm/trunk/test/CodeGen/X86/fold-pcmpeqd-0.ll

Modified: llvm/trunk/lib/CodeGen/ScheduleDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/ScheduleDAG.cpp?rev=61276&r1=61275&r2=61276&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/ScheduleDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/ScheduleDAG.cpp Sat Dec 20 10:34:57 2008
@@ -126,8 +126,8 @@
     WorkList.pop_back();
     if (!SU->isDepthCurrent) continue;
     SU->isDepthCurrent = false;
-    for (SUnit::const_succ_iterator I = Succs.begin(),
-         E = Succs.end(); I != E; ++I)
+    for (SUnit::const_succ_iterator I = SU->Succs.begin(),
+         E = SU->Succs.end(); I != E; ++I)
       WorkList.push_back(I->getSUnit());
   }
 }
@@ -140,8 +140,8 @@
     WorkList.pop_back();
     if (!SU->isHeightCurrent) continue;
     SU->isHeightCurrent = false;
-    for (SUnit::const_pred_iterator I = Preds.begin(),
-         E = Preds.end(); I != E; ++I)
+    for (SUnit::const_pred_iterator I = SU->Preds.begin(),
+         E = SU->Preds.end(); I != E; ++I)
       WorkList.push_back(I->getSUnit());
   }
 }

Modified: llvm/trunk/test/CodeGen/X86/fold-pcmpeqd-0.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fold-pcmpeqd-0.ll?rev=61276&r1=61275&r2=61276&view=diff

==============================================================================
--- llvm/trunk/test/CodeGen/X86/fold-pcmpeqd-0.ll (original)
+++ llvm/trunk/test/CodeGen/X86/fold-pcmpeqd-0.ll Sat Dec 20 10:34:57 2008
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin   | grep pcmpeqd | count 1
+; RUN: llvm-as < %s | llc -mtriple=i386-apple-darwin   | not grep pcmpeqd
 ; RUN: llvm-as < %s | llc -mtriple=x86_64-apple-darwin | grep pcmpeqd | count 1
 
 ; This testcase shouldn't need to spill the -1 value,

Added: llvm/trunk/test/CodeGen/X86/pr3241.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/pr3241.ll?rev=61276&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/pr3241.ll (added)
+++ llvm/trunk/test/CodeGen/X86/pr3241.ll Sat Dec 20 10:34:57 2008
@@ -0,0 +1,29 @@
+; RUN: llvm-as < %s | llc -march=x86
+; PR3241
+
+ at g_620 = external global i32
+
+define void @func_18(i32 %p_21) nounwind {
+entry:
+	%t0 = call i32 @func_31(i32 %p_21) nounwind
+	%t1 = call i32 @safe_add_macro_uint32_t_u_u() nounwind
+	%t2 = icmp sgt i32 %t1, 0
+	%t3 = zext i1 %t2 to i32
+	%t4 = load i32* @g_620, align 4
+	%t5 = icmp eq i32 %t3, %t4
+	%t6 = xor i32 %p_21, 1
+	%t7 = call i32 @func_55(i32 %t6) nounwind
+	br i1 %t5, label %return, label %bb
+
+bb:
+	unreachable
+
+return:
+	unreachable
+}
+
+declare i32 @func_31(i32)
+
+declare i32 @safe_add_macro_uint32_t_u_u()
+
+declare i32 @func_55(i32)




From gohman at apple.com  Sat Dec 20 10:42:34 2008
From: gohman at apple.com (Dan Gohman)
Date: Sat, 20 Dec 2008 16:42:34 -0000
Subject: [llvm-commits] [llvm] r61277 -
	/llvm/trunk/lib/CodeGen/ScheduleDAG.cpp
Message-ID: <200812201642.mBKGgYS8015156@zion.cs.uiuc.edu>

Author: djg
Date: Sat Dec 20 10:42:33 2008
New Revision: 61277

URL: http://llvm.org/viewvc/llvm-project?rev=61277&view=rev
Log:
Use SmallVector's pop_back_val.

Modified:
    llvm/trunk/lib/CodeGen/ScheduleDAG.cpp

Modified: llvm/trunk/lib/CodeGen/ScheduleDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/ScheduleDAG.cpp?rev=61277&r1=61276&r2=61277&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/ScheduleDAG.cpp (original)
+++ llvm/trunk/lib/CodeGen/ScheduleDAG.cpp Sat Dec 20 10:42:33 2008
@@ -122,8 +122,7 @@
   SmallVector<SUnit*, 8> WorkList;
   WorkList.push_back(this);
   while (!WorkList.empty()) {
-    SUnit *SU = WorkList.back();
-    WorkList.pop_back();
+    SUnit *SU = WorkList.pop_back_val();
     if (!SU->isDepthCurrent) continue;
     SU->isDepthCurrent = false;
     for (SUnit::const_succ_iterator I = SU->Succs.begin(),
@@ -136,8 +135,7 @@
   SmallVector<SUnit*, 8> WorkList;
   WorkList.push_back(this);
   while (!WorkList.empty()) {
-    SUnit *SU = WorkList.back();
-    WorkList.pop_back();
+    SUnit *SU = WorkList.pop_back_val();
     if (!SU->isHeightCurrent) continue;
     SU->isHeightCurrent = false;
     for (SUnit::const_pred_iterator I = SU->Preds.begin(),




From gohman at apple.com  Sat Dec 20 10:44:41 2008
From: gohman at apple.com (Dan Gohman)
Date: Sat, 20 Dec 2008 16:44:41 -0000
Subject: [llvm-commits] [llvm] r61278 -
	/llvm/trunk/include/llvm/CodeGen/LiveInterval.h
Message-ID: <200812201644.mBKGifgA015224@zion.cs.uiuc.edu>

Author: djg
Date: Sat Dec 20 10:44:40 2008
New Revision: 61278

URL: http://llvm.org/viewvc/llvm-project?rev=61278&view=rev
Log:
LiveInterval::removeKills and isKill don't need 'this' and
can be static member functions.

Modified:
    llvm/trunk/include/llvm/CodeGen/LiveInterval.h

Modified: llvm/trunk/include/llvm/CodeGen/LiveInterval.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveInterval.h?rev=61278&r1=61277&r2=61278&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/LiveInterval.h (original)
+++ llvm/trunk/include/llvm/CodeGen/LiveInterval.h Sat Dec 20 10:44:40 2008
@@ -244,7 +244,7 @@
 
     /// removeKills - Remove all the kills in specified range
     /// [Start, End] of the specified val#.
-    void removeKills(VNInfo *VNI, unsigned Start, unsigned End) {
+    static void removeKills(VNInfo *VNI, unsigned Start, unsigned End) {
       SmallVector<unsigned, 4> &kills = VNI->kills;
       SmallVector<unsigned, 4>::iterator
         I = std::lower_bound(kills.begin(), kills.end(), Start);
@@ -255,7 +255,7 @@
 
     /// isKill - Return true if the specified index is a kill of the
     /// specified val#.
-    bool isKill(const VNInfo *VNI, unsigned KillIdx) const {
+    static bool isKill(const VNInfo *VNI, unsigned KillIdx) {
       const SmallVector<unsigned, 4> &kills = VNI->kills;
       SmallVector<unsigned, 4>::const_iterator
         I = std::lower_bound(kills.begin(), kills.end(), KillIdx);




From nicholas at mxc.ca  Sat Dec 20 10:48:01 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Sat, 20 Dec 2008 16:48:01 -0000
Subject: [llvm-commits] [llvm] r61279 -
	/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200812201648.mBKGm2k5015317@zion.cs.uiuc.edu>

Author: nicholas
Date: Sat Dec 20 10:48:00 2008
New Revision: 61279

URL: http://llvm.org/viewvc/llvm-project?rev=61279&view=rev
Log:
Remove redundant test for vector-nature. Scan the vector first to see whether
our optz'n will apply to it, then build the replacement vector only if needed.

Modified:
    llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=61279&r1=61278&r2=61279&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Sat Dec 20 10:48:00 2008
@@ -3090,11 +3090,17 @@
   }
 
   // If it's a constant vector, flip any negative values positive.
-  if (isa<VectorType>(I.getType())) {
-    if (ConstantVector *RHSV = dyn_cast<ConstantVector>(Op1)) {
-      unsigned VWidth = RHSV->getNumOperands();
-      std::vector<Constant *> Elts(VWidth);
+  if (ConstantVector *RHSV = dyn_cast<ConstantVector>(Op1)) {
+    unsigned VWidth = RHSV->getNumOperands();
+
+    bool hasNegative = false;
+    for (unsigned i = 0; !hasNegative && i != VWidth; ++i)
+      if (ConstantInt *RHS = dyn_cast<ConstantInt>(RHSV->getOperand(i)))
+        if (RHS->getValue().isNegative())
+          hasNegative = true;
 
+    if (hasNegative) {
+      std::vector<Constant *> Elts(VWidth);
       for (unsigned i = 0; i != VWidth; ++i) {
         if (ConstantInt *RHS = dyn_cast<ConstantInt>(RHSV->getOperand(i))) {
           if (RHS->getValue().isNegative())




From gohman at apple.com  Sat Dec 20 11:06:40 2008
From: gohman at apple.com (Dan Gohman)
Date: Sat, 20 Dec 2008 17:06:40 -0000
Subject: [llvm-commits] [llvm] r61280 - /llvm/trunk/include/llvm/Constants.h
Message-ID: <200812201706.mBKH6eLt015892@zion.cs.uiuc.edu>

Author: djg
Date: Sat Dec 20 11:06:39 2008
New Revision: 61280

URL: http://llvm.org/viewvc/llvm-project?rev=61280&view=rev
Log:
Reword the comment for ConstantInt's getLimitedValue.

Modified:
    llvm/trunk/include/llvm/Constants.h

Modified: llvm/trunk/include/llvm/Constants.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Constants.h?rev=61280&r1=61279&r2=61280&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Constants.h (original)
+++ llvm/trunk/include/llvm/Constants.h Sat Dec 20 11:06:39 2008
@@ -195,9 +195,11 @@
     return Val.getActiveBits() > 64 || Val.getZExtValue() >= Num;
   }
 
-  /// @returns the 64-bit value of this constant if its active bits number is 
-  /// not greater than 64, otherwise, just return the given uint64_t number.
-  /// @brief Get the constant's value if possible.
+  /// getLimitedValue - If the value is smaller than the specified limit,
+  /// return it, otherwise return the limit value.  This causes the value
+  /// to saturate to the limit.
+  /// @returns the min of the value of the constant and the specified value
+  /// @brief Get the constant's value with a saturation limit
   uint64_t getLimitedValue(uint64_t Limit = ~0ULL) const {
     return Val.getLimitedValue(Limit);
   }




From gohman at apple.com  Sat Dec 20 11:19:41 2008
From: gohman at apple.com (Dan Gohman)
Date: Sat, 20 Dec 2008 17:19:41 -0000
Subject: [llvm-commits] [llvm] r61281 - in /llvm/trunk:
 lib/Target/X86/X86FastISel.cpp test/CodeGen/X86/fast-isel-shift-imm.ll
Message-ID: <200812201719.mBKHJgO0016299@zion.cs.uiuc.edu>

Author: djg
Date: Sat Dec 20 11:19:40 2008
New Revision: 61281

URL: http://llvm.org/viewvc/llvm-project?rev=61281&view=rev
Log:
Fix fast-isel to not emit invalid assembly when presented with a
constant shift count that doesn't fit in the shift instruction's
immediate field. This fixes PR3242.

Added:
    llvm/trunk/test/CodeGen/X86/fast-isel-shift-imm.ll
Modified:
    llvm/trunk/lib/Target/X86/X86FastISel.cpp

Modified: llvm/trunk/lib/Target/X86/X86FastISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86FastISel.cpp?rev=61281&r1=61280&r2=61281&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86FastISel.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86FastISel.cpp Sat Dec 20 11:19:40 2008
@@ -893,7 +893,7 @@
   if (ConstantInt *CI = dyn_cast<ConstantInt>(I->getOperand(1))) {
     unsigned ResultReg = createResultReg(RC);
     BuildMI(MBB, TII.get(OpImm), 
-            ResultReg).addReg(Op0Reg).addImm(CI->getZExtValue());
+            ResultReg).addReg(Op0Reg).addImm(CI->getZExtValue() & 0xff);
     UpdateValueMap(I, ResultReg);
     return true;
   }

Added: llvm/trunk/test/CodeGen/X86/fast-isel-shift-imm.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/fast-isel-shift-imm.ll?rev=61281&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/X86/fast-isel-shift-imm.ll (added)
+++ llvm/trunk/test/CodeGen/X86/fast-isel-shift-imm.ll Sat Dec 20 11:19:40 2008
@@ -0,0 +1,7 @@
+; RUN: llvm-as < %s | llc -march=x86 -fast | grep {sarl	\$80, %eax}
+; PR3242
+
+define i32 @foo(i32 %x) nounwind {
+  %y = ashr i32 %x, 50000
+  ret i32 %y
+}




From nicholas at mxc.ca  Sat Dec 20 18:19:22 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Sun, 21 Dec 2008 00:19:22 -0000
Subject: [llvm-commits] [llvm] r61297 - in /llvm/trunk:
 lib/Transforms/Scalar/SimplifyLibCalls.cpp
 test/Transforms/SimplifyLibCalls/2008-12-20-StrcmpMemcmp.ll
Message-ID: <200812210019.mBL0JM32028246@zion.cs.uiuc.edu>

Author: nicholas
Date: Sat Dec 20 18:19:21 2008
New Revision: 61297

URL: http://llvm.org/viewvc/llvm-project?rev=61297&view=rev
Log:
Turn strcmp into memcmp, such as strcmp(P, "x") --> memcmp(P, "x", 2).

Added:
    llvm/trunk/test/Transforms/SimplifyLibCalls/2008-12-20-StrcmpMemcmp.ll
Modified:
    llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp

Modified: llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp?rev=61297&r1=61296&r2=61297&view=diff

==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp Sat Dec 20 18:19:21 2008
@@ -80,7 +80,10 @@
   /// EmitMemChr - Emit a call to the memchr function.  This assumes that Ptr is
   /// a pointer, Val is an i32 value, and Len is an 'intptr_t' value.
   Value *EmitMemChr(Value *Ptr, Value *Val, Value *Len, IRBuilder<> &B);
-    
+
+  /// EmitMemCmp - Emit a call to the memcmp function.
+  Value *EmitMemCmp(Value *Ptr1, Value *Ptr2, Value *Len, IRBuilder<> &B);
+
   /// EmitUnaryFloatFnCall - Emit a call to the unary function named 'Name' (e.g.
   /// 'floor').  This function is known to take a single of type matching 'Op'
   /// and returns one value with the same type.  If 'Op' is a long double, 'l'
@@ -106,7 +109,7 @@
   /// EmitFWrite - Emit a call to the fwrite function.  This assumes that Ptr is
   /// a pointer, Size is an 'intptr_t', and File is a pointer to FILE.
   void EmitFWrite(Value *Ptr, Value *Size, Value *File, IRBuilder<> &B);
-    
+  
 };
 } // End anonymous namespace.
 
@@ -151,6 +154,19 @@
   return B.CreateCall3(MemChr, CastToCStr(Ptr, B), Val, Len, "memchr");
 }
 
+/// EmitMemCmp - Emit a call to the memcmp function.
+Value *LibCallOptimization::EmitMemCmp(Value *Ptr1, Value *Ptr2,
+                                       Value *Len, IRBuilder<> &B) {
+  Module *M = Caller->getParent();
+  Value *MemCmp = M->getOrInsertFunction("memcmp",
+                                         Type::Int32Ty,
+                                         PointerType::getUnqual(Type::Int8Ty),
+                                         PointerType::getUnqual(Type::Int8Ty),
+                                         TD->getIntPtrType(), NULL);
+  return B.CreateCall3(MemCmp, CastToCStr(Ptr1, B), CastToCStr(Ptr2, B),
+                       Len, "memcmp");
+}
+
 /// EmitUnaryFloatFnCall - Emit a call to the unary function named 'Name' (e.g.
 /// 'floor').  This function is known to take a single of type matching 'Op' and
 /// returns one value with the same type.  If 'Op' is a long double, 'l' is
@@ -537,6 +553,18 @@
     // strcmp(x, y)  -> cnst  (if both x and y are constant strings)
     if (HasStr1 && HasStr2)
       return ConstantInt::get(CI->getType(), strcmp(Str1.c_str(),Str2.c_str()));
+
+    // strcmp(P, "x") -> memcmp(P, "x", 2)
+    uint64_t Len1 = GetStringLength(Str1P);
+    uint64_t Len2 = GetStringLength(Str2P);
+    if (Len1 || Len2) {
+      // Choose the smallest Len excluding 0 which means 'unknown'.
+      if (!Len1 || (Len2 && Len2 < Len1))
+        Len1 = Len2;
+      return EmitMemCmp(Str1P, Str2P,
+                        ConstantInt::get(TD->getIntPtrType(), Len1), B);
+    }
+
     return 0;
   }
 };

Added: llvm/trunk/test/Transforms/SimplifyLibCalls/2008-12-20-StrcmpMemcmp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SimplifyLibCalls/2008-12-20-StrcmpMemcmp.ll?rev=61297&view=auto

==============================================================================
--- llvm/trunk/test/Transforms/SimplifyLibCalls/2008-12-20-StrcmpMemcmp.ll (added)
+++ llvm/trunk/test/Transforms/SimplifyLibCalls/2008-12-20-StrcmpMemcmp.ll Sat Dec 20 18:19:21 2008
@@ -0,0 +1,10 @@
+; RUN: llvm-as < %s | opt -simplify-libcalls | llvm-dis | grep call.*memcmp
+
+ at .str = internal constant [2 x i8] c"x\00"
+
+declare i32 @strcmp(i8* %dest, i8* %src)
+
+define i32 @foo(i8* %x, i8* %y) {
+  %A = call i32 @strcmp(i8* %x, i8* getelementptr ([2 x i8]* @.str, i32 0, i32 0))
+  ret i32 %A
+}




From eli.friedman at gmail.com  Sat Dec 20 18:38:22 2008
From: eli.friedman at gmail.com (Eli Friedman)
Date: Sat, 20 Dec 2008 16:38:22 -0800
Subject: [llvm-commits] [llvm] r61297 - in /llvm/trunk:
	lib/Transforms/Scalar/SimplifyLibCalls.cpp
	test/Transforms/SimplifyLibCalls/2008-12-20-StrcmpMemcmp.ll
In-Reply-To: <200812210019.mBL0JM32028246@zion.cs.uiuc.edu>
References: <200812210019.mBL0JM32028246@zion.cs.uiuc.edu>
Message-ID: <f5aa3e9b0812201638t46fe16fbpbe9eee35616df142@mail.gmail.com>

On Sat, Dec 20, 2008 at 4:19 PM, Nick Lewycky <nicholas at mxc.ca> wrote:
> Author: nicholas
> Date: Sat Dec 20 18:19:21 2008
> New Revision: 61297
>
> URL: http://llvm.org/viewvc/llvm-project?rev=61297&view=rev
> Log:
> Turn strcmp into memcmp, such as strcmp(P, "x") --> memcmp(P, "x", 2).

I'm pretty sure this isn't safe; take the following testcase:

int foo(char* x) {return strcmp(x, "x", 2) == 0;}

In this case, the strcmp gets turned into a 16-bit load.  However, the
byte after the end of the string isn't guaranteed to be readable.

-Eli


From eli.friedman at gmail.com  Sat Dec 20 18:39:23 2008
From: eli.friedman at gmail.com (Eli Friedman)
Date: Sat, 20 Dec 2008 16:39:23 -0800
Subject: [llvm-commits] [llvm] r61297 - in /llvm/trunk:
	lib/Transforms/Scalar/SimplifyLibCalls.cpp
	test/Transforms/SimplifyLibCalls/2008-12-20-StrcmpMemcmp.ll
In-Reply-To: <f5aa3e9b0812201638t46fe16fbpbe9eee35616df142@mail.gmail.com>
References: <200812210019.mBL0JM32028246@zion.cs.uiuc.edu>
	<f5aa3e9b0812201638t46fe16fbpbe9eee35616df142@mail.gmail.com>
Message-ID: <f5aa3e9b0812201639g2743cc1id9feb975efcdb536@mail.gmail.com>

On Sat, Dec 20, 2008 at 4:38 PM, Eli Friedman <eli.friedman at gmail.com> wrote:
> On Sat, Dec 20, 2008 at 4:19 PM, Nick Lewycky <nicholas at mxc.ca> wrote:
>> Author: nicholas
>> Date: Sat Dec 20 18:19:21 2008
>> New Revision: 61297
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=61297&view=rev
>> Log:
>> Turn strcmp into memcmp, such as strcmp(P, "x") --> memcmp(P, "x", 2).
>
> I'm pretty sure this isn't safe; take the following testcase:
>
> int foo(char* x) {return strcmp(x, "x", 2) == 0;}

Oops, messed that up slightly; try the following:
int foo(char* x) {return strcmp(x, "x") == 0;}

-Eli


From nicholas at mxc.ca  Sat Dec 20 19:03:22 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Sat, 20 Dec 2008 17:03:22 -0800
Subject: [llvm-commits] [llvm] r61297 - in
 /llvm/trunk:	lib/Transforms/Scalar/SimplifyLibCalls.cpp
 test/Transforms/SimplifyLibCalls/2008-12-20-StrcmpMemcmp.ll
In-Reply-To: <f5aa3e9b0812201639g2743cc1id9feb975efcdb536@mail.gmail.com>
References: <200812210019.mBL0JM32028246@zion.cs.uiuc.edu>	<f5aa3e9b0812201638t46fe16fbpbe9eee35616df142@mail.gmail.com>
	<f5aa3e9b0812201639g2743cc1id9feb975efcdb536@mail.gmail.com>
Message-ID: <494D95DA.1030608@mxc.ca>

Eli Friedman wrote:
> On Sat, Dec 20, 2008 at 4:38 PM, Eli Friedman <eli.friedman at gmail.com> wrote:
>> On Sat, Dec 20, 2008 at 4:19 PM, Nick Lewycky <nicholas at mxc.ca> wrote:
>>> Author: nicholas
>>> Date: Sat Dec 20 18:19:21 2008
>>> New Revision: 61297
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=61297&view=rev
>>> Log:
>>> Turn strcmp into memcmp, such as strcmp(P, "x") --> memcmp(P, "x", 2).
>> I'm pretty sure this isn't safe; take the following testcase:
>>
>> int foo(char* x) {return strcmp(x, "x", 2) == 0;}
> 
> Oops, messed that up slightly; try the following:
> int foo(char* x) {return strcmp(x, "x") == 0;}

The pathological case is:

   char x[1] = "\0";  // pretend we don't know its length
   char y[2] = "x\0"; // we know its length
   return strcmp(x, y);

If we transform it into

   return memcmp(x, y, 2)

then the existing MemCmpOpt will exercise these cases:

   // memcmp(S1,S2,2) != 0 -> (*(short*)LHS ^ *(short*)RHS)  != 0
   // memcmp(S1,S2,4) != 0 -> (*(int*)LHS ^ *(int*)RHS)  != 0

resulting in a 2-byte load of x[1], which is illegal.

Could someone comment on what part of this transform is wrong? I recall 
having a discussion about it on IRC, but can't recall the details...

Nick


From monping at apple.com  Sat Dec 20 20:22:07 2008
From: monping at apple.com (Mon Ping Wang)
Date: Sat, 20 Dec 2008 18:22:07 -0800
Subject: [llvm-commits] X86 vector shift patch
Message-ID: <39C8ABBD-7E35-4398-9262-E9FEF7E5DC23@apple.com>

Hi,

This is a patch that allows us to generate X86 vector shifts (psllq,  
psrlq etc..) for some vector shifts (v2i64, v4i32, and v8i16)  where  
the shift amount is the same for all elements.  This particular patch  
does as a target specific  combine pass because it is easier to  
identify the shift amounts before it gets lowered to something else  
(e.g., build vector of constants can be translated into a load from a  
constant pool).  If someone has a better idea of where it should be  
done or have any other comments, please let me know.

Thanks,
   -- Mon Ping

-------------- next part --------------
A non-text attachment was scrubbed...
Name: vshift.patch
Type: application/octet-stream
Size: 11703 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081220/7112901b/attachment.obj 

From eli.friedman at gmail.com  Sat Dec 20 20:58:12 2008
From: eli.friedman at gmail.com (Eli Friedman)
Date: Sat, 20 Dec 2008 18:58:12 -0800
Subject: [llvm-commits] X86 vector shift patch
In-Reply-To: <39C8ABBD-7E35-4398-9262-E9FEF7E5DC23@apple.com>
References: <39C8ABBD-7E35-4398-9262-E9FEF7E5DC23@apple.com>
Message-ID: <f5aa3e9b0812201858k2698bb3eq9ace1e5326e001e3@mail.gmail.com>

On Sat, Dec 20, 2008 at 6:22 PM, Mon Ping Wang <monping at apple.com> wrote:
> Hi,
>
> This is a patch that allows us to generate X86 vector shifts (psllq, psrlq
> etc..) for some vector shifts (v2i64, v4i32, and v8i16)  where the shift
> amount is the same for all elements.  This particular patch does as a target
> specific  combine pass because it is easier to identify the shift amounts
> before it gets lowered to something else (e.g., build vector of constants
> can be translated into a load from a constant pool).  If someone has a
> better idea of where it should be done or have any other comments, please
> let me know.

It isn't impossible to do it during legalize... I've had a patch in my
tree for a while that's reasonably successful at doing that.  I'm
attaching my patch, in case it's useful; it does still miss some cases
because isSplatVector isn't clever enough, though.  That patch also
has some suggestions for potentially interesting cases we can handle
in somewhat unconventional ways.

Does you patch handle a shift by a splat shuffle, e.g. shl(x,
shufflevector(y, y, <0,0,0,0>))?  Or does the lowering take care of
this case somehow?

-Eli
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: x.txt
Url: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20081220/19959ddb/attachment.txt 

From foldr at codedgers.com  Sun Dec 21 01:47:50 2008
From: foldr at codedgers.com (Mikhail Glushenkov)
Date: Sun, 21 Dec 2008 07:47:50 -0000
Subject: [llvm-commits] [llvm] r61307 -
	/llvm/trunk/test/LLVMC/TestWarnings.td
Message-ID: <200812210747.mBL7loVm008997@zion.cs.uiuc.edu>

Author: foldr
Date: Sun Dec 21 01:47:49 2008
New Revision: 61307

URL: http://llvm.org/viewvc/llvm-project?rev=61307&view=rev
Log:
Use ignore & grep instead of XFAIL.

Modified:
    llvm/trunk/test/LLVMC/TestWarnings.td

Modified: llvm/trunk/test/LLVMC/TestWarnings.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/LLVMC/TestWarnings.td?rev=61307&r1=61306&r2=61307&view=diff

==============================================================================
--- llvm/trunk/test/LLVMC/TestWarnings.td (original)
+++ llvm/trunk/test/LLVMC/TestWarnings.td Sun Dec 21 01:47:49 2008
@@ -1,9 +1,7 @@
 // Check that the compiler warns about unused options.
 // This should fail because the output is printed on stderr.
-// RUN: tblgen -I $srcroot/include --gen-llvmc %s | grep extern
-// XFAIL: *
+// RUN: ignore tblgen -I $srcroot/include --gen-llvmc %s |& grep "option '-Wall' has no effect!"
 
 include "llvm/CompilerDriver/Common.td"
 
-def OptList : OptionList<[(extern_switch "Wall"),
-    (extern_parameter "std"), (extern_list "L")]>;
+def OptList : OptionList<[(switch_option "Wall", (extern))]>;




From edwintorok at gmail.com  Sun Dec 21 02:41:44 2008
From: edwintorok at gmail.com (=?ISO-8859-1?Q?T=F6r=F6k_Edwin?=)
Date: Sun, 21 Dec 2008 10:41:44 +0200
Subject: [llvm-commits] [llvm] r61297 - in
 /llvm/trunk:	lib/Transforms/Scalar/SimplifyLibCalls.cpp
 test/Transforms/SimplifyLibCalls/2008-12-20-StrcmpMemcmp.ll
In-Reply-To: <494D95DA.1030608@mxc.ca>
References: <200812210019.mBL0JM32028246@zion.cs.uiuc.edu>	<f5aa3e9b0812201638t46fe16fbpbe9eee35616df142@mail.gmail.com>	<f5aa3e9b0812201639g2743cc1id9feb975efcdb536@mail.gmail.com>
	<494D95DA.1030608@mxc.ca>
Message-ID: <494E0148.4030600@gmail.com>

On 2008-12-21 03:03, Nick Lewycky wrote:
> Eli Friedman wrote:
>   
>> On Sat, Dec 20, 2008 at 4:38 PM, Eli Friedman <eli.friedman at gmail.com> wrote:
>>     
>>> On Sat, Dec 20, 2008 at 4:19 PM, Nick Lewycky <nicholas at mxc.ca> wrote:
>>>       
>>>> Author: nicholas
>>>> Date: Sat Dec 20 18:19:21 2008
>>>> New Revision: 61297
>>>>
>>>> URL: http://llvm.org/viewvc/llvm-project?rev=61297&view=rev
>>>> Log:
>>>> Turn strcmp into memcmp, such as strcmp(P, "x") --> memcmp(P, "x", 2).
>>>>         
>>> I'm pretty sure this isn't safe; take the following testcase:
>>>
>>> int foo(char* x) {return strcmp(x, "x", 2) == 0;}
>>>       
>> Oops, messed that up slightly; try the following:
>> int foo(char* x) {return strcmp(x, "x") == 0;}
>>     
>
> The pathological case is:
>
>    char x[1] = "\0";  // pretend we don't know its length
>    char y[2] = "x\0"; // we know its length
>    return strcmp(x, y);
>
> If we transform it into
>
>    return memcmp(x, y, 2)
>
> then the existing MemCmpOpt will exercise these cases:
>
>    // memcmp(S1,S2,2) != 0 -> (*(short*)LHS ^ *(short*)RHS)  != 0
>    // memcmp(S1,S2,4) != 0 -> (*(int*)LHS ^ *(int*)RHS)  != 0
>
> resulting in a 2-byte load of x[1], which is illegal.
>
> Could someone comment on what part of this transform is wrong? I recall 
> having a discussion about it on IRC, but can't recall the details...
>   


You need to check the alignment.
I think something like:
MinAlignStr = Minimum Alignment of Str1P, Str2P (max 16)
MinLen = Minimum length of Str1P and Str2P
AlignMinLen = AlignOf(MinLen) (max 16)
If (MinAlignStr >= AlingMinLen) -> transform is safe

This assumes that memcmp won't do an 8-byte load if the pointers are
only 4-byte aligned. On IRC most people say this is the case.

If memcpy does do unaligned loads, I think the transform needs an
additional condition: MinAlignStr >= (MinLen % MAX_MEMCPY_LOAD),
where MAX_MEMCPY_LOAD is the maximum memcpy can load in one go,
unaligned, that is usually 8 bytes (because 16-byte SSE loads must be
aligned)

Best regards,
--Edwin


From monping at apple.com  Sun Dec 21 22:44:34 2008
From: monping at apple.com (Mon Ping Wang)
Date: Sun, 21 Dec 2008 20:44:34 -0800
Subject: [llvm-commits] X86 vector shift patch
In-Reply-To: <f5aa3e9b0812201858k2698bb3eq9ace1e5326e001e3@mail.gmail.com>
References: <39C8ABBD-7E35-4398-9262-E9FEF7E5DC23@apple.com>
	<f5aa3e9b0812201858k2698bb3eq9ace1e5326e001e3@mail.gmail.com>
Message-ID: <3A19B954-A26C-4CAB-B370-B35868148417@apple.com>

Hi Eli,

Thanks for your patch!  The two patches does roughly the same thing  
though yours tries to go through vector shuffles and bit converts  
while doesn't (though it allows non constant undefs).  It clearly make  
sense to support those vector shuffle and bit convert. The patch could  
be easily updated to support those cases plus a few you note below as  
the shift amount has not been lowered to something else. Legalize is  
the more logical home to do the transformation since it is converting  
the IR to legal operations.  I should do a few more experiments to see  
how the shift amount might be transformed.

-- Mon Ping

On Dec 20, 2008, at 6:58 PM, Eli Friedman wrote:

> On Sat, Dec 20, 2008 at 6:22 PM, Mon Ping Wang <monping at apple.com>  
> wrote:
>> Hi,
>>
>> This is a patch that allows us to generate X86 vector shifts  
>> (psllq, psrlq
>> etc..) for some vector shifts (v2i64, v4i32, and v8i16)  where the  
>> shift
>> amount is the same for all elements.  This particular patch does as  
>> a target
>> specific  combine pass because it is easier to identify the shift  
>> amounts
>> before it gets lowered to something else (e.g., build vector of  
>> constants
>> can be translated into a load from a constant pool).  If someone  
>> has a
>> better idea of where it should be done or have any other comments,  
>> please
>> let me know.
>
> It isn't impossible to do it during legalize... I've had a patch in my
> tree for a while that's reasonably successful at doing that.  I'm
> attaching my patch, in case it's useful; it does still miss some cases
> because isSplatVector isn't clever enough, though.  That patch also
> has some suggestions for potentially interesting cases we can handle
> in somewhat unconventional ways.
>
> Does you patch handle a shift by a splat shuffle, e.g. shl(x,
> shufflevector(y, y, <0,0,0,0>))?  Or does the lowering take care of
> this case somehow?
>
> -Eli
> <x.txt>_______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits