From evan.cheng at apple.com  Mon Mar 19 00:12:13 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 19 Mar 2007 00:12:13 -0500
Subject: [llvm-commits] CVS: llvm-test/Makefile.programs
Message-ID: <200703190512.l2J5CDgT022981@zion.cs.uiuc.edu>



Changes in directory llvm-test:

Makefile.programs updated: 1.261 -> 1.262
---
Log message:

Reset x86 llcbeta to -enable-tail-merge.

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

 Makefile.programs |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)


Index: llvm-test/Makefile.programs
diff -u llvm-test/Makefile.programs:1.261 llvm-test/Makefile.programs:1.262
--- llvm-test/Makefile.programs:1.261	Sat Mar 17 04:31:11 2007
+++ llvm-test/Makefile.programs	Mon Mar 19 00:11:53 2007
@@ -223,8 +223,7 @@
 LLCBETAOPTION := -sched=simple 
 endif
 ifeq ($(ARCH),x86)
-LLCBETAOPTION := -reduce-joining-phy-regs
-#--enable-tail-merge
+LLCBETAOPTION := -enable-tail-merge
 #-regalloc=local -fast
 endif
 ifeq ($(ARCH),Sparc)





From zhousheng00 at gmail.com  Mon Mar 19 00:22:37 2007
From: zhousheng00 at gmail.com (Zhou Sheng)
Date: Mon, 19 Mar 2007 00:22:37 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/ADT/APInt.h
Message-ID: <200703190522.l2J5Mb3D023519@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/ADT:

APInt.h updated: 1.42 -> 1.43
---
Log message:

Add isStrictPositive() to APInt to determine if this APInt Value > 0.


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

 APInt.h |    6 ++++++
 1 files changed, 6 insertions(+)


Index: llvm/include/llvm/ADT/APInt.h
diff -u llvm/include/llvm/ADT/APInt.h:1.42 llvm/include/llvm/ADT/APInt.h:1.43
--- llvm/include/llvm/ADT/APInt.h:1.42	Tue Mar 13 01:16:26 2007
+++ llvm/include/llvm/ADT/APInt.h	Mon Mar 19 00:22:18 2007
@@ -374,6 +374,12 @@
     return !isNegative();
   }
 
+  /// This just tests if the value of this APInt is strictly positive (> 0).
+  /// @brief Determine if this APInt Value is strictly positive.
+  inline bool isStrictPositive() const {
+    return isPositive() && (*this) != 0;
+  }
+
   /// Arithmetic right-shift this APInt by shiftAmt.
   /// @brief Arithmetic right-shift function.
   APInt ashr(uint32_t shiftAmt) const;





From criswell at cs.uiuc.edu  Mon Mar 19 00:38:01 2007
From: criswell at cs.uiuc.edu (John Criswell)
Date: Mon, 19 Mar 2007 00:38:01 -0500
Subject: [llvm-commits] [see] CVS: llvm/lib/Target/CBackend/Writer.cpp
Message-ID: <200703190538.l2J5c1VX024132@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/CBackend:

Writer.cpp updated: 1.280.4.1 -> 1.280.4.2
---
Log message:

Make the given functions with the const attribute.
No, this should never be folded into a non-experimental LLVM branch.


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

 Writer.cpp |    8 ++++++++
 1 files changed, 8 insertions(+)


Index: llvm/lib/Target/CBackend/Writer.cpp
diff -u llvm/lib/Target/CBackend/Writer.cpp:1.280.4.1 llvm/lib/Target/CBackend/Writer.cpp:1.280.4.2
--- llvm/lib/Target/CBackend/Writer.cpp:1.280.4.1	Tue Feb 20 12:21:25 2007
+++ llvm/lib/Target/CBackend/Writer.cpp	Mon Mar 19 00:37:44 2007
@@ -1246,6 +1246,14 @@
       if (StaticDtors.count(I))
         Out << " __ATTRIBUTE_DTOR__";
       
+#if 1
+      if ((I->getName() == "exactcheck") || (I->getName() == "exactcheck2") ||
+         (I->getName() == "poolcheck") ||
+         (I->getName() == "poolcheckarray") || (I->getName() == "poolcheckarray_i") ||
+         (I->getName() == "pchk_bounds") || (I->getName() == "pchk_bounds_i")) {
+        Out << " __attribute__ ((const))";
+      }
+#endif
       if (I->hasName() && I->getName()[0] == 1)
         Out << " LLVM_ASM(\"" << I->getName().c_str()+1 << "\")";
           





From evan.cheng at apple.com  Mon Mar 19 01:19:45 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 19 Mar 2007 01:19:45 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetInstrInfo.h
Message-ID: <200703190619.l2J6JjHN031960@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetInstrInfo.h updated: 1.113 -> 1.114
---
Log message:

Add a TargetInstrDescriptor flag to mark an instruction as "re-materializable".
It means the instruction can be easily re-materialized at any point. e.g.
constant generation, load from constantpool.

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

 TargetInstrInfo.h |    7 +++++++
 1 files changed, 7 insertions(+)


Index: llvm/include/llvm/Target/TargetInstrInfo.h
diff -u llvm/include/llvm/Target/TargetInstrInfo.h:1.113 llvm/include/llvm/Target/TargetInstrInfo.h:1.114
--- llvm/include/llvm/Target/TargetInstrInfo.h:1.113	Fri Mar 16 03:41:06 2007
+++ llvm/include/llvm/Target/TargetInstrInfo.h	Mon Mar 19 01:19:16 2007
@@ -78,6 +78,10 @@
 // execution.
 const unsigned M_PREDICATED = 1 << 12;
 
+// M_REMATERIALIZIBLE - Set if this instruction can be trivally re-materialized
+// at any time, e.g. constant generation, load from constant pool.
+const unsigned M_REMATERIALIZIBLE = 1 << 13;
+
 
 // Machine operand flags
 // M_LOOK_UP_PTR_REG_CLASS - Set if this operand is a pointer value and it
@@ -207,6 +211,9 @@
   bool isPredicated(MachineOpCode Opcode) const {
     return get(Opcode).Flags & M_PREDICATED;
   }
+  bool isReMaterializable(MachineOpCode Opcode) const {
+    return get(Opcode).Flags & M_REMATERIALIZIBLE;
+  }
   bool isCommutableInstr(MachineOpCode Opcode) const {
     return get(Opcode).Flags & M_COMMUTABLE;
   }





From evan.cheng at apple.com  Mon Mar 19 01:20:58 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 19 Mar 2007 01:20:58 -0500
Subject: [llvm-commits] CVS: llvm/utils/TableGen/CodeGenInstruction.h
	CodeGenTarget.cpp InstrInfoEmitter.cpp
Message-ID: <200703190620.l2J6Kw1A032001@zion.cs.uiuc.edu>



Changes in directory llvm/utils/TableGen:

CodeGenInstruction.h updated: 1.25 -> 1.26
CodeGenTarget.cpp updated: 1.85 -> 1.86
InstrInfoEmitter.cpp updated: 1.56 -> 1.57
---
Log message:

Recognize target instruction flag 'isReMaterializable'.

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

 CodeGenInstruction.h |    1 +
 CodeGenTarget.cpp    |    1 +
 InstrInfoEmitter.cpp |    1 +
 3 files changed, 3 insertions(+)


Index: llvm/utils/TableGen/CodeGenInstruction.h
diff -u llvm/utils/TableGen/CodeGenInstruction.h:1.25 llvm/utils/TableGen/CodeGenInstruction.h:1.26
--- llvm/utils/TableGen/CodeGenInstruction.h:1.25	Wed Nov 15 17:23:02 2006
+++ llvm/utils/TableGen/CodeGenInstruction.h	Mon Mar 19 01:20:37 2007
@@ -91,6 +91,7 @@
     bool isConvertibleToThreeAddress;
     bool isCommutable;
     bool isTerminator;
+    bool isReMaterializable;
     bool hasDelaySlot;
     bool usesCustomDAGSchedInserter;
     bool hasVariableNumberOfOperands;


Index: llvm/utils/TableGen/CodeGenTarget.cpp
diff -u llvm/utils/TableGen/CodeGenTarget.cpp:1.85 llvm/utils/TableGen/CodeGenTarget.cpp:1.86
--- llvm/utils/TableGen/CodeGenTarget.cpp:1.85	Tue Feb 27 16:08:27 2007
+++ llvm/utils/TableGen/CodeGenTarget.cpp	Mon Mar 19 01:20:37 2007
@@ -356,6 +356,7 @@
   isConvertibleToThreeAddress = R->getValueAsBit("isConvertibleToThreeAddress");
   isCommutable = R->getValueAsBit("isCommutable");
   isTerminator = R->getValueAsBit("isTerminator");
+  isReMaterializable = R->getValueAsBit("isReMaterializable");
   hasDelaySlot = R->getValueAsBit("hasDelaySlot");
   usesCustomDAGSchedInserter = R->getValueAsBit("usesCustomDAGSchedInserter");
   hasCtrlDep   = R->getValueAsBit("hasCtrlDep");


Index: llvm/utils/TableGen/InstrInfoEmitter.cpp
diff -u llvm/utils/TableGen/InstrInfoEmitter.cpp:1.56 llvm/utils/TableGen/InstrInfoEmitter.cpp:1.57
--- llvm/utils/TableGen/InstrInfoEmitter.cpp:1.56	Fri Jan 26 11:29:20 2007
+++ llvm/utils/TableGen/InstrInfoEmitter.cpp	Mon Mar 19 01:20:37 2007
@@ -240,6 +240,7 @@
   if (Inst.isConvertibleToThreeAddress) OS << "|M_CONVERTIBLE_TO_3_ADDR";
   if (Inst.isCommutable) OS << "|M_COMMUTABLE";
   if (Inst.isTerminator) OS << "|M_TERMINATOR_FLAG";
+  if (Inst.isReMaterializable) OS << "|M_REMATERIALIZIBLE";
   if (Inst.usesCustomDAGSchedInserter)
     OS << "|M_USES_CUSTOM_DAG_SCHED_INSERTION";
   if (Inst.hasVariableNumberOfOperands)





From evan.cheng at apple.com  Mon Mar 19 01:22:28 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 19 Mar 2007 01:22:28 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Target.td
Message-ID: <200703190622.l2J6MS69032746@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target:

Target.td updated: 1.94 -> 1.95
---
Log message:

Added isReMaterializable.

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

 Target.td |    1 +
 1 files changed, 1 insertion(+)


Index: llvm/lib/Target/Target.td
diff -u llvm/lib/Target/Target.td:1.94 llvm/lib/Target/Target.td:1.95
--- llvm/lib/Target/Target.td:1.94	Tue Feb 27 00:59:52 2007
+++ llvm/lib/Target/Target.td	Mon Mar 19 01:22:07 2007
@@ -165,6 +165,7 @@
   bit isConvertibleToThreeAddress = 0;  // Can this 2-addr instruction promote?
   bit isCommutable = 0;     // Is this 3 operand instruction commutable?
   bit isTerminator = 0;     // Is this part of the terminator for a basic block?
+  bit isReMaterializable = 0; // Is this instruction re-materializable?
   bit hasDelaySlot = 0;     // Does this instruction have an delay slot?
   bit usesCustomDAGSchedInserter = 0; // Pseudo instr needing special help.
   bit hasCtrlDep   = 0;     // Does this instruction r/w ctrl-flow chains?





From evan.cheng at apple.com  Mon Mar 19 02:09:49 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 19 Mar 2007 02:09:49 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMInstrInfo.td
	ARMInstrThumb.td
Message-ID: <200703190709.l2J79ntm004346@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMInstrInfo.td updated: 1.88 -> 1.89
ARMInstrThumb.td updated: 1.14 -> 1.15
---
Log message:

Constant generation instructions are re-materializable.

---
Diffs of the changes:  (+11 -5)

 ARMInstrInfo.td  |   15 ++++++++++-----
 ARMInstrThumb.td |    1 +
 2 files changed, 11 insertions(+), 5 deletions(-)


Index: llvm/lib/Target/ARM/ARMInstrInfo.td
diff -u llvm/lib/Target/ARM/ARMInstrInfo.td:1.88 llvm/lib/Target/ARM/ARMInstrInfo.td:1.89
--- llvm/lib/Target/ARM/ARMInstrInfo.td:1.88	Sat Feb  3 03:11:58 2007
+++ llvm/lib/Target/ARM/ARMInstrInfo.td	Mon Mar 19 02:09:02 2007
@@ -137,7 +137,7 @@
   PatLeaf<(imm), [{ return ARM_AM::getSOImmVal(-(int)N->getValue()) != -1; }],
           so_imm_neg_XFORM>;
 
-def so_imm_not : 
+def so_imm_not :
   PatLeaf<(imm), [{ return ARM_AM::getSOImmVal(~(int)N->getValue()) != -1; }],
           so_imm_not_XFORM>;
 
@@ -709,6 +709,8 @@
                 "mov $dst, $src", []>;
 def MOVrs : AI1<(ops GPR:$dst, so_reg:$src),
                 "mov $dst, $src", [(set GPR:$dst, so_reg:$src)]>;
+
+let isReMaterializable = 1 in
 def MOVri : AI1<(ops GPR:$dst, so_imm:$src),
                 "mov $dst, $src", [(set GPR:$dst, so_imm:$src)]>;
 
@@ -806,10 +808,13 @@
 defm EOR   : AI1_bin_irs<"eor", BinOpFrag<(xor node:$LHS, node:$RHS)>>;
 defm BIC   : AI1_bin_irs<"bic", BinOpFrag<(and node:$LHS, (not node:$RHS))>>;
 
-defm MVN   : AI1_unary_irs<"mvn", not>;
-
-def : ARMPat<(i32  so_imm_not:$imm),
-             (MVNi so_imm_not:$imm)>;
+def  MVNr  : AI<(ops GPR:$dst, GPR:$src),
+                "mvn $dst, $src", [(set GPR:$dst, (not GPR:$src))]>;
+def  MVNs  : AI<(ops GPR:$dst, so_reg:$src),
+                "mvn $dst, $src", [(set GPR:$dst, (not so_reg:$src))]>;
+let isReMaterializable = 1 in
+def  MVNi  : AI<(ops GPR:$dst, so_imm:$imm),
+                "mvn $dst, $imm", [(set GPR:$dst, so_imm_not:$imm)]>;
 
 def : ARMPat<(and   GPR:$src, so_imm_not:$imm),
              (BICri GPR:$src, so_imm_not:$imm)>;


Index: llvm/lib/Target/ARM/ARMInstrThumb.td
diff -u llvm/lib/Target/ARM/ARMInstrThumb.td:1.14 llvm/lib/Target/ARM/ARMInstrThumb.td:1.15
--- llvm/lib/Target/ARM/ARMInstrThumb.td:1.14	Tue Feb  6 18:06:56 2007
+++ llvm/lib/Target/ARM/ARMInstrThumb.td	Mon Mar 19 02:09:02 2007
@@ -374,6 +374,7 @@
                  "lsr $dst, $rhs",
                  [(set GPR:$dst, (srl GPR:$lhs, GPR:$rhs))]>;
 
+let isReMaterializable = 1 in
 def tMOVri8 : TI<(ops GPR:$dst, i32imm:$src),
                  "mov $dst, $src",
                  [(set GPR:$dst, imm0_255:$src)]>;





From evan.cheng at apple.com  Mon Mar 19 02:20:21 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 19 Mar 2007 02:20:21 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
	ARMInstrInfo.td ARMInstrThumb.td
Message-ID: <200703190720.l2J7KLBt005231@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMISelDAGToDAG.cpp updated: 1.108 -> 1.109
ARMInstrInfo.td updated: 1.89 -> 1.90
ARMInstrThumb.td updated: 1.15 -> 1.16
---
Log message:

Special LDR instructions to load from non-pc-relative constantpools. These are
rematerializable. Only used for constant generation for now.

---
Diffs of the changes:  (+12 -2)

 ARMISelDAGToDAG.cpp |    4 ++--
 ARMInstrInfo.td     |    5 +++++
 ARMInstrThumb.td    |    5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
diff -u llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.108 llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.109
--- llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.108	Tue Mar 13 16:05:54 2007
+++ llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp	Mon Mar 19 02:20:03 2007
@@ -551,7 +551,7 @@
 
       SDNode *ResNode;
       if (Subtarget->isThumb())
-        ResNode = CurDAG->getTargetNode(ARM::tLDRpci, MVT::i32, MVT::Other,
+        ResNode = CurDAG->getTargetNode(ARM::tLDRcp, MVT::i32, MVT::Other,
                                         CPIdx, CurDAG->getEntryNode());
       else {
         SDOperand Ops[] = {
@@ -560,7 +560,7 @@
           CurDAG->getTargetConstant(0, MVT::i32),
           CurDAG->getEntryNode()
         };
-        ResNode = CurDAG->getTargetNode(ARM::LDR, MVT::i32, MVT::Other, Ops, 4);
+        ResNode=CurDAG->getTargetNode(ARM::LDRcp, MVT::i32, MVT::Other, Ops, 4);
       }
       ReplaceUses(Op, SDOperand(ResNode, 0));
       return NULL;


Index: llvm/lib/Target/ARM/ARMInstrInfo.td
diff -u llvm/lib/Target/ARM/ARMInstrInfo.td:1.89 llvm/lib/Target/ARM/ARMInstrInfo.td:1.90
--- llvm/lib/Target/ARM/ARMInstrInfo.td:1.89	Mon Mar 19 02:09:02 2007
+++ llvm/lib/Target/ARM/ARMInstrInfo.td	Mon Mar 19 02:20:03 2007
@@ -580,6 +580,11 @@
                "ldr $dst, $addr",
                [(set GPR:$dst, (load addrmode2:$addr))]>;
 
+// Special LDR for loads from non-pc-relative constpools.
+let isReMaterializable = 1 in
+def LDRcp : AI2<(ops GPR:$dst, addrmode2:$addr),
+                 "ldr $dst, $addr", []>;
+
 // Loads with zero extension
 def LDRH  : AI3<(ops GPR:$dst, addrmode3:$addr),
                  "ldrh $dst, $addr",


Index: llvm/lib/Target/ARM/ARMInstrThumb.td
diff -u llvm/lib/Target/ARM/ARMInstrThumb.td:1.15 llvm/lib/Target/ARM/ARMInstrThumb.td:1.16
--- llvm/lib/Target/ARM/ARMInstrThumb.td:1.15	Mon Mar 19 02:09:02 2007
+++ llvm/lib/Target/ARM/ARMInstrThumb.td	Mon Mar 19 02:20:03 2007
@@ -248,6 +248,11 @@
 def tLDRpci : TIs<(ops GPR:$dst, i32imm:$addr),
                   "ldr $dst, $addr",
                   [(set GPR:$dst, (load (ARMWrapper tconstpool:$addr)))]>;
+
+// Special LDR for loads from non-pc-relative constpools.
+let isReMaterializable = 1 in
+def tLDRcp  : TIs<(ops GPR:$dst, i32imm:$addr),
+                  "ldr $dst, $addr", []>;
 } // isLoad
 
 let isStore = 1 in {





From evan.cheng at apple.com  Mon Mar 19 02:48:19 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 19 Mar 2007 02:48:19 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
	ARMISelLowering.cpp ARMInstrInfo.cpp ARMInstrInfo.td
	ARMInstrThumb.td ARMRegisterInfo.cpp
Message-ID: <200703190748.l2J7mJRf005712@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMISelDAGToDAG.cpp updated: 1.109 -> 1.110
ARMISelLowering.cpp updated: 1.24 -> 1.25
ARMInstrInfo.cpp updated: 1.16 -> 1.17
ARMInstrInfo.td updated: 1.90 -> 1.91
ARMInstrThumb.td updated: 1.16 -> 1.17
ARMRegisterInfo.cpp updated: 1.82 -> 1.83
---
Log message:

Fix naming inconsistencies.

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

 ARMISelDAGToDAG.cpp |    2 +-
 ARMISelLowering.cpp |    2 +-
 ARMInstrInfo.cpp    |    4 ++--
 ARMInstrInfo.td     |   10 +++++-----
 ARMInstrThumb.td    |    8 ++++----
 ARMRegisterInfo.cpp |   34 +++++++++++++++++-----------------
 6 files changed, 30 insertions(+), 30 deletions(-)


Index: llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp
diff -u llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.109 llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.110
--- llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp:1.109	Mon Mar 19 02:20:03 2007
+++ llvm/lib/Target/ARM/ARMISelDAGToDAG.cpp	Mon Mar 19 02:48:02 2007
@@ -384,7 +384,7 @@
     // We must materialize a zero in a reg! Returning an constant here won't
     // work since its node is -1 so it won't get added to the selection queue.
     // Explicitly issue a tMOVri8 node!
-    Offset = SDOperand(CurDAG->getTargetNode(ARM::tMOVri8, MVT::i32,
+    Offset = SDOperand(CurDAG->getTargetNode(ARM::tMOVi8, MVT::i32,
                                     CurDAG->getTargetConstant(0, MVT::i32)), 0);
     return true;
   }


Index: llvm/lib/Target/ARM/ARMISelLowering.cpp
diff -u llvm/lib/Target/ARM/ARMISelLowering.cpp:1.24 llvm/lib/Target/ARM/ARMISelLowering.cpp:1.25
--- llvm/lib/Target/ARM/ARMISelLowering.cpp:1.24	Fri Mar 16 17:54:16 2007
+++ llvm/lib/Target/ARM/ARMISelLowering.cpp	Mon Mar 19 02:48:02 2007
@@ -672,7 +672,7 @@
 // one of the above mentioned nodes. It has to be wrapped because otherwise
 // Select(N) returns N. So the raw TargetGlobalAddress nodes, etc. can only
 // be used to form addressing mode. These wrapped nodes will be selected
-// into MOVri.
+// into MOVi.
 static SDOperand LowerConstantPool(SDOperand Op, SelectionDAG &DAG) {
   MVT::ValueType PtrVT = Op.getValueType();
   ConstantPoolSDNode *CP = cast<ConstantPoolSDNode>(Op);


Index: llvm/lib/Target/ARM/ARMInstrInfo.cpp
diff -u llvm/lib/Target/ARM/ARMInstrInfo.cpp:1.16 llvm/lib/Target/ARM/ARMInstrInfo.cpp:1.17
--- llvm/lib/Target/ARM/ARMInstrInfo.cpp:1.16	Tue Feb  6 18:06:56 2007
+++ llvm/lib/Target/ARM/ARMInstrInfo.cpp	Mon Mar 19 02:48:02 2007
@@ -50,8 +50,8 @@
     SrcReg = MI.getOperand(1).getReg();
     DstReg = MI.getOperand(0).getReg();
     return true;
-  case ARM::MOVrr:
-  case ARM::tMOVrr:
+  case ARM::MOVr:
+  case ARM::tMOVr:
     assert(MI.getNumOperands() == 2 && MI.getOperand(0).isRegister() &&
 	   MI.getOperand(1).isRegister() &&
 	   "Invalid ARM MOV instruction");


Index: llvm/lib/Target/ARM/ARMInstrInfo.td
diff -u llvm/lib/Target/ARM/ARMInstrInfo.td:1.90 llvm/lib/Target/ARM/ARMInstrInfo.td:1.91
--- llvm/lib/Target/ARM/ARMInstrInfo.td:1.90	Mon Mar 19 02:20:03 2007
+++ llvm/lib/Target/ARM/ARMInstrInfo.td	Mon Mar 19 02:48:02 2007
@@ -710,13 +710,13 @@
 //  Move Instructions.
 //
 
-def MOVrr : AI1<(ops GPR:$dst, GPR:$src),
+def MOVr : AI1<(ops GPR:$dst, GPR:$src),
                 "mov $dst, $src", []>;
-def MOVrs : AI1<(ops GPR:$dst, so_reg:$src),
+def MOVs : AI1<(ops GPR:$dst, so_reg:$src),
                 "mov $dst, $src", [(set GPR:$dst, so_reg:$src)]>;
 
 let isReMaterializable = 1 in
-def MOVri : AI1<(ops GPR:$dst, so_imm:$src),
+def MOVi : AI1<(ops GPR:$dst, so_imm:$src),
                 "mov $dst, $src", [(set GPR:$dst, so_imm:$src)]>;
 
 // These aren't really mov instructions, but we have to define them this way
@@ -728,7 +728,7 @@
 def MOVsra_flag : AI1<(ops GPR:$dst, GPR:$src),
                       "movs $dst, $src, asr #1",
                       [(set GPR:$dst, (ARMsra_flag GPR:$src))]>;
-def MOVrrx      : AI1<(ops GPR:$dst, GPR:$src),
+def MOVrx       : AI1<(ops GPR:$dst, GPR:$src),
                       "mov $dst, $src, rrx",
                       [(set GPR:$dst, (ARMrrx GPR:$src))]>;
 
@@ -1070,7 +1070,7 @@
 
 // Two piece so_imms.
 def : ARMPat<(i32 so_imm2part:$src),
-             (ORRri (MOVri (so_imm2part_1 imm:$src)),
+             (ORRri (MOVi (so_imm2part_1 imm:$src)),
                     (so_imm2part_2 imm:$src))>;
 
 def : ARMPat<(or GPR:$LHS, so_imm2part:$RHS),


Index: llvm/lib/Target/ARM/ARMInstrThumb.td
diff -u llvm/lib/Target/ARM/ARMInstrThumb.td:1.16 llvm/lib/Target/ARM/ARMInstrThumb.td:1.17
--- llvm/lib/Target/ARM/ARMInstrThumb.td:1.16	Mon Mar 19 02:20:03 2007
+++ llvm/lib/Target/ARM/ARMInstrThumb.td	Mon Mar 19 02:48:02 2007
@@ -380,7 +380,7 @@
                  [(set GPR:$dst, (srl GPR:$lhs, GPR:$rhs))]>;
 
 let isReMaterializable = 1 in
-def tMOVri8 : TI<(ops GPR:$dst, i32imm:$src),
+def tMOVi8 : TI<(ops GPR:$dst, i32imm:$src),
                  "mov $dst, $src",
                  [(set GPR:$dst, imm0_255:$src)]>;
 
@@ -389,7 +389,7 @@
 
 // Note: MOV(2) of two low regs updates the flags, so we emit this as 'cpy',
 // which is MOV(3).  This also supports high registers.
-def tMOVrr  : TI<(ops GPR:$dst, GPR:$src),
+def tMOVr  : TI<(ops GPR:$dst, GPR:$src),
                  "cpy $dst, $src", []>;
 
 def tMUL : TIt<(ops GPR:$dst, GPR:$lhs, GPR:$rhs),
@@ -544,8 +544,8 @@
 
 // Two piece imms.
 def : ThumbPat<(i32 thumb_immshifted:$src),
-               (tLSLri (tMOVri8 (thumb_immshifted_val imm:$src)),
+               (tLSLri (tMOVi8 (thumb_immshifted_val imm:$src)),
                        (thumb_immshifted_shamt imm:$src))>;
 
 def : ThumbPat<(i32 imm0_255_comp:$src),
-               (tMVN (tMOVri8 (imm_comp_XFORM imm:$src)))>;
+               (tMVN (tMOVi8 (imm_comp_XFORM imm:$src)))>;


Index: llvm/lib/Target/ARM/ARMRegisterInfo.cpp
diff -u llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.82 llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.83
--- llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.82	Tue Mar  6 18:12:18 2007
+++ llvm/lib/Target/ARM/ARMRegisterInfo.cpp	Mon Mar 19 02:48:02 2007
@@ -185,7 +185,7 @@
   if (RC == ARM::GPRRegisterClass) {
     MachineFunction &MF = *MBB.getParent();
     ARMFunctionInfo *AFI = MF.getInfo<ARMFunctionInfo>();
-    BuildMI(MBB, I, TII.get(AFI->isThumbFunction() ? ARM::tMOVrr : ARM::MOVrr),
+    BuildMI(MBB, I, TII.get(AFI->isThumbFunction() ? ARM::tMOVr : ARM::MOVr),
             DestReg).addReg(SrcReg);
   } else if (RC == ARM::SPRRegisterClass)
     BuildMI(MBB, I, TII.get(ARM::FCPYS), DestReg).addReg(SrcReg);
@@ -214,7 +214,7 @@
   MachineInstr *NewMI = NULL;
   switch (Opc) {
   default: break;
-  case ARM::MOVrr: {
+  case ARM::MOVr: {
     if (OpNum == 0) { // move -> store
       unsigned SrcReg = MI->getOperand(1).getReg();
       NewMI = BuildMI(TII.get(ARM::STR)).addReg(SrcReg).addFrameIndex(FI)
@@ -226,7 +226,7 @@
     }
     break;
   }
-  case ARM::tMOVrr: {
+  case ARM::tMOVr: {
     if (OpNum == 0) { // move -> store
       unsigned SrcReg = MI->getOperand(1).getReg();
       if (isPhysicalRegister(SrcReg) && !isLowRegister(SrcReg))
@@ -448,14 +448,14 @@
     if (DestReg == ARM::SP) {
       assert(BaseReg == ARM::SP && "Unexpected!");
       LdReg = ARM::R3;
-      BuildMI(MBB, MBBI, TII.get(ARM::tMOVrr), ARM::R12)
+      BuildMI(MBB, MBBI, TII.get(ARM::tMOVr), ARM::R12)
         .addReg(ARM::R3, false, false, true);
     }
 
     if (NumBytes <= 255 && NumBytes >= 0)
-      BuildMI(MBB, MBBI, TII.get(ARM::tMOVri8), LdReg).addImm(NumBytes);
+      BuildMI(MBB, MBBI, TII.get(ARM::tMOVi8), LdReg).addImm(NumBytes);
     else if (NumBytes < 0 && NumBytes >= -255) {
-      BuildMI(MBB, MBBI, TII.get(ARM::tMOVri8), LdReg).addImm(NumBytes);
+      BuildMI(MBB, MBBI, TII.get(ARM::tMOVi8), LdReg).addImm(NumBytes);
       BuildMI(MBB, MBBI, TII.get(ARM::tNEG), LdReg)
         .addReg(LdReg, false, false, true);
     } else
@@ -469,7 +469,7 @@
     else
       MIB.addReg(LdReg).addReg(BaseReg, false, false, true);
     if (DestReg == ARM::SP)
-      BuildMI(MBB, MBBI, TII.get(ARM::tMOVrr), ARM::R3)
+      BuildMI(MBB, MBBI, TII.get(ARM::tMOVr), ARM::R3)
         .addReg(ARM::R12, false, false, true);
 }
 
@@ -538,7 +538,7 @@
       BuildMI(MBB, MBBI, TII.get(isSub ? ARM::tSUBi3 : ARM::tADDi3), DestReg)
         .addReg(BaseReg, false, false, true).addImm(ThisVal);
     } else {
-      BuildMI(MBB, MBBI, TII.get(ARM::tMOVrr), DestReg)
+      BuildMI(MBB, MBBI, TII.get(ARM::tMOVr), DestReg)
         .addReg(BaseReg, false, false, true);
     }
     BaseReg = DestReg;
@@ -627,7 +627,7 @@
   int Chunk = (1 << 8) - 1;
   int ThisVal = (Imm > Chunk) ? Chunk : Imm;
   Imm -= ThisVal;
-  BuildMI(MBB, MBBI, TII.get(ARM::tMOVri8), DestReg).addImm(ThisVal);
+  BuildMI(MBB, MBBI, TII.get(ARM::tMOVi8), DestReg).addImm(ThisVal);
   if (Imm > 0) 
     emitThumbRegPlusImmediate(MBB, MBBI, DestReg, DestReg, Imm, TII);
   if (isSub)
@@ -690,7 +690,7 @@
     Offset += MI.getOperand(i+1).getImm();
     if (Offset == 0) {
       // Turn it into a move.
-      MI.setInstrDescriptor(TII.get(ARM::MOVrr));
+      MI.setInstrDescriptor(TII.get(ARM::MOVr));
       MI.getOperand(i).ChangeToRegister(FrameReg, false);
       MI.RemoveOperand(i+1);
       return;
@@ -741,7 +741,7 @@
 
     if (Offset == 0) {
       // Turn it into a move.
-      MI.setInstrDescriptor(TII.get(ARM::tMOVrr));
+      MI.setInstrDescriptor(TII.get(ARM::tMOVr));
       MI.getOperand(i).ChangeToRegister(FrameReg, false);
       MI.RemoveOperand(i+1);
       return;
@@ -909,12 +909,12 @@
       unsigned TmpReg = ARM::R3;
       bool UseRR = false;
       if (ValReg == ARM::R3) {
-        BuildMI(MBB, II, TII.get(ARM::tMOVrr), ARM::R12)
+        BuildMI(MBB, II, TII.get(ARM::tMOVr), ARM::R12)
           .addReg(ARM::R2, false, false, true);
         TmpReg = ARM::R2;
       }
       if (TmpReg == ARM::R3 && AFI->isR3LiveIn())
-        BuildMI(MBB, II, TII.get(ARM::tMOVrr), ARM::R12)
+        BuildMI(MBB, II, TII.get(ARM::tMOVr), ARM::R12)
           .addReg(ARM::R3, false, false, true);
       if (Opcode == ARM::tSpill) {
         if (FrameReg == ARM::SP)
@@ -934,10 +934,10 @@
 
       MachineBasicBlock::iterator NII = next(II);
       if (ValReg == ARM::R3)
-        BuildMI(MBB, NII, TII.get(ARM::tMOVrr), ARM::R2)
+        BuildMI(MBB, NII, TII.get(ARM::tMOVr), ARM::R2)
           .addReg(ARM::R12, false, false, true);
       if (TmpReg == ARM::R3 && AFI->isR3LiveIn())
-        BuildMI(MBB, NII, TII.get(ARM::tMOVrr), ARM::R3)
+        BuildMI(MBB, NII, TII.get(ARM::tMOVr), ARM::R3)
           .addReg(ARM::R12, false, false, true);
     } else
       assert(false && "Unexpected opcode!");
@@ -1391,7 +1391,7 @@
         if (NumBytes)
           emitThumbRegPlusImmediate(MBB, MBBI, ARM::SP, FramePtr, -NumBytes, TII);
         else
-          BuildMI(MBB, MBBI, TII.get(ARM::tMOVrr), ARM::SP).addReg(FramePtr);
+          BuildMI(MBB, MBBI, TII.get(ARM::tMOVr), ARM::SP).addReg(FramePtr);
       } else {
         if (MBBI->getOpcode() == ARM::tBX_RET &&
             &MBB.front() != MBBI &&
@@ -1416,7 +1416,7 @@
             BuildMI(MBB, MBBI, TII.get(ARM::SUBri), ARM::SP).addReg(FramePtr)
               .addImm(NumBytes);
           else
-            BuildMI(MBB, MBBI, TII.get(ARM::MOVrr), ARM::SP).addReg(FramePtr);
+            BuildMI(MBB, MBBI, TII.get(ARM::MOVr), ARM::SP).addReg(FramePtr);
       } else if (NumBytes) {
         emitSPUpdate(MBB, MBBI, NumBytes, false, TII);
       }





From baldrick at free.fr  Mon Mar 19 04:11:24 2007
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 19 Mar 2007 10:11:24 +0100
Subject: [llvm-commits] CVS: llvm/include/llvm/ADT/APInt.h
In-Reply-To: <200703190522.l2J5Mb3D023519@zion.cs.uiuc.edu>
References: <200703190522.l2J5Mb3D023519@zion.cs.uiuc.edu>
Message-ID: <200703191011.26098.baldrick@free.fr>

> Add isStrictPositive() to APInt to determine if this APInt Value > 0.

Shouldn't this be "isStrictlyPositive"?

Duncan.


From baldrick at free.fr  Mon Mar 19 09:25:19 2007
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 19 Mar 2007 09:25:19 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetData.h
Message-ID: <200703191425.l2JEPJYd012657@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetData.h updated: 1.58 -> 1.59
---
Log message:

Fix obvious typo in comment.


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

 TargetData.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/Target/TargetData.h
diff -u llvm/include/llvm/Target/TargetData.h:1.58 llvm/include/llvm/Target/TargetData.h:1.59
--- llvm/include/llvm/Target/TargetData.h:1.58	Mon Feb 19 16:35:00 2007
+++ llvm/include/llvm/Target/TargetData.h	Mon Mar 19 09:25:02 2007
@@ -157,7 +157,7 @@
   /// type.
   uint64_t getTypeSize(const Type *Ty) const;
 
-  /// getTypeSizeInBits - Return the number of bytes necessary to hold the
+  /// getTypeSizeInBits - Return the number of bits necessary to hold the
   /// specified type.
   uint64_t getTypeSizeInBits(const Type* Ty) const;
 





From rspencer at reidspencer.com  Mon Mar 19 09:48:02 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Mon, 19 Mar 2007 07:48:02 -0700
Subject: [llvm-commits] CVS: llvm/include/llvm/ADT/APInt.h
In-Reply-To: <200703191011.26098.baldrick@free.fr>
References: <200703190522.l2J5Mb3D023519@zion.cs.uiuc.edu>
	<200703191011.26098.baldrick@free.fr>
Message-ID: <1174315682.13912.206.camel@bashful.x10sys.com>

On Mon, 2007-03-19 at 10:11 +0100, Duncan Sands wrote:
> > Add isStrictPositive() to APInt to determine if this APInt Value > 0.
> 
> Shouldn't this be "isStrictlyPositive"?

Yes, it Should.  

Sheng, please correct the name of this function as Duncan suggested.

Thanks,

Reid.

> 
> Duncan.
> _______________________________________________
> 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  Mon Mar 19 13:08:43 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Mon, 19 Mar 2007 13:08:43 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
Message-ID: <200703191808.l2JI8h5B016400@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

LiveIntervalAnalysis.cpp updated: 1.224 -> 1.225
---
Log message:

Remove -reduce-joining-phys-regs options. Make it on by default.

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

 LiveIntervalAnalysis.cpp |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)


Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.224 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.225
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.224	Sun Mar 18 23:22:35 2007
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Mon Mar 19 13:08:26 2007
@@ -42,7 +42,6 @@
 STATISTIC(numPeep     , "Number of identity moves eliminated after coalescing");
 STATISTIC(numFolded   , "Number of loads/stores folded into instructions");
 STATISTIC(numAborts   , "Number of times interval joining aborted");
-static cl::opt<bool> ReduceJoinPhys("reduce-joining-phy-regs", cl::Hidden);
 
 namespace {
   RegisterPass<LiveIntervals> X("liveintervals", "Live Interval Analysis");
@@ -937,8 +936,7 @@
   // virtual register. Once the coalescing is done, it cannot be broken and
   // these are not spillable! If the destination interval uses are far away,
   // think twice about coalescing them!
-  if (ReduceJoinPhys && !mopd->isDead() &&
-      MRegisterInfo::isPhysicalRegister(repSrcReg)) {
+  if (!mopd->isDead() && MRegisterInfo::isPhysicalRegister(repSrcReg)) {
     // Small function. No need to worry!
     unsigned Threshold = allocatableRegs_.count() * 2;
     if (r2iMap_.size() <= Threshold)





From reid at x10sys.com  Mon Mar 19 13:08:59 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 13:08:59 -0500
Subject: [llvm-commits] CVS: llvm/test/BugPoint/crash-basictest.ll
	crash-narrowfunctiontest.ll remove_arguments_test.ll
Message-ID: <200703191808.l2JI8x7S016417@zion.cs.uiuc.edu>



Changes in directory llvm/test/BugPoint:

crash-basictest.ll updated: 1.2 -> 1.3
crash-narrowfunctiontest.ll updated: 1.2 -> 1.3
remove_arguments_test.ll updated: 1.2 -> 1.3
---
Log message:

Don't upgrade these.


---
Diffs of the changes:  (+18 -20)

 crash-basictest.ll          |    9 ++++-----
 crash-narrowfunctiontest.ll |   14 ++++++--------
 remove_arguments_test.ll    |   15 ++++++++-------
 3 files changed, 18 insertions(+), 20 deletions(-)


Index: llvm/test/BugPoint/crash-basictest.ll
diff -u llvm/test/BugPoint/crash-basictest.ll:1.2 llvm/test/BugPoint/crash-basictest.ll:1.3
--- llvm/test/BugPoint/crash-basictest.ll:1.2	Fri Dec 29 14:01:32 2006
+++ llvm/test/BugPoint/crash-basictest.ll	Mon Mar 19 13:08:42 2007
@@ -1,9 +1,8 @@
 ; Basic test for bugpoint.
-; RUN: llvm-upgrade < %s > %t1.ll
-; RUN: bugpoint %t1.ll -domset -idom -domset -bugpoint-crashcalls \
+; RUN: bugpoint %s -domset -idom -domset -bugpoint-crashcalls \
 ; RUN:   -domset -idom -domset
 
-int %test() {
-	call int %test()
-	ret int %0
+define i32 @test() {
+	call i32 @test()
+	ret i32 %1
 }


Index: llvm/test/BugPoint/crash-narrowfunctiontest.ll
diff -u llvm/test/BugPoint/crash-narrowfunctiontest.ll:1.2 llvm/test/BugPoint/crash-narrowfunctiontest.ll:1.3
--- llvm/test/BugPoint/crash-narrowfunctiontest.ll:1.2	Fri Dec 29 14:01:32 2006
+++ llvm/test/BugPoint/crash-narrowfunctiontest.ll	Mon Mar 19 13:08:42 2007
@@ -1,14 +1,12 @@
 ; Test that bugpoint can narrow down the testcase to the important function
 ;
-; RUN: llvm-upgrade < %s > %t1.ll
-; RUN: bugpoint %t1.ll -bugpoint-crashcalls
+; RUN: bugpoint %s -bugpoint-crashcalls
 
-int %foo() { ret int 1 }
+define i32 @foo() { ret i32 1 }
 
-int %test() {
-	call int %test()
-	ret int %0
+define i32 @test() {
+	call i32 @test()
+	ret i32 %1
 }
 
-int %bar() { ret int 2 }
-
+define i32 @bar() { ret i32 2 }


Index: llvm/test/BugPoint/remove_arguments_test.ll
diff -u llvm/test/BugPoint/remove_arguments_test.ll:1.2 llvm/test/BugPoint/remove_arguments_test.ll:1.3
--- llvm/test/BugPoint/remove_arguments_test.ll:1.2	Fri Dec 29 14:01:32 2006
+++ llvm/test/BugPoint/remove_arguments_test.ll	Mon Mar 19 13:08:42 2007
@@ -1,10 +1,11 @@
-; RUN: llvm-upgrade < %s > %t1.ll
-; RUN: bugpoint %t1.ll  -bugpoint-crashcalls
+; RUN: bugpoint %s  -bugpoint-crashcalls
 
-; Test to make sure that arguments are removed from the function if they are unnecessary.
+; Test to make sure that arguments are removed from the function if they are 
+; unnecessary.
 
-declare int %test2()
-int %test(int %A, int %B, float %C) {
-	call int %test2()
-	ret int %0
+declare i32 @test2()
+
+define i32 @test(i32 %A, i32 %B, float %C) {
+	call i32 @test2()
+	ret i32 %1
 }





From sabre at nondot.org  Mon Mar 19 13:26:09 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 19 Mar 2007 13:26:09 -0500
Subject: [llvm-commits] CVS:
	llvm/test/Transforms/ScalarRepl/2007-03-19-CanonicalizeMemcpy.ll
Message-ID: <200703191826.l2JIQ9C0016842@zion.cs.uiuc.edu>



Changes in directory llvm/test/Transforms/ScalarRepl:

2007-03-19-CanonicalizeMemcpy.ll added (r1.1)
---
Log message:

add a testcase the resent patches fail on.


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

 2007-03-19-CanonicalizeMemcpy.ll |   45 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 45 insertions(+)


Index: llvm/test/Transforms/ScalarRepl/2007-03-19-CanonicalizeMemcpy.ll
diff -c /dev/null llvm/test/Transforms/ScalarRepl/2007-03-19-CanonicalizeMemcpy.ll:1.1
*** /dev/null	Mon Mar 19 13:25:58 2007
--- llvm/test/Transforms/ScalarRepl/2007-03-19-CanonicalizeMemcpy.ll	Mon Mar 19 13:25:48 2007
***************
*** 0 ****
--- 1,45 ----
+ ; RUN: llvm-as < %s | opt -scalarrepl -disable-output
+ 
+ target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:32-f32:32:32-f64:32:32-v64:64:64-v128:128:128-a0:0:64"
+ target triple = "arm-apple-darwin8"
+ 	%struct.CGPoint = type { float, float }
+ 	%struct.aal_big_range_t = type { i32, i32 }
+ 	%struct.aal_callback_t = type { i8* (i8*, i32)*, void (i8*, i8*)* }
+ 	%struct.aal_edge_pool_t = type { %struct.aal_edge_pool_t*, i32, i32, [0 x %struct.aal_edge_t] }
+ 	%struct.aal_edge_t = type { %struct.CGPoint, %struct.CGPoint, i32 }
+ 	%struct.aal_range_t = type { i16, i16 }
+ 	%struct.aal_span_pool_t = type { %struct.aal_span_pool_t*, [341 x %struct.aal_span_t] }
+ 	%struct.aal_span_t = type { %struct.aal_span_t*, %struct.aal_big_range_t }
+ 	%struct.aal_spanarray_t = type { [2 x %struct.aal_range_t] }
+ 	%struct.aal_spanbucket_t = type { i16, [2 x i8], %struct.anon }
+ 	%struct.aal_state_t = type { %struct.CGPoint, %struct.CGPoint, %struct.CGPoint, i32, float, float, float, float, %struct.CGPoint, %struct.CGPoint, float, float, float, float, i32, i32, i32, i32, float, float, i8*, i32, i32, %struct.aal_edge_pool_t*, %struct.aal_edge_pool_t*, i8*, %struct.aal_callback_t*, i32, %struct.aal_span_t*, %struct.aal_span_t*, %struct.aal_span_t*, %struct.aal_span_pool_t*, i8, float, i8, i32 }
+ 	%struct.anon = type { %struct.aal_spanarray_t }
+ 
+ implementation   ; Functions:
+ 
+ declare void @llvm.memcpy.i32(i8*, i8*, i32, i32)
+ 
+ define fastcc void @aal_insert_span() {
+ entry:
+ 	%SB = alloca %struct.aal_spanbucket_t, align 4		; <%struct.aal_spanbucket_t*> [#uses=2]
+ 	br i1 false, label %cond_true, label %cond_next79
+ 
+ cond_true:		; preds = %entry
+ 	br i1 false, label %cond_next, label %cond_next114.i
+ 
+ cond_next114.i:		; preds = %cond_true
+ 	ret void
+ 
+ cond_next:		; preds = %cond_true
+ 	%SB19 = bitcast %struct.aal_spanbucket_t* %SB to i8*		; <i8*> [#uses=1]
+ 	call void @llvm.memcpy.i32( i8* %SB19, i8* null, i32 12, i32 0 )
+ 	br i1 false, label %cond_next34, label %cond_next79
+ 
+ cond_next34:		; preds = %cond_next
+ 	%i.2.reload22 = load i32* null		; <i32> [#uses=1]
+ 	%tmp51 = getelementptr %struct.aal_spanbucket_t* %SB, i32 0, i32 2, i32 0, i32 0, i32 %i.2.reload22, i32 1		; <i16*> [#uses=0]
+ 	ret void
+ 
+ cond_next79:		; preds = %cond_next, %entry
+ 	ret void
+ }





From reid at x10sys.com  Mon Mar 19 13:26:17 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 13:26:17 -0500
Subject: [llvm-commits] CVS:
	llvm/test/CFrontend/2005-06-15-ExpandGotoInternalProblem.c
Message-ID: <200703191826.l2JIQHJO016848@zion.cs.uiuc.edu>



Changes in directory llvm/test/CFrontend:

2005-06-15-ExpandGotoInternalProblem.c updated: 1.1 -> 1.2
---
Log message:

Use opt instead of gccas.


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

 2005-06-15-ExpandGotoInternalProblem.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)


Index: llvm/test/CFrontend/2005-06-15-ExpandGotoInternalProblem.c
diff -u llvm/test/CFrontend/2005-06-15-ExpandGotoInternalProblem.c:1.1 llvm/test/CFrontend/2005-06-15-ExpandGotoInternalProblem.c:1.2
--- llvm/test/CFrontend/2005-06-15-ExpandGotoInternalProblem.c:1.1	Wed Jun 15 17:42:53 2005
+++ llvm/test/CFrontend/2005-06-15-ExpandGotoInternalProblem.c	Mon Mar 19 13:25:55 2007
@@ -1,4 +1,5 @@
-// RUN: %llvmgcc -std=c99 %s -S -o - | gccas -o /dev/null
+// RUN: %llvmgcc -std=c99 %s -S -o - | llvm-as | \
+// RUN:    opt -std-compile-opts -disable-output
 // PR580
 
 int X, Y;





From sabre at nondot.org  Mon Mar 19 13:26:18 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 19 Mar 2007 13:26:18 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
Message-ID: <200703191826.l2JIQIuZ016855@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

ScalarReplAggregates.cpp updated: 1.79 -> 1.80
---
Log message:

fix ScalarRepl/2007-03-19-CanonicalizeMemcpy.ll


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

 ScalarReplAggregates.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)


Index: llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
diff -u llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.79 llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.80
--- llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.79	Sun Mar 18 19:16:43 2007
+++ llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp	Mon Mar 19 13:25:57 2007
@@ -661,7 +661,8 @@
   // up.
   for (Value::use_iterator UI = AI->use_begin(), E = AI->use_end();
        UI != E; ) {
-    GetElementPtrInst *GEPI = cast<GetElementPtrInst>(*UI++);
+    GetElementPtrInst *GEPI = dyn_cast<GetElementPtrInst>(*UI++);
+    if (!GEPI) continue;
     gep_type_iterator I = gep_type_begin(GEPI);
     ++I;
 





From reid at x10sys.com  Mon Mar 19 13:27:56 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 13:27:56 -0500
Subject: [llvm-commits] CVS: llvm/test/CodeGen/X86/2007-03-01-SpillerCrash.ll
Message-ID: <200703191827.l2JIRuLr016913@zion.cs.uiuc.edu>



Changes in directory llvm/test/CodeGen/X86:

2007-03-01-SpillerCrash.ll updated: 1.1 -> 1.2
---
Log message:

For PR1258: http://llvm.org/PR1258 :
Revise numeric value references to accommodate collapsed type planes.


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

 2007-03-01-SpillerCrash.ll |  112 ++++++++++++++++++++++-----------------------
 1 files changed, 56 insertions(+), 56 deletions(-)


Index: llvm/test/CodeGen/X86/2007-03-01-SpillerCrash.ll
diff -u llvm/test/CodeGen/X86/2007-03-01-SpillerCrash.ll:1.1 llvm/test/CodeGen/X86/2007-03-01-SpillerCrash.ll:1.2
--- llvm/test/CodeGen/X86/2007-03-01-SpillerCrash.ll:1.1	Fri Mar  2 04:37:19 2007
+++ llvm/test/CodeGen/X86/2007-03-01-SpillerCrash.ll	Mon Mar 19 13:27:35 2007
@@ -8,78 +8,78 @@
 	mul <4 x float> %0, %2		; <<4 x float>>:3 [#uses=1]
 	sub <4 x float> zeroinitializer, %3		; <<4 x float>>:4 [#uses=1]
 	mul <4 x float> %4, zeroinitializer		; <<4 x float>>:5 [#uses=2]
-	bitcast <4 x float> zeroinitializer to <4 x i32>		; <<4 x i32>>:0 [#uses=1]
-	and <4 x i32> %0, < i32 2147483647, i32 2147483647, i32 2147483647, i32 2147483647 >		; <<4 x i32>>:1 [#uses=1]
-	bitcast <4 x i32> %1 to <4 x float>		; <<4 x float>>:6 [#uses=2]
-	extractelement <4 x float> %6, i32 0		; <float>:0 [#uses=1]
-	extractelement <4 x float> %6, i32 1		; <float>:1 [#uses=2]
-	br i1 false, label %0, label %5
+	bitcast <4 x float> zeroinitializer to <4 x i32>		; <<4 x i32>>:6 [#uses=1]
+	and <4 x i32> %6, < i32 2147483647, i32 2147483647, i32 2147483647, i32 2147483647 >		; <<4 x i32>>:7 [#uses=1]
+	bitcast <4 x i32> %7 to <4 x float>		; <<4 x float>>:8 [#uses=2]
+	extractelement <4 x float> %8, i32 0		; <float>:9 [#uses=1]
+	extractelement <4 x float> %8, i32 1		; <float>:10 [#uses=2]
+	br i1 false, label %11, label %19
 
-; <label>:0		; preds = %test.exit
-	br i1 false, label %3, label %1
+; <label>:11		; preds = %test.exit
+	br i1 false, label %17, label %12
 
-; <label>:1		; preds = %0
-	br i1 false, label %5, label %2
+; <label>:12		; preds = %11
+	br i1 false, label %19, label %13
 
-; <label>:2		; preds = %1
-	sub float -0.000000e+00, 0.000000e+00		; <float>:2 [#uses=1]
+; <label>:13		; preds = %12
+	sub float -0.000000e+00, 0.000000e+00		; <float>:14 [#uses=1]
 	%tmp207 = extractelement <4 x float> zeroinitializer, i32 0		; <float> [#uses=1]
 	%tmp208 = extractelement <4 x float> zeroinitializer, i32 2		; <float> [#uses=1]
-	sub float -0.000000e+00, %tmp208		; <float>:3 [#uses=1]
+	sub float -0.000000e+00, %tmp208		; <float>:15 [#uses=1]
 	%tmp155 = extractelement <4 x float> zeroinitializer, i32 0		; <float> [#uses=1]
 	%tmp156 = extractelement <4 x float> zeroinitializer, i32 2		; <float> [#uses=1]
-	sub float -0.000000e+00, %tmp156		; <float>:4 [#uses=1]
-	br label %5
+	sub float -0.000000e+00, %tmp156		; <float>:16 [#uses=1]
+	br label %19
 
-; <label>:3		; preds = %0
-	br i1 false, label %5, label %4
+; <label>:17		; preds = %11
+	br i1 false, label %19, label %18
 
-; <label>:4		; preds = %3
-	br label %5
+; <label>:18		; preds = %17
+	br label %19
 
-; <label>:5		; preds = %4, %3, %2, %1, %test.exit
-	phi i32 [ 5, %4 ], [ 3, %2 ], [ 1, %test.exit ], [ 2, %1 ], [ 4, %3 ]		; <i32>:0 [#uses=0]
-	phi float [ 0.000000e+00, %4 ], [ %4, %2 ], [ 0.000000e+00, %test.exit ], [ 0.000000e+00, %1 ], [ 0.000000e+00, %3 ]		; <float>:5 [#uses=1]
-	phi float [ 0.000000e+00, %4 ], [ %tmp155, %2 ], [ 0.000000e+00, %test.exit ], [ 0.000000e+00, %1 ], [ 0.000000e+00, %3 ]		; <float>:6 [#uses=1]
-	phi float [ 0.000000e+00, %4 ], [ %3, %2 ], [ 0.000000e+00, %test.exit ], [ 0.000000e+00, %1 ], [ 0.000000e+00, %3 ]		; <float>:7 [#uses=1]
-	phi float [ 0.000000e+00, %4 ], [ %tmp207, %2 ], [ 0.000000e+00, %test.exit ], [ 0.000000e+00, %1 ], [ 0.000000e+00, %3 ]		; <float>:8 [#uses=1]
-	phi float [ 0.000000e+00, %4 ], [ %1, %2 ], [ %0, %test.exit ], [ %1, %1 ], [ 0.000000e+00, %3 ]		; <float>:9 [#uses=2]
-	phi float [ 0.000000e+00, %4 ], [ %2, %2 ], [ 0.000000e+00, %test.exit ], [ 0.000000e+00, %1 ], [ 0.000000e+00, %3 ]		; <float>:10 [#uses=1]
-	phi float [ 0.000000e+00, %4 ], [ 0.000000e+00, %2 ], [ 0.000000e+00, %test.exit ], [ 0.000000e+00, %1 ], [ 0.000000e+00, %3 ]		; <float>:11 [#uses=1]
-	insertelement <4 x float> undef, float %11, i32 0		; <<4 x float>>:7 [#uses=1]
-	insertelement <4 x float> %7, float %10, i32 1		; <<4 x float>>:8 [#uses=0]
-	insertelement <4 x float> undef, float %8, i32 0		; <<4 x float>>:9 [#uses=1]
-	insertelement <4 x float> %9, float %7, i32 1		; <<4 x float>>:10 [#uses=1]
-	insertelement <4 x float> %10, float %9, i32 2		; <<4 x float>>:11 [#uses=1]
-	insertelement <4 x float> %11, float %9, i32 3		; <<4 x float>>:12 [#uses=1]
-	fdiv <4 x float> %12, zeroinitializer		; <<4 x float>>:13 [#uses=1]
-	mul <4 x float> %13, < float 5.000000e-01, float 5.000000e-01, float 5.000000e-01, float 5.000000e-01 >		; <<4 x float>>:14 [#uses=1]
-	insertelement <4 x float> undef, float %6, i32 0		; <<4 x float>>:15 [#uses=1]
-	insertelement <4 x float> %15, float %5, i32 1		; <<4 x float>>:16 [#uses=0]
-	br i1 false, label %foo.exit, label %6
-
-; <label>:6		; preds = %5
-	extractelement <4 x float> %0, i32 0		; <float>:12 [#uses=1]
-	fcmp ogt float %12, 0.000000e+00		; <i1>:0 [#uses=1]
-	extractelement <4 x float> %0, i32 2		; <float>:13 [#uses=1]
-	extractelement <4 x float> %0, i32 1		; <float>:14 [#uses=1]
-	sub float -0.000000e+00, %14		; <float>:15 [#uses=2]
+; <label>:19		; preds = %18, %17, %13, %12, %test.exit
+	phi i32 [ 5, %18 ], [ 3, %13 ], [ 1, %test.exit ], [ 2, %12 ], [ 4, %17 ]		; <i32>:20 [#uses=0]
+	phi float [ 0.000000e+00, %18 ], [ %16, %13 ], [ 0.000000e+00, %test.exit ], [ 0.000000e+00, %12 ], [ 0.000000e+00, %17 ]		; <float>:21 [#uses=1]
+	phi float [ 0.000000e+00, %18 ], [ %tmp155, %13 ], [ 0.000000e+00, %test.exit ], [ 0.000000e+00, %12 ], [ 0.000000e+00, %17 ]		; <float>:22 [#uses=1]
+	phi float [ 0.000000e+00, %18 ], [ %15, %13 ], [ 0.000000e+00, %test.exit ], [ 0.000000e+00, %12 ], [ 0.000000e+00, %17 ]		; <float>:23 [#uses=1]
+	phi float [ 0.000000e+00, %18 ], [ %tmp207, %13 ], [ 0.000000e+00, %test.exit ], [ 0.000000e+00, %12 ], [ 0.000000e+00, %17 ]		; <float>:24 [#uses=1]
+	phi float [ 0.000000e+00, %18 ], [ %10, %13 ], [ %9, %test.exit ], [ %10, %12 ], [ 0.000000e+00, %17 ]		; <float>:25 [#uses=2]
+	phi float [ 0.000000e+00, %18 ], [ %14, %13 ], [ 0.000000e+00, %test.exit ], [ 0.000000e+00, %12 ], [ 0.000000e+00, %17 ]		; <float>:26 [#uses=1]
+	phi float [ 0.000000e+00, %18 ], [ 0.000000e+00, %13 ], [ 0.000000e+00, %test.exit ], [ 0.000000e+00, %12 ], [ 0.000000e+00, %17 ]		; <float>:27 [#uses=1]
+	insertelement <4 x float> undef, float %27, i32 0		; <<4 x float>>:28 [#uses=1]
+	insertelement <4 x float> %28, float %26, i32 1		; <<4 x float>>:29 [#uses=0]
+	insertelement <4 x float> undef, float %24, i32 0		; <<4 x float>>:30 [#uses=1]
+	insertelement <4 x float> %30, float %23, i32 1		; <<4 x float>>:31 [#uses=1]
+	insertelement <4 x float> %31, float %25, i32 2		; <<4 x float>>:32 [#uses=1]
+	insertelement <4 x float> %32, float %25, i32 3		; <<4 x float>>:33 [#uses=1]
+	fdiv <4 x float> %33, zeroinitializer		; <<4 x float>>:34 [#uses=1]
+	mul <4 x float> %34, < float 5.000000e-01, float 5.000000e-01, float 5.000000e-01, float 5.000000e-01 >		; <<4 x float>>:35 [#uses=1]
+	insertelement <4 x float> undef, float %22, i32 0		; <<4 x float>>:36 [#uses=1]
+	insertelement <4 x float> %36, float %21, i32 1		; <<4 x float>>:37 [#uses=0]
+	br i1 false, label %foo.exit, label %38
+
+; <label>:38		; preds = %19
+	extractelement <4 x float> %0, i32 0		; <float>:39 [#uses=1]
+	fcmp ogt float %39, 0.000000e+00		; <i1>:40 [#uses=1]
+	extractelement <4 x float> %0, i32 2		; <float>:41 [#uses=1]
+	extractelement <4 x float> %0, i32 1		; <float>:42 [#uses=1]
+	sub float -0.000000e+00, %42		; <float>:43 [#uses=2]
 	%tmp189 = extractelement <4 x float> %5, i32 2		; <float> [#uses=1]
-	br i1 %0, label %7, label %8
+	br i1 %40, label %44, label %46
 
-; <label>:7		; preds = %6
-	sub float -0.000000e+00, %tmp189		; <float>:16 [#uses=0]
+; <label>:44		; preds = %38
+	sub float -0.000000e+00, %tmp189		; <float>:45 [#uses=0]
 	br label %foo.exit
 
-; <label>:8		; preds = %6
+; <label>:46		; preds = %38
 	%tmp192 = extractelement <4 x float> %5, i32 1		; <float> [#uses=1]
-	sub float -0.000000e+00, %tmp192		; <float>:17 [#uses=1]
+	sub float -0.000000e+00, %tmp192		; <float>:47 [#uses=1]
 	br label %foo.exit
 
-foo.exit:		; preds = %8, %7, %5
-	phi float [ 0.000000e+00, %7 ], [ %17, %8 ], [ 0.000000e+00, %5 ]		; <float>:18 [#uses=0]
-	phi float [ %15, %7 ], [ %15, %8 ], [ 0.000000e+00, %5 ]		; <float>:19 [#uses=0]
-	phi float [ 0.000000e+00, %7 ], [ %13, %8 ], [ 0.000000e+00, %5 ]		; <float>:20 [#uses=0]
-	shufflevector <4 x float> %14, <4 x float> zeroinitializer, <4 x i32> < i32 0, i32 4, i32 1, i32 5 >		; <<4 x float>>:17 [#uses=0]
+foo.exit:		; preds = %46, %44, %19
+	phi float [ 0.000000e+00, %44 ], [ %47, %46 ], [ 0.000000e+00, %19 ]		; <float>:48 [#uses=0]
+	phi float [ %43, %44 ], [ %43, %46 ], [ 0.000000e+00, %19 ]		; <float>:49 [#uses=0]
+	phi float [ 0.000000e+00, %44 ], [ %41, %46 ], [ 0.000000e+00, %19 ]		; <float>:50 [#uses=0]
+	shufflevector <4 x float> %35, <4 x float> zeroinitializer, <4 x i32> < i32 0, i32 4, i32 1, i32 5 >		; <<4 x float>>:51 [#uses=0]
 	unreachable
 }





From reid at x10sys.com  Mon Mar 19 13:27:57 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 13:27:57 -0500
Subject: [llvm-commits] CVS:
	llvm/test/CodeGen/ARM/2007-03-07-CombinerCrash.ll
Message-ID: <200703191827.l2JIRvDj016918@zion.cs.uiuc.edu>



Changes in directory llvm/test/CodeGen/ARM:

2007-03-07-CombinerCrash.ll updated: 1.1 -> 1.2
---
Log message:

For PR1258: http://llvm.org/PR1258 :
Revise numeric value references to accommodate collapsed type planes.


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

 2007-03-07-CombinerCrash.ll |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)


Index: llvm/test/CodeGen/ARM/2007-03-07-CombinerCrash.ll
diff -u llvm/test/CodeGen/ARM/2007-03-07-CombinerCrash.ll:1.1 llvm/test/CodeGen/ARM/2007-03-07-CombinerCrash.ll:1.2
--- llvm/test/CodeGen/ARM/2007-03-07-CombinerCrash.ll:1.1	Wed Mar  7 02:12:39 2007
+++ llvm/test/CodeGen/ARM/2007-03-07-CombinerCrash.ll	Mon Mar 19 13:27:35 2007
@@ -3,19 +3,19 @@
 define fastcc i8* @read_sleb128(i8* %p, i32* %val) {
 	br label %bb
 
-bb:
-	%p_addr.0 = getelementptr i8* %p, i32 0
-	%tmp2 = load i8* %p_addr.0
-	%tmp4.rec = add i32 0, 1
-	%tmp4 = getelementptr i8* %p, i32 %tmp4.rec
-	%tmp56 = zext i8 %tmp2 to i32
-	%tmp7 = and i32 %tmp56, 127
-	%tmp9 = shl i32 %tmp7, 0
-	%tmp11 = or i32 %tmp9, 0
-	icmp slt i8 %tmp2, 0
-	br i1 %0, label %bb, label %cond_next28
+bb:		; preds = %bb, %0
+	%p_addr.0 = getelementptr i8* %p, i32 0		; <i8*> [#uses=1]
+	%tmp2 = load i8* %p_addr.0		; <i8> [#uses=2]
+	%tmp4.rec = add i32 0, 1		; <i32> [#uses=1]
+	%tmp4 = getelementptr i8* %p, i32 %tmp4.rec		; <i8*> [#uses=1]
+	%tmp56 = zext i8 %tmp2 to i32		; <i32> [#uses=1]
+	%tmp7 = and i32 %tmp56, 127		; <i32> [#uses=1]
+	%tmp9 = shl i32 %tmp7, 0		; <i32> [#uses=1]
+	%tmp11 = or i32 %tmp9, 0		; <i32> [#uses=1]
+	icmp slt i8 %tmp2, 0		; <i1>:1 [#uses=1]
+	br i1 %1, label %bb, label %cond_next28
 
-cond_next28:
+cond_next28:		; preds = %bb
 	store i32 %tmp11, i32* %val
 	ret i8* %tmp4
 }





From reid at x10sys.com  Mon Mar 19 13:28:01 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 13:28:01 -0500
Subject: [llvm-commits] CVS: llvm/test/Integer/basictest_bt.ll
	constexpr_bt.ll constpointer_bt.ll indirectcall_bt.ll
	testvarargs_bt.ll
Message-ID: <200703191828.l2JIS1qj016931@zion.cs.uiuc.edu>



Changes in directory llvm/test/Integer:

basictest_bt.ll updated: 1.2 -> 1.3
constexpr_bt.ll updated: 1.3 -> 1.4
constpointer_bt.ll updated: 1.2 -> 1.3
indirectcall_bt.ll updated: 1.3 -> 1.4
testvarargs_bt.ll updated: 1.2 -> 1.3
---
Log message:

For PR1258: http://llvm.org/PR1258 :
Revise numeric value references to accommodate collapsed type planes.


---
Diffs of the changes:  (+27 -29)

 basictest_bt.ll    |   36 +++++++++++++++++-------------------
 constexpr_bt.ll    |    4 ++--
 constpointer_bt.ll |    6 +++---
 indirectcall_bt.ll |    8 ++++----
 testvarargs_bt.ll  |    2 +-
 5 files changed, 27 insertions(+), 29 deletions(-)


Index: llvm/test/Integer/basictest_bt.ll
diff -u llvm/test/Integer/basictest_bt.ll:1.2 llvm/test/Integer/basictest_bt.ll:1.3
--- llvm/test/Integer/basictest_bt.ll:1.2	Fri Jan 26 02:25:06 2007
+++ llvm/test/Integer/basictest_bt.ll	Mon Mar 19 13:27:35 2007
@@ -2,33 +2,31 @@
 ; RUN: llvm-as %t1.ll -o - | llvm-dis > %t2.ll
 ; RUN: diff %t1.ll %t2.ll
 
-implementation
+implementation   ; Functions:
 
 ; Test "stripped" format where nothing is symbolic... this is how the bytecode
 ; format looks anyways (except for negative vs positive offsets)...
 ;
-define void @"void"(i39, i39)   ; Def %0, %1
-begin
-	add i39 0, 0      ; Def 2
-	sub i39 0, 4      ; Def 3
-	br label %1
+define void @void(i39, i39) {
+	add i39 0, 0			; <i39>:3 [#uses=2]
+	sub i39 0, 4			; <i39>:4 [#uses=2]
+	br label %5
 
-; <label>:1		; preds = %1, %0
-	add i39 %0, %1    ; Def 4
-	sub i39 %4, %3    ; Def 5
-	icmp sle i39 %5, %2  ; Def 0 - i1 plane
-	br i1 %0, label %2, label %1
+; <label>:5				; preds = %5, %2
+	add i39 %0, %1			; <i39>:6 [#uses=2]
+	sub i39 %6, %4			; <i39>:7 [#uses=1]
+	icmp sle i39 %7, %3		; <i1>:8 [#uses=1]
+	br i1 %8, label %9, label %5
 
-; <label>:2		; preds = %1
-	add i39 %0, %1    ; Def 6
-	sub i39 %4, %3    ; Def 7
-	icmp sle i39 %7, %2  ; Def 1 - i1 plane
+; <label>:9				; preds = %5
+	add i39 %0, %1			; <i39>:10 [#uses=0]
+	sub i39 %6, %4			; <i39>:11 [#uses=1]
+	icmp sle i39 %11, %3		; <i1>:12 [#uses=0]
 	ret void
-end
+}
 
 ; This function always returns zero
-define i39 @"zarro"()
-begin
+define i39 @zarro() {
 Startup:
 	ret i39 0
-end
+}


Index: llvm/test/Integer/constexpr_bt.ll
diff -u llvm/test/Integer/constexpr_bt.ll:1.3 llvm/test/Integer/constexpr_bt.ll:1.4
--- llvm/test/Integer/constexpr_bt.ll:1.3	Fri Jan 26 02:25:06 2007
+++ llvm/test/Integer/constexpr_bt.ll	Mon Mar 19 13:27:35 2007
@@ -24,8 +24,8 @@
 @t9 = global i33 fptosi (float sitofp (i33 8 to float) to i33) ;; Nested cast expression
 
 
-global i32* bitcast (float* @0 to i32*)   ;; Forward numeric reference
-global float* @0                       ;; Duplicate forward numeric reference
+global i32* bitcast (float* @4 to i32*)   ;; Forward numeric reference
+global float* @4                       ;; Duplicate forward numeric reference
 global float 0.0
 
 


Index: llvm/test/Integer/constpointer_bt.ll
diff -u llvm/test/Integer/constpointer_bt.ll:1.2 llvm/test/Integer/constpointer_bt.ll:1.3
--- llvm/test/Integer/constpointer_bt.ll:1.2	Fri Jan 26 02:25:06 2007
+++ llvm/test/Integer/constpointer_bt.ll	Mon Mar 19 13:27:35 2007
@@ -16,10 +16,10 @@
 
 @t2 = global i40 * @t1
 
-global float * @0                ;; Forward numeric reference
-global float * @0                ;; Duplicate forward numeric reference
+global float * @2                ;; Forward numeric reference
+global float * @2                ;; Duplicate forward numeric reference
 global float 0.0
-global float * @0                ;; Numeric reference
+global float * @2                ;; Numeric reference
 
 
 @fptr = global void() * @f       ;; Forward ref method defn


Index: llvm/test/Integer/indirectcall_bt.ll
diff -u llvm/test/Integer/indirectcall_bt.ll:1.3 llvm/test/Integer/indirectcall_bt.ll:1.4
--- llvm/test/Integer/indirectcall_bt.ll:1.3	Tue Jan 30 10:16:01 2007
+++ llvm/test/Integer/indirectcall_bt.ll	Mon Mar 19 13:27:35 2007
@@ -8,8 +8,8 @@
 
 define i63 @"fib"(i63 %n)
 begin
-  icmp ult i63 %n, 2       ; {i1}:0
-  br i1 %0, label %BaseCase, label %RecurseCase
+  icmp ult i63 %n, 2       ; {i1}:1
+  br i1 %1, label %BaseCase, label %RecurseCase
 
 BaseCase:
   ret i63 1
@@ -25,8 +25,8 @@
 
 define i63 @"realmain"(i32 %argc, i8 ** %argv)
 begin
-  icmp eq i32 %argc, 2      ; {i1}:0
-  br i1 %0, label %HasArg, label %Continue
+  icmp eq i32 %argc, 2      ; {i1}:1
+  br i1 %1, label %HasArg, label %Continue
 HasArg:
   ; %n1 = atoi(argv[1])
   %n1 = add i32 1, 1


Index: llvm/test/Integer/testvarargs_bt.ll
diff -u llvm/test/Integer/testvarargs_bt.ll:1.2 llvm/test/Integer/testvarargs_bt.ll:1.3
--- llvm/test/Integer/testvarargs_bt.ll:1.2	Fri Jan 26 02:25:06 2007
+++ llvm/test/Integer/testvarargs_bt.ll	Mon Mar 19 13:27:35 2007
@@ -9,7 +9,7 @@
 define i31 @"testvarar"()
 begin
 	call i31(i8*, ...) *@printf(i8 * null, i31 12, i8 42);
-	ret i31 %0
+	ret i31 %1
 end
 
 





From reid at x10sys.com  Mon Mar 19 13:28:02 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 13:28:02 -0500
Subject: [llvm-commits] CVS:
	llvm/test/Transforms/ADCE/2002-01-31-UseStuckAround.ll
Message-ID: <200703191828.l2JIS2tY016937@zion.cs.uiuc.edu>



Changes in directory llvm/test/Transforms/ADCE:

2002-01-31-UseStuckAround.ll updated: 1.3 -> 1.4
---
Log message:

For PR1258: http://llvm.org/PR1258 :
Revise numeric value references to accommodate collapsed type planes.


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

 2002-01-31-UseStuckAround.ll |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Index: llvm/test/Transforms/ADCE/2002-01-31-UseStuckAround.ll
diff -u llvm/test/Transforms/ADCE/2002-01-31-UseStuckAround.ll:1.3 llvm/test/Transforms/ADCE/2002-01-31-UseStuckAround.ll:1.4
--- llvm/test/Transforms/ADCE/2002-01-31-UseStuckAround.ll:1.3	Fri Dec  1 22:23:08 2006
+++ llvm/test/Transforms/ADCE/2002-01-31-UseStuckAround.ll	Mon Mar 19 13:27:35 2007
@@ -1,14 +1,14 @@
-; RUN: llvm-upgrade < %s | llvm-as | opt -adce
+; RUN:  llvm-as %s -o - | opt -adce
 
 implementation
 
-int "main"(int %argc)
+define i32 @"main"(i32 %argc)
 begin
 	br label %2
 
-	%retval = phi int [ %argc, %2 ]		; <int>	[#uses=2]
-	%two = add int %retval, %retval		; <int>	[#uses=1]
-	ret int %two
+	%retval = phi i32 [ %argc, %2 ]		; <i32>	[#uses=2]
+	%two = add i32 %retval, %retval		; <i32>	[#uses=1]
+	ret i32 %two
 
 	br label %1
 end





From reid at x10sys.com  Mon Mar 19 13:33:10 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 13:33:10 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp
Message-ID: <200703191833.l2JIXAho017048@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.263 -> 1.264
---
Log message:

For PR1258: http://llvm.org/PR1258 :
Radically simplify the SlotMachine. There is no need to keep Value planes
around any more. This change causes slot numbering to number all un-named, 
non-void values starting at 0 and incrementing monotonically through the 
function, regardless of type (including BasicBlocks). Getting slot numbers
is now a single lookup operation instead of a double lookup.


---
Diffs of the changes:  (+20 -39)

 AsmWriter.cpp |   59 +++++++++++++++++++---------------------------------------
 1 files changed, 20 insertions(+), 39 deletions(-)


Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.263 llvm/lib/VMCore/AsmWriter.cpp:1.264
--- llvm/lib/VMCore/AsmWriter.cpp:1.263	Tue Feb 27 14:25:25 2007
+++ llvm/lib/VMCore/AsmWriter.cpp	Mon Mar 19 13:32:53 2007
@@ -48,17 +48,7 @@
 public:
 
   /// @brief A mapping of Values to slot numbers
-  typedef std::map<const Value*, unsigned> ValueMap;
-
-  /// @brief A plane with next slot number and ValueMap
-  struct ValuePlane {
-    unsigned next_slot;        ///< The next slot number to use
-    ValueMap map;              ///< The map of Value* -> unsigned
-    ValuePlane() { next_slot = 0; } ///< Make sure we start at 0
-  };
-
-  /// @brief The map of planes by Type
-  typedef std::map<const Type*, ValuePlane> TypedPlanes;
+  typedef std::map<const Value*,unsigned> ValueMap;
 
 /// @}
 /// @name Constructors
@@ -131,10 +121,12 @@
   bool FunctionProcessed;
 
   /// @brief The TypePlanes map for the module level data
-  TypedPlanes mMap;
+  ValueMap mMap;
+  unsigned mNext;
 
   /// @brief The TypePlanes map for the function level data
-  TypedPlanes fMap;
+  ValueMap fMap;
+  unsigned fNext;
 
 /// @}
 
@@ -1385,6 +1377,7 @@
   : TheModule(M)    ///< Saved for lazy initialization.
   , TheFunction(0)
   , FunctionProcessed(false)
+  , mMap(), mNext(0), fMap(), fNext(0)
 {
 }
 
@@ -1394,6 +1387,7 @@
   : TheModule(F ? F->getParent() : 0) ///< Saved for lazy initialization
   , TheFunction(F) ///< Saved for lazy initialization
   , FunctionProcessed(false)
+  , mMap(), mNext(0), fMap(), fNext(0)
 {
 }
 
@@ -1430,6 +1424,7 @@
 // Process the arguments, basic blocks, and instructions  of a function.
 void SlotMachine::processFunction() {
   SC_DEBUG("begin processFunction!\n");
+  fNext = 0;
 
   // Add all the function arguments with no names.
   for(Function::const_arg_iterator AI = TheFunction->arg_begin(),
@@ -1471,12 +1466,10 @@
   initialize();
   
   // Find the type plane in the module map
-  TypedPlanes::const_iterator MI = mMap.find(V->getType());
+  ValueMap::const_iterator MI = mMap.find(V);
   if (MI == mMap.end()) return -1;
-  
-  // Lookup the value in the module plane's map.
-  ValueMap::const_iterator MVI = MI->second.map.find(V);
-  return MVI != MI->second.map.end() ? int(MVI->second) : -1;
+
+  return MI->second;
 }
 
 
@@ -1487,33 +1480,23 @@
   // Check for uninitialized state and do lazy initialization.
   initialize();
 
-  // Get the type of the value
-  const Type *VTy = V->getType();
-
-  TypedPlanes::const_iterator FI = fMap.find(VTy);
+  ValueMap::const_iterator FI = fMap.find(V);
   if (FI == fMap.end()) return -1;
   
-  // Lookup the Value in the function and module maps.
-  ValueMap::const_iterator FVI = FI->second.map.find(V);
-  
-  // If the value doesn't exist in the function map, it is a <badref>
-  if (FVI == FI->second.map.end()) return -1;
-  
-  return FVI->second;
+  return FI->second;
 }
 
 
 /// CreateModuleSlot - Insert the specified GlobalValue* into the slot table.
 void SlotMachine::CreateModuleSlot(const GlobalValue *V) {
   assert(V && "Can't insert a null Value into SlotMachine!");
+  assert(V->getType() != Type::VoidTy && "Doesn't need a slot!");
+  assert(!V->hasName() && "Doesn't need a slot!");
   
-  unsigned DestSlot = 0;
-  const Type *VTy = V->getType();
-  
-  ValuePlane &PlaneMap = mMap[VTy];
-  DestSlot = PlaneMap.map[V] = PlaneMap.next_slot++;
+  unsigned DestSlot = mNext++;
+  mMap[V] = DestSlot;
   
-  SC_DEBUG("  Inserting value [" << VTy << "] = " << V << " slot=" <<
+  SC_DEBUG("  Inserting value [" << V->getType() << "] = " << V << " slot=" <<
            DestSlot << " [");
   // G = Global, F = Function, o = other
   SC_DEBUG((isa<GlobalVariable>(V) ? 'G' : 'F') << "]\n");
@@ -1525,10 +1508,8 @@
   const Type *VTy = V->getType();
   assert(VTy != Type::VoidTy && !V->hasName() && "Doesn't need a slot!");
   
-  unsigned DestSlot = 0;
-  
-  ValuePlane &PlaneMap = fMap[VTy];
-  DestSlot = PlaneMap.map[V] = PlaneMap.next_slot++;
+  unsigned DestSlot = fNext++;
+  fMap[V] = DestSlot;
   
   // G = Global, F = Function, o = other
   SC_DEBUG("  Inserting value [" << VTy << "] = " << V << " slot=" <<





From reid at x10sys.com  Mon Mar 19 13:34:46 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 13:34:46 -0500
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/ParserInternals.h
Message-ID: <200703191834.l2JIYkU6017084@zion.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

ParserInternals.h updated: 1.53 -> 1.54
---
Log message:

Add and Operator== method to ValID so equality can be done properly for
named or numbered ValIDs.


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

 ParserInternals.h |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+)


Index: llvm/lib/AsmParser/ParserInternals.h
diff -u llvm/lib/AsmParser/ParserInternals.h:1.53 llvm/lib/AsmParser/ParserInternals.h:1.54
--- llvm/lib/AsmParser/ParserInternals.h:1.53	Fri Jan 26 02:04:51 2007
+++ llvm/lib/AsmParser/ParserInternals.h	Mon Mar 19 13:34:28 2007
@@ -207,6 +207,26 @@
     default:  assert(0 && "Unknown value type!"); return false;
     }
   }
+
+  bool operator==(const ValID &V) const {
+    if (Type == V.Type) {
+      switch (Type) {
+        case LocalID:
+        case GlobalID: return Num == V.Num;
+        case LocalName:
+        case GlobalName: return strcmp(Name, V.Name) == 0;
+        case ConstSIntVal:  return ConstPool64  == V.ConstPool64;
+        case ConstUIntVal:  return UConstPool64 == V.UConstPool64;
+        case ConstFPVal:    return ConstPoolFP  == V.ConstPoolFP;
+        case ConstantVal:   return ConstantValue == V.ConstantValue;
+        case ConstNullVal:  return true;
+        case ConstUndefVal: return true;
+        case ConstZeroVal:  return true;
+        default:  assert(0 && "Unknown value type!"); return false;
+      }
+    }
+    return false;
+  }
 };
 
 struct TypeWithAttrs {





From reid at x10sys.com  Mon Mar 19 13:39:53 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 13:39:53 -0500
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.y
Message-ID: <200703191839.l2JIdrrX017251@zion.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

llvmAsmParser.y updated: 1.327 -> 1.328
---
Log message:

For PR1248: http://llvm.org/PR1248 :
Eliminate support for type planes in numbered values. This simplifies the
data structures involved in managing forward definitions, etc. Instead of
requiring maps from type to value, we can now just use a vector of values.
These changes also required rewrites of some support functions such as
InsertValue, getBBVal, and ResolveDefinitions. Some other cosmetic changes
were made as well.


---
Diffs of the changes:  (+171 -157)

 llvmAsmParser.y |  328 +++++++++++++++++++++++++++++---------------------------
 1 files changed, 171 insertions(+), 157 deletions(-)


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.327 llvm/lib/AsmParser/llvmAsmParser.y:1.328
--- llvm/lib/AsmParser/llvmAsmParser.y:1.327	Thu Mar  1 13:32:01 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y	Mon Mar 19 13:39:36 2007
@@ -84,13 +84,12 @@
 typedef std::vector<Value *> ValueList;           // Numbered defs
 
 static void 
-ResolveDefinitions(std::map<const Type *,ValueList> &LateResolvers,
-                   std::map<const Type *,ValueList> *FutureLateResolvers = 0);
+ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers=0);
 
 static struct PerModuleInfo {
   Module *CurrentModule;
-  std::map<const Type *, ValueList> Values; // Module level numbered definitions
-  std::map<const Type *,ValueList> LateResolveValues;
+  ValueList Values; // Module level numbered definitions
+  ValueList LateResolveValues;
   std::vector<PATypeHolder>    Types;
   std::map<ValID, PATypeHolder> LateResolveTypes;
 
@@ -208,17 +207,16 @@
 static struct PerFunctionInfo {
   Function *CurrentFunction;     // Pointer to current function being created
 
-  std::map<const Type*, ValueList> Values; // Keep track of #'d definitions
-  std::map<const Type*, ValueList> LateResolveValues;
+  ValueList Values; // Keep track of #'d definitions
+  unsigned NextValNum;
+  ValueList LateResolveValues;
   bool isDeclare;                   // Is this function a forward declararation?
   GlobalValue::LinkageTypes Linkage; // Linkage for forward declaration.
   GlobalValue::VisibilityTypes Visibility;
 
   /// BBForwardRefs - When we see forward references to basic blocks, keep
   /// track of them here.
-  std::map<BasicBlock*, std::pair<ValID, int> > BBForwardRefs;
-  std::vector<BasicBlock*> NumberedBlocks;
-  unsigned NextBBNum;
+  std::map<ValID, BasicBlock*> BBForwardRefs;
 
   inline PerFunctionInfo() {
     CurrentFunction = 0;
@@ -229,16 +227,14 @@
 
   inline void FunctionStart(Function *M) {
     CurrentFunction = M;
-    NextBBNum = 0;
+    NextValNum = 0;
   }
 
   void FunctionDone() {
-    NumberedBlocks.clear();
-
     // Any forward referenced blocks left?
     if (!BBForwardRefs.empty()) {
       GenerateError("Undefined reference to label " +
-                     BBForwardRefs.begin()->first->getName());
+                     BBForwardRefs.begin()->second->getName());
       return;
     }
 
@@ -246,6 +242,7 @@
     ResolveDefinitions(LateResolveValues, &CurModule.LateResolveValues);
 
     Values.clear();         // Clear out function local definitions
+    BBForwardRefs.clear();
     CurrentFunction = 0;
     isDeclare = false;
     Linkage = GlobalValue::ExternalLinkage;
@@ -260,14 +257,23 @@
 //               Code to handle definitions of all the types
 //===----------------------------------------------------------------------===//
 
-static int InsertValue(Value *V,
-                  std::map<const Type*,ValueList> &ValueTab = CurFun.Values) {
-  if (V->hasName()) return -1;           // Is this a numbered definition?
-
-  // Yes, insert the value into the value table...
-  ValueList &List = ValueTab[V->getType()];
-  List.push_back(V);
-  return List.size()-1;
+static void InsertValue(Value *V, ValueList &ValueTab = CurFun.Values) {
+  // Things that have names or are void typed don't get slot numbers
+  if (V->hasName() || (V->getType() == Type::VoidTy))
+    return;
+
+  // In the case of function values, we have to allow for the forward reference
+  // of basic blocks, which are included in the numbering. Consequently, we keep
+  // track of the next insertion location with NextValNum. When a BB gets 
+  // inserted, it could change the size of the CurFun.Values vector.
+  if (&ValueTab == &CurFun.Values) {
+    if (ValueTab.size() <= CurFun.NextValNum)
+      ValueTab.resize(CurFun.NextValNum+1);
+    ValueTab[CurFun.NextValNum++] = V;
+    return;
+  } 
+  // For all other lists, its okay to just tack it on the back of the vector.
+  ValueTab.push_back(V);
 }
 
 static const Type *getTypeVal(const ValID &D, bool DoNotImprovise = false) {
@@ -314,11 +320,11 @@
   return Typ;
  }
 
-// getValNonImprovising - Look up the value specified by the provided type and
+// getExistingVal - Look up the value specified by the provided type and
 // the provided ValID.  If the value exists and has already been defined, return
 // it.  Otherwise return null.
 //
-static Value *getValNonImprovising(const Type *Ty, const ValID &D) {
+static Value *getExistingVal(const Type *Ty, const ValID &D) {
   if (isa<FunctionType>(Ty)) {
     GenerateError("Functions are not values and "
                    "must be referenced as pointers");
@@ -327,26 +333,29 @@
 
   switch (D.Type) {
   case ValID::LocalID: {                 // Is it a numbered definition?
-    // Module constants occupy the lowest numbered slots.
-    std::map<const Type*,ValueList>::iterator VI = CurFun.Values.find(Ty);
-    // Make sure that our type is within bounds.
-    if (VI == CurFun.Values.end()) return 0;
-
     // Check that the number is within bounds.
-    if (D.Num >= VI->second.size()) return 0;
-
-    return VI->second[D.Num];
+    if (D.Num >= CurFun.Values.size()) 
+      return 0;
+    Value *Result = CurFun.Values[D.Num];
+    if (Ty != Result->getType()) {
+      GenerateError("Numbered value (%" + utostr(D.Num) + ") of type '" +
+                    Result->getType()->getDescription() + "' does not match " 
+                    "expected type, '" + Ty->getDescription() + "'");
+      return 0;
+    }
+    return Result;
   }
   case ValID::GlobalID: {                 // Is it a numbered definition?
-    unsigned Num = D.Num;
-    
-    // Module constants occupy the lowest numbered slots...
-    std::map<const Type*,ValueList>::iterator VI = CurModule.Values.find(Ty);
-    if (VI == CurModule.Values.end()) 
+    if (D.Num >= CurModule.Values.size()) 
       return 0;
-    if (D.Num >= VI->second.size()) 
+    Value *Result = CurModule.Values[D.Num];
+    if (Ty != Result->getType()) {
+      GenerateError("Numbered value (@" + utostr(D.Num) + ") of type '" +
+                    Result->getType()->getDescription() + "' does not match " 
+                    "expected type, '" + Ty->getDescription() + "'");
       return 0;
-    return VI->second[Num];
+    }
+    return Result;
   }
     
   case ValID::LocalName: {                // Is it a named definition?
@@ -447,7 +456,7 @@
   return 0;
 }
 
-// getVal - This function is identical to getValNonImprovising, except that if a
+// getVal - This function is identical to getExistingVal, except that if a
 // value is not already defined, it "improvises" by creating a placeholder var
 // that looks and acts just like the requested variable.  When the value is
 // defined later, all uses of the placeholder variable are replaced with the
@@ -460,7 +469,7 @@
   }
 
   // See if the value has already been defined.
-  Value *V = getValNonImprovising(Ty, ID);
+  Value *V = getExistingVal(Ty, ID);
   if (V) return V;
   if (TriggerError) return 0;
 
@@ -487,69 +496,97 @@
   return V;
 }
 
-/// getBBVal - This is used for two purposes:
-///  * If isDefinition is true, a new basic block with the specified ID is being
-///    defined.
-///  * If isDefinition is true, this is a reference to a basic block, which may
-///    or may not be a forward reference.
-///
-static BasicBlock *getBBVal(const ValID &ID, bool isDefinition = false) {
+/// defineBBVal - This is a definition of a new basic block with the specified
+/// identifier which must be the same as CurFun.NextValNum, if its numeric.
+static BasicBlock *defineBBVal(const ValID &ID) {
   assert(inFunctionScope() && "Can't get basic block at global scope!");
 
-  std::string Name;
   BasicBlock *BB = 0;
-  switch (ID.Type) {
-  default: 
-    GenerateError("Illegal label reference " + ID.getName());
-    return 0;
-  case ValID::LocalID:                // Is it a numbered definition?
-    if (ID.Num >= CurFun.NumberedBlocks.size())
-      CurFun.NumberedBlocks.resize(ID.Num+1);
-    BB = CurFun.NumberedBlocks[ID.Num];
-    break;
-  case ValID::LocalName:                  // Is it a named definition?
-    Name = ID.Name;
-    Value *N = CurFun.CurrentFunction->getValueSymbolTable().lookup(Name);
-    if (N && N->getType()->getTypeID() == Type::LabelTyID)
-      BB = cast<BasicBlock>(N);
-    break;
-  }
 
-  // See if the block has already been defined.
-  if (BB) {
-    // If this is the definition of the block, make sure the existing value was
-    // just a forward reference.  If it was a forward reference, there will be
-    // an entry for it in the PlaceHolderInfo map.
-    if (isDefinition && !CurFun.BBForwardRefs.erase(BB)) {
-      // The existing value was a definition, not a forward reference.
-      GenerateError("Redefinition of label " + ID.getName());
-      return 0;
+  // First, see if this was forward referenced
+
+  std::map<ValID, BasicBlock*>::iterator BBI = CurFun.BBForwardRefs.find(ID);
+  if (BBI != CurFun.BBForwardRefs.end()) {
+    BB = BBI->second;
+    // The forward declaration could have been inserted anywhere in the
+    // function: insert it into the correct place now.
+    CurFun.CurrentFunction->getBasicBlockList().remove(BB);
+    CurFun.CurrentFunction->getBasicBlockList().push_back(BB);
+
+    // Erase the forward ref from the map as its no longer "forward"
+    CurFun.BBForwardRefs.erase(ID);
+
+    // If its a numbered definition, bump the number and set the BB value.
+    if (ID.Type == ValID::LocalID) {
+      assert(ID.Num == CurFun.NextValNum && "Invalid new block number");
+      InsertValue(BB);
     }
 
-    ID.destroy();                       // Free strdup'd memory.
+    ID.destroy();
     return BB;
+  } 
+  
+  // We haven't seen this BB before and its first mention is a definition. 
+  // Just create it and return it.
+  std::string Name (ID.Type == ValID::LocalName ? ID.Name : "");
+  BB = new BasicBlock(Name, CurFun.CurrentFunction);
+  if (ID.Type == ValID::LocalID) {
+    assert(ID.Num == CurFun.NextValNum && "Invalid new block number");
+    InsertValue(BB);
   }
 
-  // Otherwise this block has not been seen before.
-  BB = new BasicBlock("", CurFun.CurrentFunction);
-  if (ID.Type == ValID::LocalName) {
-    BB->setName(ID.Name);
+  ID.destroy(); // Free strdup'd memory
+  return BB;
+}
+
+/// getBBVal - get an existing BB value or create a forward reference for it.
+/// 
+static BasicBlock *getBBVal(const ValID &ID) {
+  assert(inFunctionScope() && "Can't get basic block at global scope!");
+
+  BasicBlock *BB =  0;
+
+  std::map<ValID, BasicBlock*>::iterator BBI = CurFun.BBForwardRefs.find(ID);
+  if (BBI != CurFun.BBForwardRefs.end()) {
+    BB = BBI->second;
+  } if (ID.Type == ValID::LocalName) {
+    std::string Name = ID.Name;
+    Value *N = CurFun.CurrentFunction->getValueSymbolTable().lookup(Name);
+    if (N)
+      if (N->getType()->getTypeID() == Type::LabelTyID)
+        BB = cast<BasicBlock>(N);
+      else
+        GenerateError("Reference to label '" + Name + "' is actually of type '"+
+          N->getType()->getDescription() + "'");
+  } else if (ID.Type == ValID::LocalID) {
+    if (ID.Num < CurFun.NextValNum && ID.Num < CurFun.Values.size()) {
+      if (CurFun.Values[ID.Num]->getType()->getTypeID() == Type::LabelTyID)
+        BB = cast<BasicBlock>(CurFun.Values[ID.Num]);
+      else
+        GenerateError("Reference to label '%" + utostr(ID.Num) + 
+          "' is actually of type '"+ 
+          CurFun.Values[ID.Num]->getType()->getDescription() + "'");
+    }
   } else {
-    CurFun.NumberedBlocks[ID.Num] = BB;
+    GenerateError("Illegal label reference " + ID.getName());
+    return 0;
   }
 
-  // If this is not a definition, keep track of it so we can use it as a forward
-  // reference.
-  if (!isDefinition) {
-    // Remember where this forward reference came from.
-    CurFun.BBForwardRefs[BB] = std::make_pair(ID, llvmAsmlineno);
-  } else {
-    // The forward declaration could have been inserted anywhere in the
-    // function: insert it into the correct place now.
-    CurFun.CurrentFunction->getBasicBlockList().remove(BB);
-    CurFun.CurrentFunction->getBasicBlockList().push_back(BB);
+  // If its already been defined, return it now.
+  if (BB) {
+    ID.destroy(); // Free strdup'd memory.
+    return BB;
   }
-  ID.destroy();
+
+  // Otherwise, this block has not been seen before, create it.
+  std::string Name;
+  if (ID.Type == ValID::LocalName)
+    Name = ID.Name;
+  BB = new BasicBlock(Name, CurFun.CurrentFunction);
+
+  // Insert it in the forward refs map.
+  CurFun.BBForwardRefs[ID] = BB;
+
   return BB;
 }
 
@@ -571,50 +608,44 @@
 // defs now...
 //
 static void 
-ResolveDefinitions(std::map<const Type*,ValueList> &LateResolvers,
-                   std::map<const Type*,ValueList> *FutureLateResolvers) {
+ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers) {
   // Loop over LateResolveDefs fixing up stuff that couldn't be resolved
-  for (std::map<const Type*,ValueList>::iterator LRI = LateResolvers.begin(),
-         E = LateResolvers.end(); LRI != E; ++LRI) {
-    ValueList &List = LRI->second;
-    while (!List.empty()) {
-      Value *V = List.back();
-      List.pop_back();
-
-      std::map<Value*, std::pair<ValID, int> >::iterator PHI =
-        CurModule.PlaceHolderInfo.find(V);
-      assert(PHI != CurModule.PlaceHolderInfo.end() && "Placeholder error!");
+  while (!LateResolvers.empty()) {
+    Value *V = LateResolvers.back();
+    LateResolvers.pop_back();
+
+    std::map<Value*, std::pair<ValID, int> >::iterator PHI =
+      CurModule.PlaceHolderInfo.find(V);
+    assert(PHI != CurModule.PlaceHolderInfo.end() && "Placeholder error!");
 
-      ValID &DID = PHI->second.first;
+    ValID &DID = PHI->second.first;
 
-      Value *TheRealValue = getValNonImprovising(LRI->first, DID);
-      if (TriggerError)
+    Value *TheRealValue = getExistingVal(V->getType(), DID);
+    if (TriggerError)
+      return;
+    if (TheRealValue) {
+      V->replaceAllUsesWith(TheRealValue);
+      delete V;
+      CurModule.PlaceHolderInfo.erase(PHI);
+    } else if (FutureLateResolvers) {
+      // Functions have their unresolved items forwarded to the module late
+      // resolver table
+      InsertValue(V, *FutureLateResolvers);
+    } else {
+      if (DID.Type == ValID::LocalName || DID.Type == ValID::GlobalName) {
+        GenerateError("Reference to an invalid definition: '" +DID.getName()+
+                       "' of type '" + V->getType()->getDescription() + "'",
+                       PHI->second.second);
         return;
-      if (TheRealValue) {
-        V->replaceAllUsesWith(TheRealValue);
-        delete V;
-        CurModule.PlaceHolderInfo.erase(PHI);
-      } else if (FutureLateResolvers) {
-        // Functions have their unresolved items forwarded to the module late
-        // resolver table
-        InsertValue(V, *FutureLateResolvers);
       } else {
-        if (DID.Type == ValID::LocalName || DID.Type == ValID::GlobalName) {
-          GenerateError("Reference to an invalid definition: '" +DID.getName()+
-                         "' of type '" + V->getType()->getDescription() + "'",
-                         PHI->second.second);
-          return;
-        } else {
-          GenerateError("Reference to an invalid definition: #" +
-                         itostr(DID.Num) + " of type '" +
-                         V->getType()->getDescription() + "'",
-                         PHI->second.second);
-          return;
-        }
+        GenerateError("Reference to an invalid definition: #" +
+                       itostr(DID.Num) + " of type '" +
+                       V->getType()->getDescription() + "'",
+                       PHI->second.second);
+        return;
       }
     }
   }
-
   LateResolvers.clear();
 }
 
@@ -688,7 +719,7 @@
   if (!Name.empty()) {
     ID = ValID::createGlobalName((char*)Name.c_str());
   } else {
-    ID = ValID::createGlobalID(CurModule.Values[PTy].size());
+    ID = ValID::createGlobalID(CurModule.Values.size());
   }
 
   if (GlobalValue *FWGV = CurModule.GetForwardRefForGlobal(PTy, ID)) {
@@ -1631,15 +1662,15 @@
 
     // ConstExprs can exist in the body of a function, thus creating
     // GlobalValues whenever they refer to a variable.  Because we are in
-    // the context of a function, getValNonImprovising will search the functions
+    // the context of a function, getExistingVal will search the functions
     // symbol table instead of the module symbol table for the global symbol,
     // which throws things all off.  To get around this, we just tell
-    // getValNonImprovising that we are at global scope here.
+    // getExistingVal that we are at global scope here.
     //
     Function *SavedCurFn = CurFun.CurrentFunction;
     CurFun.CurrentFunction = 0;
 
-    Value *V = getValNonImprovising(Ty, $2);
+    Value *V = getExistingVal(Ty, $2);
     CHECK_FOR_ERROR
 
     CurFun.CurrentFunction = SavedCurFn;
@@ -2116,7 +2147,7 @@
   if (!FunctionName.empty()) {
     ID = ValID::createGlobalName((char*)FunctionName.c_str());
   } else {
-    ID = ValID::createGlobalID(CurModule.Values[PFT].size());
+    ID = ValID::createGlobalID(CurModule.Values.size());
   }
 
   Function *Fn = 0;
@@ -2356,7 +2387,6 @@
     CHECK_FOR_ERROR
     InsertValue($3);
     $1->getInstList().push_back($3);
-    InsertValue($1);
     $$ = $1;
     CHECK_FOR_ERROR
   };
@@ -2370,28 +2400,12 @@
     $$ = $1;
     CHECK_FOR_ERROR
   }
-  | /* empty */ {
-    $$ = getBBVal(ValID::createLocalID(CurFun.NextBBNum++), true);
-    CHECK_FOR_ERROR
-
-    // Make sure to move the basic block to the correct location in the
-    // function, instead of leaving it inserted wherever it was first
-    // referenced.
-    Function::BasicBlockListType &BBL = 
-      CurFun.CurrentFunction->getBasicBlockList();
-    BBL.splice(BBL.end(), BBL, $$);
+  | /* empty */ {          // Empty space between instruction lists
+    $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
   }
-  | LABELSTR {
-    $$ = getBBVal(ValID::createLocalName($1), true);
-    CHECK_FOR_ERROR
-
-    // Make sure to move the basic block to the correct location in the
-    // function, instead of leaving it inserted wherever it was first
-    // referenced.
-    Function::BasicBlockListType &BBL = 
-      CurFun.CurrentFunction->getBasicBlockList();
-    BBL.splice(BBL.end(), BBL, $$);
+  | LABELSTR {             // Labelled (named) basic block
+    $$ = defineBBVal(ValID::createLocalName($1));
     CHECK_FOR_ERROR
   };
 
@@ -2399,15 +2413,15 @@
     $$ = new ReturnInst($2);
     CHECK_FOR_ERROR
   }
-  | RET VOID {                                       // Return with no result...
+  | RET VOID {                                    // Return with no result...
     $$ = new ReturnInst();
     CHECK_FOR_ERROR
   }
-  | BR LABEL ValueRef {                         // Unconditional Branch...
+  | BR LABEL ValueRef {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal($3);
     CHECK_FOR_ERROR
     $$ = new BranchInst(tmpBB);
-  }                                                  // Conditional Branch...
+  }                                               // Conditional Branch...
   | BR INTTYPE ValueRef ',' LABEL ValueRef ',' LABEL ValueRef {  
     assert(cast<IntegerType>($2)->getBitWidth() == 1 && "Not Bool?");
     BasicBlock* tmpBBA = getBBVal($6);
@@ -2526,7 +2540,7 @@
 
 JumpTable : JumpTable IntType ConstValueRef ',' LABEL ValueRef {
     $$ = $1;
-    Constant *V = cast<Constant>(getValNonImprovising($2, $3));
+    Constant *V = cast<Constant>(getExistingVal($2, $3));
     CHECK_FOR_ERROR
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value");
@@ -2537,7 +2551,7 @@
   }
   | IntType ConstValueRef ',' LABEL ValueRef {
     $$ = new std::vector<std::pair<Constant*, BasicBlock*> >();
-    Constant *V = cast<Constant>(getValNonImprovising($1, $2));
+    Constant *V = cast<Constant>(getExistingVal($1, $2));
     CHECK_FOR_ERROR
 
     if (V == 0)





From reid at x10sys.com  Mon Mar 19 13:41:07 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 13:41:07 -0500
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
	llvmAsmParser.h.cvs llvmAsmParser.y.cvs
Message-ID: <200703191841.l2JIf7G6017296@zion.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

llvmAsmParser.cpp.cvs updated: 1.72 -> 1.73
llvmAsmParser.h.cvs updated: 1.57 -> 1.58
llvmAsmParser.y.cvs updated: 1.73 -> 1.74
---
Log message:

Regenerate.


---
Diffs of the changes:  (+611 -583)

 llvmAsmParser.cpp.cvs |  864 +++++++++++++++++++++++++-------------------------
 llvmAsmParser.h.cvs   |    2 
 llvmAsmParser.y.cvs   |  328 +++++++++---------
 3 files changed, 611 insertions(+), 583 deletions(-)


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.72 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.73
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.72	Thu Mar  1 13:41:47 2007
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Mon Mar 19 13:40:50 2007
@@ -408,13 +408,12 @@
 typedef std::vector<Value *> ValueList;           // Numbered defs
 
 static void 
-ResolveDefinitions(std::map<const Type *,ValueList> &LateResolvers,
-                   std::map<const Type *,ValueList> *FutureLateResolvers = 0);
+ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers=0);
 
 static struct PerModuleInfo {
   Module *CurrentModule;
-  std::map<const Type *, ValueList> Values; // Module level numbered definitions
-  std::map<const Type *,ValueList> LateResolveValues;
+  ValueList Values; // Module level numbered definitions
+  ValueList LateResolveValues;
   std::vector<PATypeHolder>    Types;
   std::map<ValID, PATypeHolder> LateResolveTypes;
 
@@ -532,17 +531,16 @@
 static struct PerFunctionInfo {
   Function *CurrentFunction;     // Pointer to current function being created
 
-  std::map<const Type*, ValueList> Values; // Keep track of #'d definitions
-  std::map<const Type*, ValueList> LateResolveValues;
+  ValueList Values; // Keep track of #'d definitions
+  unsigned NextValNum;
+  ValueList LateResolveValues;
   bool isDeclare;                   // Is this function a forward declararation?
   GlobalValue::LinkageTypes Linkage; // Linkage for forward declaration.
   GlobalValue::VisibilityTypes Visibility;
 
   /// BBForwardRefs - When we see forward references to basic blocks, keep
   /// track of them here.
-  std::map<BasicBlock*, std::pair<ValID, int> > BBForwardRefs;
-  std::vector<BasicBlock*> NumberedBlocks;
-  unsigned NextBBNum;
+  std::map<ValID, BasicBlock*> BBForwardRefs;
 
   inline PerFunctionInfo() {
     CurrentFunction = 0;
@@ -553,16 +551,14 @@
 
   inline void FunctionStart(Function *M) {
     CurrentFunction = M;
-    NextBBNum = 0;
+    NextValNum = 0;
   }
 
   void FunctionDone() {
-    NumberedBlocks.clear();
-
     // Any forward referenced blocks left?
     if (!BBForwardRefs.empty()) {
       GenerateError("Undefined reference to label " +
-                     BBForwardRefs.begin()->first->getName());
+                     BBForwardRefs.begin()->second->getName());
       return;
     }
 
@@ -570,6 +566,7 @@
     ResolveDefinitions(LateResolveValues, &CurModule.LateResolveValues);
 
     Values.clear();         // Clear out function local definitions
+    BBForwardRefs.clear();
     CurrentFunction = 0;
     isDeclare = false;
     Linkage = GlobalValue::ExternalLinkage;
@@ -584,14 +581,23 @@
 //               Code to handle definitions of all the types
 //===----------------------------------------------------------------------===//
 
-static int InsertValue(Value *V,
-                  std::map<const Type*,ValueList> &ValueTab = CurFun.Values) {
-  if (V->hasName()) return -1;           // Is this a numbered definition?
-
-  // Yes, insert the value into the value table...
-  ValueList &List = ValueTab[V->getType()];
-  List.push_back(V);
-  return List.size()-1;
+static void InsertValue(Value *V, ValueList &ValueTab = CurFun.Values) {
+  // Things that have names or are void typed don't get slot numbers
+  if (V->hasName() || (V->getType() == Type::VoidTy))
+    return;
+
+  // In the case of function values, we have to allow for the forward reference
+  // of basic blocks, which are included in the numbering. Consequently, we keep
+  // track of the next insertion location with NextValNum. When a BB gets 
+  // inserted, it could change the size of the CurFun.Values vector.
+  if (&ValueTab == &CurFun.Values) {
+    if (ValueTab.size() <= CurFun.NextValNum)
+      ValueTab.resize(CurFun.NextValNum+1);
+    ValueTab[CurFun.NextValNum++] = V;
+    return;
+  } 
+  // For all other lists, its okay to just tack it on the back of the vector.
+  ValueTab.push_back(V);
 }
 
 static const Type *getTypeVal(const ValID &D, bool DoNotImprovise = false) {
@@ -638,11 +644,11 @@
   return Typ;
  }
 
-// getValNonImprovising - Look up the value specified by the provided type and
+// getExistingVal - Look up the value specified by the provided type and
 // the provided ValID.  If the value exists and has already been defined, return
 // it.  Otherwise return null.
 //
-static Value *getValNonImprovising(const Type *Ty, const ValID &D) {
+static Value *getExistingVal(const Type *Ty, const ValID &D) {
   if (isa<FunctionType>(Ty)) {
     GenerateError("Functions are not values and "
                    "must be referenced as pointers");
@@ -651,26 +657,29 @@
 
   switch (D.Type) {
   case ValID::LocalID: {                 // Is it a numbered definition?
-    // Module constants occupy the lowest numbered slots.
-    std::map<const Type*,ValueList>::iterator VI = CurFun.Values.find(Ty);
-    // Make sure that our type is within bounds.
-    if (VI == CurFun.Values.end()) return 0;
-
     // Check that the number is within bounds.
-    if (D.Num >= VI->second.size()) return 0;
-
-    return VI->second[D.Num];
+    if (D.Num >= CurFun.Values.size()) 
+      return 0;
+    Value *Result = CurFun.Values[D.Num];
+    if (Ty != Result->getType()) {
+      GenerateError("Numbered value (%" + utostr(D.Num) + ") of type '" +
+                    Result->getType()->getDescription() + "' does not match " 
+                    "expected type, '" + Ty->getDescription() + "'");
+      return 0;
+    }
+    return Result;
   }
   case ValID::GlobalID: {                 // Is it a numbered definition?
-    unsigned Num = D.Num;
-    
-    // Module constants occupy the lowest numbered slots...
-    std::map<const Type*,ValueList>::iterator VI = CurModule.Values.find(Ty);
-    if (VI == CurModule.Values.end()) 
+    if (D.Num >= CurModule.Values.size()) 
       return 0;
-    if (D.Num >= VI->second.size()) 
+    Value *Result = CurModule.Values[D.Num];
+    if (Ty != Result->getType()) {
+      GenerateError("Numbered value (@" + utostr(D.Num) + ") of type '" +
+                    Result->getType()->getDescription() + "' does not match " 
+                    "expected type, '" + Ty->getDescription() + "'");
       return 0;
-    return VI->second[Num];
+    }
+    return Result;
   }
     
   case ValID::LocalName: {                // Is it a named definition?
@@ -771,7 +780,7 @@
   return 0;
 }
 
-// getVal - This function is identical to getValNonImprovising, except that if a
+// getVal - This function is identical to getExistingVal, except that if a
 // value is not already defined, it "improvises" by creating a placeholder var
 // that looks and acts just like the requested variable.  When the value is
 // defined later, all uses of the placeholder variable are replaced with the
@@ -784,7 +793,7 @@
   }
 
   // See if the value has already been defined.
-  Value *V = getValNonImprovising(Ty, ID);
+  Value *V = getExistingVal(Ty, ID);
   if (V) return V;
   if (TriggerError) return 0;
 
@@ -811,69 +820,97 @@
   return V;
 }
 
-/// getBBVal - This is used for two purposes:
-///  * If isDefinition is true, a new basic block with the specified ID is being
-///    defined.
-///  * If isDefinition is true, this is a reference to a basic block, which may
-///    or may not be a forward reference.
-///
-static BasicBlock *getBBVal(const ValID &ID, bool isDefinition = false) {
+/// defineBBVal - This is a definition of a new basic block with the specified
+/// identifier which must be the same as CurFun.NextValNum, if its numeric.
+static BasicBlock *defineBBVal(const ValID &ID) {
   assert(inFunctionScope() && "Can't get basic block at global scope!");
 
-  std::string Name;
   BasicBlock *BB = 0;
-  switch (ID.Type) {
-  default: 
-    GenerateError("Illegal label reference " + ID.getName());
-    return 0;
-  case ValID::LocalID:                // Is it a numbered definition?
-    if (ID.Num >= CurFun.NumberedBlocks.size())
-      CurFun.NumberedBlocks.resize(ID.Num+1);
-    BB = CurFun.NumberedBlocks[ID.Num];
-    break;
-  case ValID::LocalName:                  // Is it a named definition?
-    Name = ID.Name;
-    Value *N = CurFun.CurrentFunction->getValueSymbolTable().lookup(Name);
-    if (N && N->getType()->getTypeID() == Type::LabelTyID)
-      BB = cast<BasicBlock>(N);
-    break;
-  }
 
-  // See if the block has already been defined.
-  if (BB) {
-    // If this is the definition of the block, make sure the existing value was
-    // just a forward reference.  If it was a forward reference, there will be
-    // an entry for it in the PlaceHolderInfo map.
-    if (isDefinition && !CurFun.BBForwardRefs.erase(BB)) {
-      // The existing value was a definition, not a forward reference.
-      GenerateError("Redefinition of label " + ID.getName());
-      return 0;
+  // First, see if this was forward referenced
+
+  std::map<ValID, BasicBlock*>::iterator BBI = CurFun.BBForwardRefs.find(ID);
+  if (BBI != CurFun.BBForwardRefs.end()) {
+    BB = BBI->second;
+    // The forward declaration could have been inserted anywhere in the
+    // function: insert it into the correct place now.
+    CurFun.CurrentFunction->getBasicBlockList().remove(BB);
+    CurFun.CurrentFunction->getBasicBlockList().push_back(BB);
+
+    // Erase the forward ref from the map as its no longer "forward"
+    CurFun.BBForwardRefs.erase(ID);
+
+    // If its a numbered definition, bump the number and set the BB value.
+    if (ID.Type == ValID::LocalID) {
+      assert(ID.Num == CurFun.NextValNum && "Invalid new block number");
+      InsertValue(BB);
     }
 
-    ID.destroy();                       // Free strdup'd memory.
+    ID.destroy();
     return BB;
+  } 
+  
+  // We haven't seen this BB before and its first mention is a definition. 
+  // Just create it and return it.
+  std::string Name (ID.Type == ValID::LocalName ? ID.Name : "");
+  BB = new BasicBlock(Name, CurFun.CurrentFunction);
+  if (ID.Type == ValID::LocalID) {
+    assert(ID.Num == CurFun.NextValNum && "Invalid new block number");
+    InsertValue(BB);
   }
 
-  // Otherwise this block has not been seen before.
-  BB = new BasicBlock("", CurFun.CurrentFunction);
-  if (ID.Type == ValID::LocalName) {
-    BB->setName(ID.Name);
+  ID.destroy(); // Free strdup'd memory
+  return BB;
+}
+
+/// getBBVal - get an existing BB value or create a forward reference for it.
+/// 
+static BasicBlock *getBBVal(const ValID &ID) {
+  assert(inFunctionScope() && "Can't get basic block at global scope!");
+
+  BasicBlock *BB =  0;
+
+  std::map<ValID, BasicBlock*>::iterator BBI = CurFun.BBForwardRefs.find(ID);
+  if (BBI != CurFun.BBForwardRefs.end()) {
+    BB = BBI->second;
+  } if (ID.Type == ValID::LocalName) {
+    std::string Name = ID.Name;
+    Value *N = CurFun.CurrentFunction->getValueSymbolTable().lookup(Name);
+    if (N)
+      if (N->getType()->getTypeID() == Type::LabelTyID)
+        BB = cast<BasicBlock>(N);
+      else
+        GenerateError("Reference to label '" + Name + "' is actually of type '"+
+          N->getType()->getDescription() + "'");
+  } else if (ID.Type == ValID::LocalID) {
+    if (ID.Num < CurFun.NextValNum && ID.Num < CurFun.Values.size()) {
+      if (CurFun.Values[ID.Num]->getType()->getTypeID() == Type::LabelTyID)
+        BB = cast<BasicBlock>(CurFun.Values[ID.Num]);
+      else
+        GenerateError("Reference to label '%" + utostr(ID.Num) + 
+          "' is actually of type '"+ 
+          CurFun.Values[ID.Num]->getType()->getDescription() + "'");
+    }
   } else {
-    CurFun.NumberedBlocks[ID.Num] = BB;
+    GenerateError("Illegal label reference " + ID.getName());
+    return 0;
   }
 
-  // If this is not a definition, keep track of it so we can use it as a forward
-  // reference.
-  if (!isDefinition) {
-    // Remember where this forward reference came from.
-    CurFun.BBForwardRefs[BB] = std::make_pair(ID, llvmAsmlineno);
-  } else {
-    // The forward declaration could have been inserted anywhere in the
-    // function: insert it into the correct place now.
-    CurFun.CurrentFunction->getBasicBlockList().remove(BB);
-    CurFun.CurrentFunction->getBasicBlockList().push_back(BB);
+  // If its already been defined, return it now.
+  if (BB) {
+    ID.destroy(); // Free strdup'd memory.
+    return BB;
   }
-  ID.destroy();
+
+  // Otherwise, this block has not been seen before, create it.
+  std::string Name;
+  if (ID.Type == ValID::LocalName)
+    Name = ID.Name;
+  BB = new BasicBlock(Name, CurFun.CurrentFunction);
+
+  // Insert it in the forward refs map.
+  CurFun.BBForwardRefs[ID] = BB;
+
   return BB;
 }
 
@@ -895,50 +932,44 @@
 // defs now...
 //
 static void 
-ResolveDefinitions(std::map<const Type*,ValueList> &LateResolvers,
-                   std::map<const Type*,ValueList> *FutureLateResolvers) {
+ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers) {
   // Loop over LateResolveDefs fixing up stuff that couldn't be resolved
-  for (std::map<const Type*,ValueList>::iterator LRI = LateResolvers.begin(),
-         E = LateResolvers.end(); LRI != E; ++LRI) {
-    ValueList &List = LRI->second;
-    while (!List.empty()) {
-      Value *V = List.back();
-      List.pop_back();
-
-      std::map<Value*, std::pair<ValID, int> >::iterator PHI =
-        CurModule.PlaceHolderInfo.find(V);
-      assert(PHI != CurModule.PlaceHolderInfo.end() && "Placeholder error!");
+  while (!LateResolvers.empty()) {
+    Value *V = LateResolvers.back();
+    LateResolvers.pop_back();
+
+    std::map<Value*, std::pair<ValID, int> >::iterator PHI =
+      CurModule.PlaceHolderInfo.find(V);
+    assert(PHI != CurModule.PlaceHolderInfo.end() && "Placeholder error!");
 
-      ValID &DID = PHI->second.first;
+    ValID &DID = PHI->second.first;
 
-      Value *TheRealValue = getValNonImprovising(LRI->first, DID);
-      if (TriggerError)
+    Value *TheRealValue = getExistingVal(V->getType(), DID);
+    if (TriggerError)
+      return;
+    if (TheRealValue) {
+      V->replaceAllUsesWith(TheRealValue);
+      delete V;
+      CurModule.PlaceHolderInfo.erase(PHI);
+    } else if (FutureLateResolvers) {
+      // Functions have their unresolved items forwarded to the module late
+      // resolver table
+      InsertValue(V, *FutureLateResolvers);
+    } else {
+      if (DID.Type == ValID::LocalName || DID.Type == ValID::GlobalName) {
+        GenerateError("Reference to an invalid definition: '" +DID.getName()+
+                       "' of type '" + V->getType()->getDescription() + "'",
+                       PHI->second.second);
         return;
-      if (TheRealValue) {
-        V->replaceAllUsesWith(TheRealValue);
-        delete V;
-        CurModule.PlaceHolderInfo.erase(PHI);
-      } else if (FutureLateResolvers) {
-        // Functions have their unresolved items forwarded to the module late
-        // resolver table
-        InsertValue(V, *FutureLateResolvers);
       } else {
-        if (DID.Type == ValID::LocalName || DID.Type == ValID::GlobalName) {
-          GenerateError("Reference to an invalid definition: '" +DID.getName()+
-                         "' of type '" + V->getType()->getDescription() + "'",
-                         PHI->second.second);
-          return;
-        } else {
-          GenerateError("Reference to an invalid definition: #" +
-                         itostr(DID.Num) + " of type '" +
-                         V->getType()->getDescription() + "'",
-                         PHI->second.second);
-          return;
-        }
+        GenerateError("Reference to an invalid definition: #" +
+                       itostr(DID.Num) + " of type '" +
+                       V->getType()->getDescription() + "'",
+                       PHI->second.second);
+        return;
       }
     }
   }
-
   LateResolvers.clear();
 }
 
@@ -1012,7 +1043,7 @@
   if (!Name.empty()) {
     ID = ValID::createGlobalName((char*)Name.c_str());
   } else {
-    ID = ValID::createGlobalID(CurModule.Values[PTy].size());
+    ID = ValID::createGlobalID(CurModule.Values.size());
   }
 
   if (GlobalValue *FWGV = CurModule.GetForwardRefForGlobal(PTy, ID)) {
@@ -1241,7 +1272,7 @@
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 901 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 932 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
@@ -1289,7 +1320,7 @@
   llvm::FCmpInst::Predicate         FPredicate;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 1293 "llvmAsmParser.tab.c"
+#line 1324 "llvmAsmParser.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -1301,7 +1332,7 @@
 
 
 /* Line 219 of yacc.c.  */
-#line 1305 "llvmAsmParser.tab.c"
+#line 1336 "llvmAsmParser.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -1649,35 +1680,35 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,  1055,  1055,  1055,  1055,  1055,  1055,  1055,  1055,  1055,
-    1055,  1056,  1056,  1056,  1056,  1056,  1056,  1057,  1057,  1057,
-    1057,  1057,  1057,  1058,  1058,  1058,  1058,  1058,  1058,  1061,
-    1061,  1062,  1062,  1063,  1063,  1064,  1064,  1065,  1065,  1069,
-    1069,  1070,  1070,  1071,  1071,  1072,  1072,  1073,  1073,  1074,
-    1074,  1075,  1075,  1076,  1077,  1082,  1083,  1083,  1085,  1085,
-    1086,  1086,  1090,  1094,  1099,  1099,  1101,  1105,  1111,  1112,
-    1113,  1114,  1115,  1119,  1120,  1121,  1125,  1126,  1130,  1131,
-    1132,  1136,  1137,  1138,  1139,  1140,  1143,  1144,  1145,  1146,
-    1147,  1148,  1149,  1156,  1157,  1158,  1159,  1162,  1163,  1168,
-    1169,  1172,  1173,  1180,  1181,  1187,  1188,  1196,  1204,  1205,
-    1210,  1211,  1212,  1217,  1230,  1230,  1230,  1230,  1233,  1237,
-    1241,  1248,  1253,  1261,  1279,  1297,  1302,  1314,  1324,  1328,
-    1338,  1345,  1352,  1359,  1364,  1369,  1376,  1377,  1384,  1391,
-    1399,  1404,  1415,  1443,  1459,  1488,  1516,  1541,  1560,  1586,
-    1606,  1618,  1625,  1691,  1701,  1711,  1720,  1730,  1738,  1748,
-    1753,  1758,  1766,  1778,  1800,  1808,  1814,  1825,  1830,  1835,
-    1841,  1847,  1856,  1860,  1868,  1868,  1879,  1884,  1892,  1893,
-    1897,  1897,  1901,  1901,  1904,  1907,  1919,  1943,  1954,  1954,
-    1964,  1964,  1972,  1972,  1982,  1985,  1991,  2004,  2008,  2013,
-    2015,  2020,  2025,  2034,  2044,  2055,  2059,  2068,  2077,  2082,
-    2194,  2194,  2196,  2205,  2205,  2207,  2212,  2224,  2228,  2233,
-    2237,  2241,  2245,  2249,  2253,  2257,  2261,  2265,  2290,  2294,
-    2308,  2312,  2316,  2320,  2326,  2326,  2332,  2341,  2345,  2354,
-    2364,  2373,  2385,  2398,  2402,  2406,  2411,  2421,  2440,  2449,
-    2516,  2520,  2527,  2538,  2551,  2561,  2572,  2582,  2590,  2598,
-    2601,  2602,  2609,  2613,  2618,  2639,  2656,  2669,  2682,  2694,
-    2702,  2709,  2715,  2721,  2727,  2742,  2806,  2811,  2815,  2822,
-    2829,  2837,  2844,  2852,  2860,  2874,  2891
+       0,  1086,  1086,  1086,  1086,  1086,  1086,  1086,  1086,  1086,
+    1086,  1087,  1087,  1087,  1087,  1087,  1087,  1088,  1088,  1088,
+    1088,  1088,  1088,  1089,  1089,  1089,  1089,  1089,  1089,  1092,
+    1092,  1093,  1093,  1094,  1094,  1095,  1095,  1096,  1096,  1100,
+    1100,  1101,  1101,  1102,  1102,  1103,  1103,  1104,  1104,  1105,
+    1105,  1106,  1106,  1107,  1108,  1113,  1114,  1114,  1116,  1116,
+    1117,  1117,  1121,  1125,  1130,  1130,  1132,  1136,  1142,  1143,
+    1144,  1145,  1146,  1150,  1151,  1152,  1156,  1157,  1161,  1162,
+    1163,  1167,  1168,  1169,  1170,  1171,  1174,  1175,  1176,  1177,
+    1178,  1179,  1180,  1187,  1188,  1189,  1190,  1193,  1194,  1199,
+    1200,  1203,  1204,  1211,  1212,  1218,  1219,  1227,  1235,  1236,
+    1241,  1242,  1243,  1248,  1261,  1261,  1261,  1261,  1264,  1268,
+    1272,  1279,  1284,  1292,  1310,  1328,  1333,  1345,  1355,  1359,
+    1369,  1376,  1383,  1390,  1395,  1400,  1407,  1408,  1415,  1422,
+    1430,  1435,  1446,  1474,  1490,  1519,  1547,  1572,  1591,  1617,
+    1637,  1649,  1656,  1722,  1732,  1742,  1751,  1761,  1769,  1779,
+    1784,  1789,  1797,  1809,  1831,  1839,  1845,  1856,  1861,  1866,
+    1872,  1878,  1887,  1891,  1899,  1899,  1910,  1915,  1923,  1924,
+    1928,  1928,  1932,  1932,  1935,  1938,  1950,  1974,  1985,  1985,
+    1995,  1995,  2003,  2003,  2013,  2016,  2022,  2035,  2039,  2044,
+    2046,  2051,  2056,  2065,  2075,  2086,  2090,  2099,  2108,  2113,
+    2225,  2225,  2227,  2236,  2236,  2238,  2243,  2255,  2259,  2264,
+    2268,  2272,  2276,  2280,  2284,  2288,  2292,  2296,  2321,  2325,
+    2339,  2343,  2347,  2351,  2357,  2357,  2363,  2372,  2376,  2385,
+    2394,  2403,  2407,  2412,  2416,  2420,  2425,  2435,  2454,  2463,
+    2530,  2534,  2541,  2552,  2565,  2575,  2586,  2596,  2604,  2612,
+    2615,  2616,  2623,  2627,  2632,  2653,  2670,  2683,  2696,  2708,
+    2716,  2723,  2729,  2735,  2741,  2756,  2820,  2825,  2829,  2836,
+    2843,  2851,  2858,  2866,  2874,  2888,  2905
 };
 #endif
 
@@ -2999,142 +3030,142 @@
   switch (yyn)
     {
         case 29:
-#line 1061 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1092 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 30:
-#line 1061 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1092 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 31:
-#line 1062 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1093 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 32:
-#line 1062 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1093 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 33:
-#line 1063 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1094 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 34:
-#line 1063 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1094 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 35:
-#line 1064 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1095 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 36:
-#line 1064 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1095 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 37:
-#line 1065 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1096 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 38:
-#line 1065 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1096 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.IPredicate) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 39:
-#line 1069 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1100 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 40:
-#line 1069 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1100 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 41:
-#line 1070 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1101 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 42:
-#line 1070 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1101 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 43:
-#line 1071 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1102 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 44:
-#line 1071 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1102 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 45:
-#line 1072 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1103 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 46:
-#line 1072 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1103 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 47:
-#line 1073 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1104 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 48:
-#line 1073 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1104 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 49:
-#line 1074 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1105 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 50:
-#line 1074 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1105 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 51:
-#line 1075 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1106 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 52:
-#line 1075 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1106 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 53:
-#line 1076 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1107 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 54:
-#line 1077 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1108 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.FPredicate) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 61:
-#line 1086 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1117 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 62:
-#line 1090 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1121 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[-1].StrVal);
     CHECK_FOR_ERROR
@@ -3142,7 +3173,7 @@
     break;
 
   case 63:
-#line 1094 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1125 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3150,7 +3181,7 @@
     break;
 
   case 66:
-#line 1101 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1132 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = (yyvsp[-1].StrVal);
     CHECK_FOR_ERROR
@@ -3158,7 +3189,7 @@
     break;
 
   case 67:
-#line 1105 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1136 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.StrVal) = 0;
     CHECK_FOR_ERROR
@@ -3166,127 +3197,127 @@
     break;
 
   case 68:
-#line 1111 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1142 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 69:
-#line 1112 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1143 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 70:
-#line 1113 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1144 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 71:
-#line 1114 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1145 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 72:
-#line 1115 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1146 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 73:
-#line 1119 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1150 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 74:
-#line 1120 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1151 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 75:
-#line 1121 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1152 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 76:
-#line 1125 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1156 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::DefaultVisibility; ;}
     break;
 
   case 77:
-#line 1126 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1157 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Visibility) = GlobalValue::HiddenVisibility;  ;}
     break;
 
   case 78:
-#line 1130 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1161 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 79:
-#line 1131 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1162 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 80:
-#line 1132 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1163 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 81:
-#line 1136 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1167 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 82:
-#line 1137 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1168 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 83:
-#line 1138 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1169 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 84:
-#line 1139 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1170 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 85:
-#line 1140 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1171 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 86:
-#line 1143 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1174 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 87:
-#line 1144 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1175 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::C; ;}
     break;
 
   case 88:
-#line 1145 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1176 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Fast; ;}
     break;
 
   case 89:
-#line 1146 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1177 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::Cold; ;}
     break;
 
   case 90:
-#line 1147 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1178 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_StdCall; ;}
     break;
 
   case 91:
-#line 1148 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1179 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = CallingConv::X86_FastCall; ;}
     break;
 
   case 92:
-#line 1149 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1180 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
                    if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
                      GEN_ERROR("Calling conv too large");
@@ -3296,61 +3327,61 @@
     break;
 
   case 93:
-#line 1156 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1187 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FunctionType::ZExtAttribute;      ;}
     break;
 
   case 94:
-#line 1157 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1188 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FunctionType::SExtAttribute;      ;}
     break;
 
   case 95:
-#line 1158 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1189 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FunctionType::InRegAttribute;     ;}
     break;
 
   case 96:
-#line 1159 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1190 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FunctionType::StructRetAttribute; ;}
     break;
 
   case 97:
-#line 1162 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1193 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FunctionType::NoAttributeSet; ;}
     break;
 
   case 98:
-#line 1163 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1194 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = FunctionType::ParameterAttributes((yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs));
               ;}
     break;
 
   case 99:
-#line 1168 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1199 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FunctionType::NoReturnAttribute; ;}
     break;
 
   case 101:
-#line 1172 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1203 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ParamAttrs) = FunctionType::NoAttributeSet; ;}
     break;
 
   case 102:
-#line 1173 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1204 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = FunctionType::ParameterAttributes((yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs));
               ;}
     break;
 
   case 103:
-#line 1180 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1211 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 104:
-#line 1181 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1212 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3360,12 +3391,12 @@
     break;
 
   case 105:
-#line 1187 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1218 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 106:
-#line 1188 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1219 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3375,7 +3406,7 @@
     break;
 
   case 107:
-#line 1196 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1227 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   for (unsigned i = 0, e = strlen((yyvsp[0].StrVal)); i != e; ++i)
     if ((yyvsp[0].StrVal)[i] == '"' || (yyvsp[0].StrVal)[i] == '\\')
@@ -3386,27 +3417,27 @@
     break;
 
   case 108:
-#line 1204 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1235 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 109:
-#line 1205 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1236 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
     break;
 
   case 110:
-#line 1210 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1241 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 111:
-#line 1211 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1242 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {;}
     break;
 
   case 112:
-#line 1212 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1243 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -3415,7 +3446,7 @@
     break;
 
   case 113:
-#line 1217 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1248 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two");
@@ -3425,7 +3456,7 @@
     break;
 
   case 118:
-#line 1233 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1264 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
@@ -3433,7 +3464,7 @@
     break;
 
   case 119:
-#line 1237 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1268 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType));
     CHECK_FOR_ERROR
@@ -3441,7 +3472,7 @@
     break;
 
   case 120:
-#line 1241 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1272 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[-1].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -3452,7 +3483,7 @@
     break;
 
   case 121:
-#line 1248 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1279 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
     const Type* tmp = getTypeVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
@@ -3461,7 +3492,7 @@
     break;
 
   case 122:
-#line 1253 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1284 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Type UpReference
     if ((yyvsp[0].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
@@ -3473,7 +3504,7 @@
     break;
 
   case 123:
-#line 1261 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1292 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Params;
     std::vector<FunctionType::ParameterAttributes> Attrs;
@@ -3495,7 +3526,7 @@
     break;
 
   case 124:
-#line 1279 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1310 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Params;
     std::vector<FunctionType::ParameterAttributes> Attrs;
@@ -3516,7 +3547,7 @@
     break;
 
   case 125:
-#line 1297 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1328 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
     delete (yyvsp[-1].TypeVal);
@@ -3525,7 +3556,7 @@
     break;
 
   case 126:
-#line 1302 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1333 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {          // Vector type?
      const llvm::Type* ElemTy = (yyvsp[-1].TypeVal)->get();
      if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
@@ -3541,7 +3572,7 @@
     break;
 
   case 127:
-#line 1314 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1345 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
@@ -3555,7 +3586,7 @@
     break;
 
   case 128:
-#line 1324 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1355 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
@@ -3563,7 +3594,7 @@
     break;
 
   case 129:
-#line 1328 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1359 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-2].TypeList)->begin(),
@@ -3577,7 +3608,7 @@
     break;
 
   case 130:
-#line 1338 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1369 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
@@ -3585,7 +3616,7 @@
     break;
 
   case 131:
-#line 1345 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1376 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     (yyval.TypeWithAttrs).Ty = (yyvsp[-1].TypeVal); 
     (yyval.TypeWithAttrs).Attrs = (yyvsp[0].ParamAttrs); 
@@ -3593,7 +3624,7 @@
     break;
 
   case 132:
-#line 1352 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1383 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -3604,14 +3635,14 @@
     break;
 
   case 133:
-#line 1359 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1390 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
   case 134:
-#line 1364 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1395 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     (yyval.TypeWithAttrsList)->push_back((yyvsp[0].TypeWithAttrs));
@@ -3620,7 +3651,7 @@
     break;
 
   case 135:
-#line 1369 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1400 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList))->push_back((yyvsp[0].TypeWithAttrs));
     CHECK_FOR_ERROR
@@ -3628,7 +3659,7 @@
     break;
 
   case 137:
-#line 1377 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1408 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet;
@@ -3639,7 +3670,7 @@
     break;
 
   case 138:
-#line 1384 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1415 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet;
@@ -3650,7 +3681,7 @@
     break;
 
   case 139:
-#line 1391 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1422 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
@@ -3658,7 +3689,7 @@
     break;
 
   case 140:
-#line 1399 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1430 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
@@ -3667,7 +3698,7 @@
     break;
 
   case 141:
-#line 1404 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1435 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(*(yyvsp[0].TypeVal)); delete (yyvsp[0].TypeVal);
     CHECK_FOR_ERROR
@@ -3675,7 +3706,7 @@
     break;
 
   case 142:
-#line 1415 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1446 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -3707,7 +3738,7 @@
     break;
 
   case 143:
-#line 1443 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1474 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -3727,7 +3758,7 @@
     break;
 
   case 144:
-#line 1459 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1490 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -3760,7 +3791,7 @@
     break;
 
   case 145:
-#line 1488 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1519 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -3792,7 +3823,7 @@
     break;
 
   case 146:
-#line 1516 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1547 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal)->get());
     if (STy == 0)
@@ -3821,7 +3852,7 @@
     break;
 
   case 147:
-#line 1541 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1572 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -3844,7 +3875,7 @@
     break;
 
   case 148:
-#line 1560 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1591 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-5].TypeVal)->get());
     if (STy == 0)
@@ -3874,7 +3905,7 @@
     break;
 
   case 149:
-#line 1586 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1617 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
@@ -3898,7 +3929,7 @@
     break;
 
   case 150:
-#line 1606 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1637 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -3914,7 +3945,7 @@
     break;
 
   case 151:
-#line 1618 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1649 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -3925,7 +3956,7 @@
     break;
 
   case 152:
-#line 1625 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1656 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -3935,15 +3966,15 @@
 
     // ConstExprs can exist in the body of a function, thus creating
     // GlobalValues whenever they refer to a variable.  Because we are in
-    // the context of a function, getValNonImprovising will search the functions
+    // the context of a function, getExistingVal will search the functions
     // symbol table instead of the module symbol table for the global symbol,
     // which throws things all off.  To get around this, we just tell
-    // getValNonImprovising that we are at global scope here.
+    // getExistingVal that we are at global scope here.
     //
     Function *SavedCurFn = CurFun.CurrentFunction;
     CurFun.CurrentFunction = 0;
 
-    Value *V = getValNonImprovising(Ty, (yyvsp[0].ValIDVal));
+    Value *V = getExistingVal(Ty, (yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
 
     CurFun.CurrentFunction = SavedCurFn;
@@ -3995,7 +4026,7 @@
     break;
 
   case 153:
-#line 1691 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1722 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4009,7 +4040,7 @@
     break;
 
   case 154:
-#line 1701 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1732 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4023,7 +4054,7 @@
     break;
 
   case 155:
-#line 1711 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1742 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
@@ -4036,7 +4067,7 @@
     break;
 
   case 156:
-#line 1720 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1751 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth();
     if ((yyvsp[0].APIntVal)->getBitWidth() > BitWidth) {
@@ -4050,7 +4081,7 @@
     break;
 
   case 157:
-#line 1730 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1761 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
@@ -4062,7 +4093,7 @@
     break;
 
   case 158:
-#line 1738 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1769 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth();
     if ((yyvsp[0].APIntVal)->getBitWidth() > BitWidth) {
@@ -4076,7 +4107,7 @@
     break;
 
   case 159:
-#line 1748 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1779 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     assert(cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?");
     (yyval.ConstVal) = ConstantInt::getTrue();
@@ -4085,7 +4116,7 @@
     break;
 
   case 160:
-#line 1753 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1784 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     assert(cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?");
     (yyval.ConstVal) = ConstantInt::getFalse();
@@ -4094,7 +4125,7 @@
     break;
 
   case 161:
-#line 1758 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1789 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Float & Double constants
     if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].FPVal)))
       GEN_ERROR("Floating point constant invalid for type");
@@ -4104,7 +4135,7 @@
     break;
 
   case 162:
-#line 1766 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1797 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4120,7 +4151,7 @@
     break;
 
   case 163:
-#line 1778 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1809 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-2].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
@@ -4146,7 +4177,7 @@
     break;
 
   case 164:
-#line 1800 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1831 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-5].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
@@ -4158,7 +4189,7 @@
     break;
 
   case 165:
-#line 1808 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1839 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
@@ -4168,7 +4199,7 @@
     break;
 
   case 166:
-#line 1814 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1845 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
@@ -4183,7 +4214,7 @@
     break;
 
   case 167:
-#line 1825 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1856 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
@@ -4192,7 +4223,7 @@
     break;
 
   case 168:
-#line 1830 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1861 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
@@ -4201,7 +4232,7 @@
     break;
 
   case 169:
-#line 1835 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1866 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -4211,7 +4242,7 @@
     break;
 
   case 170:
-#line 1841 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1872 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -4221,7 +4252,7 @@
     break;
 
   case 171:
-#line 1847 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1878 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -4231,7 +4262,7 @@
     break;
 
   case 172:
-#line 1856 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1887 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
@@ -4239,7 +4270,7 @@
     break;
 
   case 173:
-#line 1860 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1891 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
@@ -4248,17 +4279,17 @@
     break;
 
   case 174:
-#line 1868 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1899 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 175:
-#line 1868 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1899 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 176:
-#line 1879 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1910 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4267,7 +4298,7 @@
     break;
 
   case 177:
-#line 1884 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1915 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4276,12 +4307,12 @@
     break;
 
   case 180:
-#line 1897 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1928 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
   case 181:
-#line 1897 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1928 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
@@ -4289,26 +4320,26 @@
     break;
 
   case 182:
-#line 1901 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1932 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
   case 183:
-#line 1901 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1932 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 184:
-#line 1904 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1935 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 185:
-#line 1907 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1938 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     // Emit an error if there are any unresolved types left.
     if (!CurModule.LateResolveTypes.empty()) {
@@ -4324,7 +4355,7 @@
     break;
 
   case 186:
-#line 1919 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1950 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -4352,7 +4383,7 @@
     break;
 
   case 187:
-#line 1943 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1974 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[-2].StrVal), (yyvsp[0].PrimType));
 
@@ -4367,7 +4398,7 @@
     break;
 
   case 188:
-#line 1954 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1985 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     /* "Externally Visible" Linkage */
     if ((yyvsp[0].ConstVal) == 0) 
@@ -4379,14 +4410,14 @@
     break;
 
   case 189:
-#line 1961 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1992 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 190:
-#line 1964 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1995 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
@@ -4396,14 +4427,14 @@
     break;
 
   case 191:
-#line 1969 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2000 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 192:
-#line 1972 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2003 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -4414,7 +4445,7 @@
     break;
 
   case 193:
-#line 1978 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2009 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -4422,21 +4453,21 @@
     break;
 
   case 194:
-#line 1982 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2013 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 195:
-#line 1985 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2016 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 196:
-#line 1991 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2022 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
@@ -4452,7 +4483,7 @@
     break;
 
   case 197:
-#line 2004 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2035 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -4460,7 +4491,7 @@
     break;
 
   case 198:
-#line 2008 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2039 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -4468,7 +4499,7 @@
     break;
 
   case 200:
-#line 2015 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2046 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4477,7 +4508,7 @@
     break;
 
   case 201:
-#line 2020 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2051 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4486,14 +4517,14 @@
     break;
 
   case 202:
-#line 2025 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2056 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
   case 203:
-#line 2034 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2065 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -4507,7 +4538,7 @@
     break;
 
   case 204:
-#line 2044 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2075 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -4521,7 +4552,7 @@
     break;
 
   case 205:
-#line 2055 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2086 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[0].ArgList);
     CHECK_FOR_ERROR
@@ -4529,7 +4560,7 @@
     break;
 
   case 206:
-#line 2059 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2090 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     struct ArgListEntry E;
@@ -4542,7 +4573,7 @@
     break;
 
   case 207:
-#line 2068 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2099 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -4555,7 +4586,7 @@
     break;
 
   case 208:
-#line 2077 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2108 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
@@ -4563,7 +4594,7 @@
     break;
 
   case 209:
-#line 2083 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2114 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   UnEscapeLexed((yyvsp[-6].StrVal));
   std::string FunctionName((yyvsp[-6].StrVal));
@@ -4600,7 +4631,7 @@
   if (!FunctionName.empty()) {
     ID = ValID::createGlobalName((char*)FunctionName.c_str());
   } else {
-    ID = ValID::createGlobalID(CurModule.Values[PFT].size());
+    ID = ValID::createGlobalID(CurModule.Values.size());
   }
 
   Function *Fn = 0;
@@ -4677,7 +4708,7 @@
     break;
 
   case 212:
-#line 2196 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2227 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -4689,7 +4720,7 @@
     break;
 
   case 215:
-#line 2207 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2238 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   CHECK_FOR_ERROR
@@ -4697,7 +4728,7 @@
     break;
 
   case 216:
-#line 2212 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2243 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[-2].Linkage));
     CurFun.CurrentFunction->setVisibility((yyvsp[-1].Visibility));
@@ -4708,7 +4739,7 @@
     break;
 
   case 217:
-#line 2224 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2255 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -4716,7 +4747,7 @@
     break;
 
   case 218:
-#line 2228 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2259 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -4724,7 +4755,7 @@
     break;
 
   case 219:
-#line 2233 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2264 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val));
     CHECK_FOR_ERROR
@@ -4732,7 +4763,7 @@
     break;
 
   case 220:
-#line 2237 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2268 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
     CHECK_FOR_ERROR
@@ -4740,7 +4771,7 @@
     break;
 
   case 221:
-#line 2241 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2272 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal));
     CHECK_FOR_ERROR
@@ -4748,7 +4779,7 @@
     break;
 
   case 222:
-#line 2245 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2276 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
@@ -4756,7 +4787,7 @@
     break;
 
   case 223:
-#line 2249 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2280 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
@@ -4764,7 +4795,7 @@
     break;
 
   case 224:
-#line 2253 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2284 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
@@ -4772,7 +4803,7 @@
     break;
 
   case 225:
-#line 2257 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2288 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
@@ -4780,7 +4811,7 @@
     break;
 
   case 226:
-#line 2261 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2292 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
@@ -4788,7 +4819,7 @@
     break;
 
   case 227:
-#line 2265 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2296 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType();
     int NumElements = (yyvsp[-1].ConstVector)->size(); 
@@ -4817,7 +4848,7 @@
     break;
 
   case 228:
-#line 2290 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2321 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
@@ -4825,7 +4856,7 @@
     break;
 
   case 229:
-#line 2294 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2325 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
     std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
@@ -4839,7 +4870,7 @@
     break;
 
   case 230:
-#line 2308 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2339 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::createLocalID((yyvsp[0].UIntVal));
     CHECK_FOR_ERROR
@@ -4847,7 +4878,7 @@
     break;
 
   case 231:
-#line 2312 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2343 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[0].UIntVal));
     CHECK_FOR_ERROR
@@ -4855,7 +4886,7 @@
     break;
 
   case 232:
-#line 2316 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2347 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createLocalName((yyvsp[0].StrVal));
     CHECK_FOR_ERROR
@@ -4863,7 +4894,7 @@
     break;
 
   case 233:
-#line 2320 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2351 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createGlobalName((yyvsp[0].StrVal));
     CHECK_FOR_ERROR
@@ -4871,7 +4902,7 @@
     break;
 
   case 236:
-#line 2332 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2363 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4882,7 +4913,7 @@
     break;
 
   case 237:
-#line 2341 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2372 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
@@ -4890,7 +4921,7 @@
     break;
 
   case 238:
-#line 2345 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2376 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
@@ -4898,20 +4929,19 @@
     break;
 
   case 239:
-#line 2354 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2385 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
     CHECK_FOR_ERROR
     InsertValue((yyvsp[0].TermInstVal));
     (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp[0].TermInstVal));
-    InsertValue((yyvsp[-2].BasicBlockVal));
     (yyval.BasicBlockVal) = (yyvsp[-2].BasicBlockVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 240:
-#line 2364 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2394 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[0].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -4924,39 +4954,23 @@
     break;
 
   case 241:
-#line 2373 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BasicBlockVal) = getBBVal(ValID::createLocalID(CurFun.NextBBNum++), true);
-    CHECK_FOR_ERROR
-
-    // Make sure to move the basic block to the correct location in the
-    // function, instead of leaving it inserted wherever it was first
-    // referenced.
-    Function::BasicBlockListType &BBL = 
-      CurFun.CurrentFunction->getBasicBlockList();
-    BBL.splice(BBL.end(), BBL, (yyval.BasicBlockVal));
+#line 2403 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    {          // Empty space between instruction lists
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 242:
-#line 2385 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    {
-    (yyval.BasicBlockVal) = getBBVal(ValID::createLocalName((yyvsp[0].StrVal)), true);
-    CHECK_FOR_ERROR
-
-    // Make sure to move the basic block to the correct location in the
-    // function, instead of leaving it inserted wherever it was first
-    // referenced.
-    Function::BasicBlockListType &BBL = 
-      CurFun.CurrentFunction->getBasicBlockList();
-    BBL.splice(BBL.end(), BBL, (yyval.BasicBlockVal));
+#line 2407 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    {             // Labelled (named) basic block
+    (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName((yyvsp[0].StrVal)));
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 243:
-#line 2398 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2412 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {              // Return with a result...
     (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
@@ -4964,16 +4978,16 @@
     break;
 
   case 244:
-#line 2402 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    {                                       // Return with no result...
+#line 2416 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    {                                    // Return with no result...
     (yyval.TermInstVal) = new ReturnInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 245:
-#line 2406 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    {                         // Unconditional Branch...
+#line 2420 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
     (yyval.TermInstVal) = new BranchInst(tmpBB);
@@ -4981,7 +4995,7 @@
     break;
 
   case 246:
-#line 2411 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2425 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {  
     assert(cast<IntegerType>((yyvsp[-7].PrimType))->getBitWidth() == 1 && "Not Bool?");
     BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
@@ -4995,7 +5009,7 @@
     break;
 
   case 247:
-#line 2421 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2435 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-7].PrimType), (yyvsp[-6].ValIDVal));
     CHECK_FOR_ERROR
@@ -5018,7 +5032,7 @@
     break;
 
   case 248:
-#line 2440 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2454 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-6].PrimType), (yyvsp[-5].ValIDVal));
     CHECK_FOR_ERROR
@@ -5031,7 +5045,7 @@
     break;
 
   case 249:
-#line 2450 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2464 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -5101,7 +5115,7 @@
     break;
 
   case 250:
-#line 2516 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2530 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
@@ -5109,7 +5123,7 @@
     break;
 
   case 251:
-#line 2520 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2534 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
@@ -5117,10 +5131,10 @@
     break;
 
   case 252:
-#line 2527 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2541 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[-5].JumpTable);
-    Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
+    Constant *V = cast<Constant>(getExistingVal((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
     CHECK_FOR_ERROR
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value");
@@ -5132,10 +5146,10 @@
     break;
 
   case 253:
-#line 2538 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2552 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
-    Constant *V = cast<Constant>(getValNonImprovising((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
+    Constant *V = cast<Constant>(getExistingVal((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
     CHECK_FOR_ERROR
 
     if (V == 0)
@@ -5148,7 +5162,7 @@
     break;
 
   case 254:
-#line 2551 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2565 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
     setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal));
@@ -5160,7 +5174,7 @@
     break;
 
   case 255:
-#line 2561 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2575 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-5].TypeVal))->getDescription());
@@ -5175,7 +5189,7 @@
     break;
 
   case 256:
-#line 2572 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2586 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.PHIList) = (yyvsp[-6].PHIList);
     Value* tmpVal = getVal((yyvsp[-6].PHIList)->front().first->getType(), (yyvsp[-3].ValIDVal));
@@ -5187,7 +5201,7 @@
     break;
 
   case 257:
-#line 2582 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2596 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5199,7 +5213,7 @@
     break;
 
   case 258:
-#line 2590 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2604 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5211,17 +5225,17 @@
     break;
 
   case 259:
-#line 2598 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2612 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueRefList) = new ValueRefList(); ;}
     break;
 
   case 260:
-#line 2601 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2615 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
   case 261:
-#line 2602 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2616 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[-2].ValueList);
     (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
@@ -5230,7 +5244,7 @@
     break;
 
   case 262:
-#line 2609 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2623 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5238,7 +5252,7 @@
     break;
 
   case 263:
-#line 2613 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2627 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5246,7 +5260,7 @@
     break;
 
   case 264:
-#line 2618 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2632 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5271,7 +5285,7 @@
     break;
 
   case 265:
-#line 2639 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2653 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5292,7 +5306,7 @@
     break;
 
   case 266:
-#line 2656 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2670 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5309,7 +5323,7 @@
     break;
 
   case 267:
-#line 2669 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2683 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5326,7 +5340,7 @@
     break;
 
   case 268:
-#line 2682 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2696 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -5342,7 +5356,7 @@
     break;
 
   case 269:
-#line 2694 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2708 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-4].ValueVal)->getType() != Type::Int1Ty)
       GEN_ERROR("select condition must be boolean");
@@ -5354,7 +5368,7 @@
     break;
 
   case 270:
-#line 2702 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2716 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -5365,7 +5379,7 @@
     break;
 
   case 271:
-#line 2709 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2723 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -5375,7 +5389,7 @@
     break;
 
   case 272:
-#line 2715 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2729 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -5385,7 +5399,7 @@
     break;
 
   case 273:
-#line 2721 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2735 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -5395,7 +5409,7 @@
     break;
 
   case 274:
-#line 2727 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2741 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[0].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -5414,7 +5428,7 @@
     break;
 
   case 275:
-#line 2743 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2757 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -5481,7 +5495,7 @@
     break;
 
   case 276:
-#line 2806 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2820 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[0].InstVal);
     CHECK_FOR_ERROR
@@ -5489,7 +5503,7 @@
     break;
 
   case 277:
-#line 2811 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2825 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5497,7 +5511,7 @@
     break;
 
   case 278:
-#line 2815 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2829 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5505,7 +5519,7 @@
     break;
 
   case 279:
-#line 2822 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2836 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5516,7 +5530,7 @@
     break;
 
   case 280:
-#line 2829 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2843 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
@@ -5528,7 +5542,7 @@
     break;
 
   case 281:
-#line 2837 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2851 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5539,7 +5553,7 @@
     break;
 
   case 282:
-#line 2844 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2858 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
@@ -5551,7 +5565,7 @@
     break;
 
   case 283:
-#line 2852 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2866 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[0].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -5562,7 +5576,7 @@
     break;
 
   case 284:
-#line 2860 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2874 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5580,7 +5594,7 @@
     break;
 
   case 285:
-#line 2874 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2888 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5601,7 +5615,7 @@
     break;
 
   case 286:
-#line 2891 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2905 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5624,7 +5638,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 5628 "llvmAsmParser.tab.c"
+#line 5642 "llvmAsmParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -5892,7 +5906,7 @@
 }
 
 
-#line 2908 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2922 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions


Index: llvm/lib/AsmParser/llvmAsmParser.h.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.57 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.58
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.57	Tue Feb 27 20:24:54 2007
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Mon Mar 19 13:40:50 2007
@@ -299,7 +299,7 @@
 
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 901 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 932 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.73 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.74
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.73	Thu Mar  1 13:41:47 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Mon Mar 19 13:40:50 2007
@@ -84,13 +84,12 @@
 typedef std::vector<Value *> ValueList;           // Numbered defs
 
 static void 
-ResolveDefinitions(std::map<const Type *,ValueList> &LateResolvers,
-                   std::map<const Type *,ValueList> *FutureLateResolvers = 0);
+ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers=0);
 
 static struct PerModuleInfo {
   Module *CurrentModule;
-  std::map<const Type *, ValueList> Values; // Module level numbered definitions
-  std::map<const Type *,ValueList> LateResolveValues;
+  ValueList Values; // Module level numbered definitions
+  ValueList LateResolveValues;
   std::vector<PATypeHolder>    Types;
   std::map<ValID, PATypeHolder> LateResolveTypes;
 
@@ -208,17 +207,16 @@
 static struct PerFunctionInfo {
   Function *CurrentFunction;     // Pointer to current function being created
 
-  std::map<const Type*, ValueList> Values; // Keep track of #'d definitions
-  std::map<const Type*, ValueList> LateResolveValues;
+  ValueList Values; // Keep track of #'d definitions
+  unsigned NextValNum;
+  ValueList LateResolveValues;
   bool isDeclare;                   // Is this function a forward declararation?
   GlobalValue::LinkageTypes Linkage; // Linkage for forward declaration.
   GlobalValue::VisibilityTypes Visibility;
 
   /// BBForwardRefs - When we see forward references to basic blocks, keep
   /// track of them here.
-  std::map<BasicBlock*, std::pair<ValID, int> > BBForwardRefs;
-  std::vector<BasicBlock*> NumberedBlocks;
-  unsigned NextBBNum;
+  std::map<ValID, BasicBlock*> BBForwardRefs;
 
   inline PerFunctionInfo() {
     CurrentFunction = 0;
@@ -229,16 +227,14 @@
 
   inline void FunctionStart(Function *M) {
     CurrentFunction = M;
-    NextBBNum = 0;
+    NextValNum = 0;
   }
 
   void FunctionDone() {
-    NumberedBlocks.clear();
-
     // Any forward referenced blocks left?
     if (!BBForwardRefs.empty()) {
       GenerateError("Undefined reference to label " +
-                     BBForwardRefs.begin()->first->getName());
+                     BBForwardRefs.begin()->second->getName());
       return;
     }
 
@@ -246,6 +242,7 @@
     ResolveDefinitions(LateResolveValues, &CurModule.LateResolveValues);
 
     Values.clear();         // Clear out function local definitions
+    BBForwardRefs.clear();
     CurrentFunction = 0;
     isDeclare = false;
     Linkage = GlobalValue::ExternalLinkage;
@@ -260,14 +257,23 @@
 //               Code to handle definitions of all the types
 //===----------------------------------------------------------------------===//
 
-static int InsertValue(Value *V,
-                  std::map<const Type*,ValueList> &ValueTab = CurFun.Values) {
-  if (V->hasName()) return -1;           // Is this a numbered definition?
-
-  // Yes, insert the value into the value table...
-  ValueList &List = ValueTab[V->getType()];
-  List.push_back(V);
-  return List.size()-1;
+static void InsertValue(Value *V, ValueList &ValueTab = CurFun.Values) {
+  // Things that have names or are void typed don't get slot numbers
+  if (V->hasName() || (V->getType() == Type::VoidTy))
+    return;
+
+  // In the case of function values, we have to allow for the forward reference
+  // of basic blocks, which are included in the numbering. Consequently, we keep
+  // track of the next insertion location with NextValNum. When a BB gets 
+  // inserted, it could change the size of the CurFun.Values vector.
+  if (&ValueTab == &CurFun.Values) {
+    if (ValueTab.size() <= CurFun.NextValNum)
+      ValueTab.resize(CurFun.NextValNum+1);
+    ValueTab[CurFun.NextValNum++] = V;
+    return;
+  } 
+  // For all other lists, its okay to just tack it on the back of the vector.
+  ValueTab.push_back(V);
 }
 
 static const Type *getTypeVal(const ValID &D, bool DoNotImprovise = false) {
@@ -314,11 +320,11 @@
   return Typ;
  }
 
-// getValNonImprovising - Look up the value specified by the provided type and
+// getExistingVal - Look up the value specified by the provided type and
 // the provided ValID.  If the value exists and has already been defined, return
 // it.  Otherwise return null.
 //
-static Value *getValNonImprovising(const Type *Ty, const ValID &D) {
+static Value *getExistingVal(const Type *Ty, const ValID &D) {
   if (isa<FunctionType>(Ty)) {
     GenerateError("Functions are not values and "
                    "must be referenced as pointers");
@@ -327,26 +333,29 @@
 
   switch (D.Type) {
   case ValID::LocalID: {                 // Is it a numbered definition?
-    // Module constants occupy the lowest numbered slots.
-    std::map<const Type*,ValueList>::iterator VI = CurFun.Values.find(Ty);
-    // Make sure that our type is within bounds.
-    if (VI == CurFun.Values.end()) return 0;
-
     // Check that the number is within bounds.
-    if (D.Num >= VI->second.size()) return 0;
-
-    return VI->second[D.Num];
+    if (D.Num >= CurFun.Values.size()) 
+      return 0;
+    Value *Result = CurFun.Values[D.Num];
+    if (Ty != Result->getType()) {
+      GenerateError("Numbered value (%" + utostr(D.Num) + ") of type '" +
+                    Result->getType()->getDescription() + "' does not match " 
+                    "expected type, '" + Ty->getDescription() + "'");
+      return 0;
+    }
+    return Result;
   }
   case ValID::GlobalID: {                 // Is it a numbered definition?
-    unsigned Num = D.Num;
-    
-    // Module constants occupy the lowest numbered slots...
-    std::map<const Type*,ValueList>::iterator VI = CurModule.Values.find(Ty);
-    if (VI == CurModule.Values.end()) 
+    if (D.Num >= CurModule.Values.size()) 
       return 0;
-    if (D.Num >= VI->second.size()) 
+    Value *Result = CurModule.Values[D.Num];
+    if (Ty != Result->getType()) {
+      GenerateError("Numbered value (@" + utostr(D.Num) + ") of type '" +
+                    Result->getType()->getDescription() + "' does not match " 
+                    "expected type, '" + Ty->getDescription() + "'");
       return 0;
-    return VI->second[Num];
+    }
+    return Result;
   }
     
   case ValID::LocalName: {                // Is it a named definition?
@@ -447,7 +456,7 @@
   return 0;
 }
 
-// getVal - This function is identical to getValNonImprovising, except that if a
+// getVal - This function is identical to getExistingVal, except that if a
 // value is not already defined, it "improvises" by creating a placeholder var
 // that looks and acts just like the requested variable.  When the value is
 // defined later, all uses of the placeholder variable are replaced with the
@@ -460,7 +469,7 @@
   }
 
   // See if the value has already been defined.
-  Value *V = getValNonImprovising(Ty, ID);
+  Value *V = getExistingVal(Ty, ID);
   if (V) return V;
   if (TriggerError) return 0;
 
@@ -487,69 +496,97 @@
   return V;
 }
 
-/// getBBVal - This is used for two purposes:
-///  * If isDefinition is true, a new basic block with the specified ID is being
-///    defined.
-///  * If isDefinition is true, this is a reference to a basic block, which may
-///    or may not be a forward reference.
-///
-static BasicBlock *getBBVal(const ValID &ID, bool isDefinition = false) {
+/// defineBBVal - This is a definition of a new basic block with the specified
+/// identifier which must be the same as CurFun.NextValNum, if its numeric.
+static BasicBlock *defineBBVal(const ValID &ID) {
   assert(inFunctionScope() && "Can't get basic block at global scope!");
 
-  std::string Name;
   BasicBlock *BB = 0;
-  switch (ID.Type) {
-  default: 
-    GenerateError("Illegal label reference " + ID.getName());
-    return 0;
-  case ValID::LocalID:                // Is it a numbered definition?
-    if (ID.Num >= CurFun.NumberedBlocks.size())
-      CurFun.NumberedBlocks.resize(ID.Num+1);
-    BB = CurFun.NumberedBlocks[ID.Num];
-    break;
-  case ValID::LocalName:                  // Is it a named definition?
-    Name = ID.Name;
-    Value *N = CurFun.CurrentFunction->getValueSymbolTable().lookup(Name);
-    if (N && N->getType()->getTypeID() == Type::LabelTyID)
-      BB = cast<BasicBlock>(N);
-    break;
-  }
 
-  // See if the block has already been defined.
-  if (BB) {
-    // If this is the definition of the block, make sure the existing value was
-    // just a forward reference.  If it was a forward reference, there will be
-    // an entry for it in the PlaceHolderInfo map.
-    if (isDefinition && !CurFun.BBForwardRefs.erase(BB)) {
-      // The existing value was a definition, not a forward reference.
-      GenerateError("Redefinition of label " + ID.getName());
-      return 0;
+  // First, see if this was forward referenced
+
+  std::map<ValID, BasicBlock*>::iterator BBI = CurFun.BBForwardRefs.find(ID);
+  if (BBI != CurFun.BBForwardRefs.end()) {
+    BB = BBI->second;
+    // The forward declaration could have been inserted anywhere in the
+    // function: insert it into the correct place now.
+    CurFun.CurrentFunction->getBasicBlockList().remove(BB);
+    CurFun.CurrentFunction->getBasicBlockList().push_back(BB);
+
+    // Erase the forward ref from the map as its no longer "forward"
+    CurFun.BBForwardRefs.erase(ID);
+
+    // If its a numbered definition, bump the number and set the BB value.
+    if (ID.Type == ValID::LocalID) {
+      assert(ID.Num == CurFun.NextValNum && "Invalid new block number");
+      InsertValue(BB);
     }
 
-    ID.destroy();                       // Free strdup'd memory.
+    ID.destroy();
     return BB;
+  } 
+  
+  // We haven't seen this BB before and its first mention is a definition. 
+  // Just create it and return it.
+  std::string Name (ID.Type == ValID::LocalName ? ID.Name : "");
+  BB = new BasicBlock(Name, CurFun.CurrentFunction);
+  if (ID.Type == ValID::LocalID) {
+    assert(ID.Num == CurFun.NextValNum && "Invalid new block number");
+    InsertValue(BB);
   }
 
-  // Otherwise this block has not been seen before.
-  BB = new BasicBlock("", CurFun.CurrentFunction);
-  if (ID.Type == ValID::LocalName) {
-    BB->setName(ID.Name);
+  ID.destroy(); // Free strdup'd memory
+  return BB;
+}
+
+/// getBBVal - get an existing BB value or create a forward reference for it.
+/// 
+static BasicBlock *getBBVal(const ValID &ID) {
+  assert(inFunctionScope() && "Can't get basic block at global scope!");
+
+  BasicBlock *BB =  0;
+
+  std::map<ValID, BasicBlock*>::iterator BBI = CurFun.BBForwardRefs.find(ID);
+  if (BBI != CurFun.BBForwardRefs.end()) {
+    BB = BBI->second;
+  } if (ID.Type == ValID::LocalName) {
+    std::string Name = ID.Name;
+    Value *N = CurFun.CurrentFunction->getValueSymbolTable().lookup(Name);
+    if (N)
+      if (N->getType()->getTypeID() == Type::LabelTyID)
+        BB = cast<BasicBlock>(N);
+      else
+        GenerateError("Reference to label '" + Name + "' is actually of type '"+
+          N->getType()->getDescription() + "'");
+  } else if (ID.Type == ValID::LocalID) {
+    if (ID.Num < CurFun.NextValNum && ID.Num < CurFun.Values.size()) {
+      if (CurFun.Values[ID.Num]->getType()->getTypeID() == Type::LabelTyID)
+        BB = cast<BasicBlock>(CurFun.Values[ID.Num]);
+      else
+        GenerateError("Reference to label '%" + utostr(ID.Num) + 
+          "' is actually of type '"+ 
+          CurFun.Values[ID.Num]->getType()->getDescription() + "'");
+    }
   } else {
-    CurFun.NumberedBlocks[ID.Num] = BB;
+    GenerateError("Illegal label reference " + ID.getName());
+    return 0;
   }
 
-  // If this is not a definition, keep track of it so we can use it as a forward
-  // reference.
-  if (!isDefinition) {
-    // Remember where this forward reference came from.
-    CurFun.BBForwardRefs[BB] = std::make_pair(ID, llvmAsmlineno);
-  } else {
-    // The forward declaration could have been inserted anywhere in the
-    // function: insert it into the correct place now.
-    CurFun.CurrentFunction->getBasicBlockList().remove(BB);
-    CurFun.CurrentFunction->getBasicBlockList().push_back(BB);
+  // If its already been defined, return it now.
+  if (BB) {
+    ID.destroy(); // Free strdup'd memory.
+    return BB;
   }
-  ID.destroy();
+
+  // Otherwise, this block has not been seen before, create it.
+  std::string Name;
+  if (ID.Type == ValID::LocalName)
+    Name = ID.Name;
+  BB = new BasicBlock(Name, CurFun.CurrentFunction);
+
+  // Insert it in the forward refs map.
+  CurFun.BBForwardRefs[ID] = BB;
+
   return BB;
 }
 
@@ -571,50 +608,44 @@
 // defs now...
 //
 static void 
-ResolveDefinitions(std::map<const Type*,ValueList> &LateResolvers,
-                   std::map<const Type*,ValueList> *FutureLateResolvers) {
+ResolveDefinitions(ValueList &LateResolvers, ValueList *FutureLateResolvers) {
   // Loop over LateResolveDefs fixing up stuff that couldn't be resolved
-  for (std::map<const Type*,ValueList>::iterator LRI = LateResolvers.begin(),
-         E = LateResolvers.end(); LRI != E; ++LRI) {
-    ValueList &List = LRI->second;
-    while (!List.empty()) {
-      Value *V = List.back();
-      List.pop_back();
-
-      std::map<Value*, std::pair<ValID, int> >::iterator PHI =
-        CurModule.PlaceHolderInfo.find(V);
-      assert(PHI != CurModule.PlaceHolderInfo.end() && "Placeholder error!");
+  while (!LateResolvers.empty()) {
+    Value *V = LateResolvers.back();
+    LateResolvers.pop_back();
+
+    std::map<Value*, std::pair<ValID, int> >::iterator PHI =
+      CurModule.PlaceHolderInfo.find(V);
+    assert(PHI != CurModule.PlaceHolderInfo.end() && "Placeholder error!");
 
-      ValID &DID = PHI->second.first;
+    ValID &DID = PHI->second.first;
 
-      Value *TheRealValue = getValNonImprovising(LRI->first, DID);
-      if (TriggerError)
+    Value *TheRealValue = getExistingVal(V->getType(), DID);
+    if (TriggerError)
+      return;
+    if (TheRealValue) {
+      V->replaceAllUsesWith(TheRealValue);
+      delete V;
+      CurModule.PlaceHolderInfo.erase(PHI);
+    } else if (FutureLateResolvers) {
+      // Functions have their unresolved items forwarded to the module late
+      // resolver table
+      InsertValue(V, *FutureLateResolvers);
+    } else {
+      if (DID.Type == ValID::LocalName || DID.Type == ValID::GlobalName) {
+        GenerateError("Reference to an invalid definition: '" +DID.getName()+
+                       "' of type '" + V->getType()->getDescription() + "'",
+                       PHI->second.second);
         return;
-      if (TheRealValue) {
-        V->replaceAllUsesWith(TheRealValue);
-        delete V;
-        CurModule.PlaceHolderInfo.erase(PHI);
-      } else if (FutureLateResolvers) {
-        // Functions have their unresolved items forwarded to the module late
-        // resolver table
-        InsertValue(V, *FutureLateResolvers);
       } else {
-        if (DID.Type == ValID::LocalName || DID.Type == ValID::GlobalName) {
-          GenerateError("Reference to an invalid definition: '" +DID.getName()+
-                         "' of type '" + V->getType()->getDescription() + "'",
-                         PHI->second.second);
-          return;
-        } else {
-          GenerateError("Reference to an invalid definition: #" +
-                         itostr(DID.Num) + " of type '" +
-                         V->getType()->getDescription() + "'",
-                         PHI->second.second);
-          return;
-        }
+        GenerateError("Reference to an invalid definition: #" +
+                       itostr(DID.Num) + " of type '" +
+                       V->getType()->getDescription() + "'",
+                       PHI->second.second);
+        return;
       }
     }
   }
-
   LateResolvers.clear();
 }
 
@@ -688,7 +719,7 @@
   if (!Name.empty()) {
     ID = ValID::createGlobalName((char*)Name.c_str());
   } else {
-    ID = ValID::createGlobalID(CurModule.Values[PTy].size());
+    ID = ValID::createGlobalID(CurModule.Values.size());
   }
 
   if (GlobalValue *FWGV = CurModule.GetForwardRefForGlobal(PTy, ID)) {
@@ -1631,15 +1662,15 @@
 
     // ConstExprs can exist in the body of a function, thus creating
     // GlobalValues whenever they refer to a variable.  Because we are in
-    // the context of a function, getValNonImprovising will search the functions
+    // the context of a function, getExistingVal will search the functions
     // symbol table instead of the module symbol table for the global symbol,
     // which throws things all off.  To get around this, we just tell
-    // getValNonImprovising that we are at global scope here.
+    // getExistingVal that we are at global scope here.
     //
     Function *SavedCurFn = CurFun.CurrentFunction;
     CurFun.CurrentFunction = 0;
 
-    Value *V = getValNonImprovising(Ty, $2);
+    Value *V = getExistingVal(Ty, $2);
     CHECK_FOR_ERROR
 
     CurFun.CurrentFunction = SavedCurFn;
@@ -2116,7 +2147,7 @@
   if (!FunctionName.empty()) {
     ID = ValID::createGlobalName((char*)FunctionName.c_str());
   } else {
-    ID = ValID::createGlobalID(CurModule.Values[PFT].size());
+    ID = ValID::createGlobalID(CurModule.Values.size());
   }
 
   Function *Fn = 0;
@@ -2356,7 +2387,6 @@
     CHECK_FOR_ERROR
     InsertValue($3);
     $1->getInstList().push_back($3);
-    InsertValue($1);
     $$ = $1;
     CHECK_FOR_ERROR
   };
@@ -2370,28 +2400,12 @@
     $$ = $1;
     CHECK_FOR_ERROR
   }
-  | /* empty */ {
-    $$ = getBBVal(ValID::createLocalID(CurFun.NextBBNum++), true);
-    CHECK_FOR_ERROR
-
-    // Make sure to move the basic block to the correct location in the
-    // function, instead of leaving it inserted wherever it was first
-    // referenced.
-    Function::BasicBlockListType &BBL = 
-      CurFun.CurrentFunction->getBasicBlockList();
-    BBL.splice(BBL.end(), BBL, $$);
+  | /* empty */ {          // Empty space between instruction lists
+    $$ = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
   }
-  | LABELSTR {
-    $$ = getBBVal(ValID::createLocalName($1), true);
-    CHECK_FOR_ERROR
-
-    // Make sure to move the basic block to the correct location in the
-    // function, instead of leaving it inserted wherever it was first
-    // referenced.
-    Function::BasicBlockListType &BBL = 
-      CurFun.CurrentFunction->getBasicBlockList();
-    BBL.splice(BBL.end(), BBL, $$);
+  | LABELSTR {             // Labelled (named) basic block
+    $$ = defineBBVal(ValID::createLocalName($1));
     CHECK_FOR_ERROR
   };
 
@@ -2399,15 +2413,15 @@
     $$ = new ReturnInst($2);
     CHECK_FOR_ERROR
   }
-  | RET VOID {                                       // Return with no result...
+  | RET VOID {                                    // Return with no result...
     $$ = new ReturnInst();
     CHECK_FOR_ERROR
   }
-  | BR LABEL ValueRef {                         // Unconditional Branch...
+  | BR LABEL ValueRef {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal($3);
     CHECK_FOR_ERROR
     $$ = new BranchInst(tmpBB);
-  }                                                  // Conditional Branch...
+  }                                               // Conditional Branch...
   | BR INTTYPE ValueRef ',' LABEL ValueRef ',' LABEL ValueRef {  
     assert(cast<IntegerType>($2)->getBitWidth() == 1 && "Not Bool?");
     BasicBlock* tmpBBA = getBBVal($6);
@@ -2526,7 +2540,7 @@
 
 JumpTable : JumpTable IntType ConstValueRef ',' LABEL ValueRef {
     $$ = $1;
-    Constant *V = cast<Constant>(getValNonImprovising($2, $3));
+    Constant *V = cast<Constant>(getExistingVal($2, $3));
     CHECK_FOR_ERROR
     if (V == 0)
       GEN_ERROR("May only switch on a constant pool value");
@@ -2537,7 +2551,7 @@
   }
   | IntType ConstValueRef ',' LABEL ValueRef {
     $$ = new std::vector<std::pair<Constant*, BasicBlock*> >();
-    Constant *V = cast<Constant>(getValNonImprovising($1, $2));
+    Constant *V = cast<Constant>(getExistingVal($1, $2));
     CHECK_FOR_ERROR
 
     if (V == 0)





From reid at x10sys.com  Mon Mar 19 13:41:54 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 13:41:54 -0500
Subject: [llvm-commits] CVS:
	llvm/test/Assembler/2007-03-18-InvalidNumberedVar.ll
Message-ID: <200703191841.l2JIfsnp017324@zion.cs.uiuc.edu>



Changes in directory llvm/test/Assembler:

2007-03-18-InvalidNumberedVar.ll added (r1.1)
---
Log message:

For PR1258: http://llvm.org/PR1258 :
Test that invalid numbered value references get an error message.


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

 2007-03-18-InvalidNumberedVar.ll |    9 +++++++++
 1 files changed, 9 insertions(+)


Index: llvm/test/Assembler/2007-03-18-InvalidNumberedVar.ll
diff -c /dev/null llvm/test/Assembler/2007-03-18-InvalidNumberedVar.ll:1.1
*** /dev/null	Mon Mar 19 13:41:47 2007
--- llvm/test/Assembler/2007-03-18-InvalidNumberedVar.ll	Mon Mar 19 13:41:37 2007
***************
*** 0 ****
--- 1,9 ----
+ ; PR 1258
+ ; RUN: llvm-as < %s 2>&1 >/dev/null -f | grep "Numbered.*does not match"
+ 
+ define i32 @test1(i32 %a, i32 %b) {
+ entry:
+   icmp eq i32 %b, %a              ; <i1>:0 [#uses=1]
+   zext i1 %0 to i32               ; <i32>:0 [#uses=1]
+   ret i32 %0                      ; Invalid Type for %0
+ }





From clattner at apple.com  Mon Mar 19 14:01:54 2007
From: clattner at apple.com (Chris Lattner)
Date: Mon, 19 Mar 2007 12:01:54 -0700
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp
In-Reply-To: <200703191833.l2JIXAho017048@zion.cs.uiuc.edu>
References: <200703191833.l2JIXAho017048@zion.cs.uiuc.edu>
Message-ID: <F82F67BD-A473-4417-A226-E6CA1FFDDD06@apple.com>

On Mar 19, 2007, at 11:33 AM, Reid Spencer wrote:
> For PR1258: http://llvm.org/PR1258 :
> Radically simplify the SlotMachine. There is no need to keep Value  
> planes
> around any more. This change causes slot numbering to number all un- 
> named,
> non-void values starting at 0 and incrementing monotonically  
> through the
> function, regardless of type (including BasicBlocks). Getting slot  
> numbers
> is now a single lookup operation instead of a double lookup.

Woot, thanks Reid!

-Chris

>
> ---
> Diffs of the changes:  (+20 -39)
>
>  AsmWriter.cpp |   59 ++++++++++++++++++ 
> +---------------------------------------
>  1 files changed, 20 insertions(+), 39 deletions(-)
>
>
> Index: llvm/lib/VMCore/AsmWriter.cpp
> diff -u llvm/lib/VMCore/AsmWriter.cpp:1.263 llvm/lib/VMCore/ 
> AsmWriter.cpp:1.264
> --- llvm/lib/VMCore/AsmWriter.cpp:1.263	Tue Feb 27 14:25:25 2007
> +++ llvm/lib/VMCore/AsmWriter.cpp	Mon Mar 19 13:32:53 2007
> @@ -48,17 +48,7 @@
>  public:
>
>    /// @brief A mapping of Values to slot numbers
> -  typedef std::map<const Value*, unsigned> ValueMap;
> -
> -  /// @brief A plane with next slot number and ValueMap
> -  struct ValuePlane {
> -    unsigned next_slot;        ///< The next slot number to use
> -    ValueMap map;              ///< The map of Value* -> unsigned
> -    ValuePlane() { next_slot = 0; } ///< Make sure we start at 0
> -  };
> -
> -  /// @brief The map of planes by Type
> -  typedef std::map<const Type*, ValuePlane> TypedPlanes;
> +  typedef std::map<const Value*,unsigned> ValueMap;
>
>  /// @}
>  /// @name Constructors
> @@ -131,10 +121,12 @@
>    bool FunctionProcessed;
>
>    /// @brief The TypePlanes map for the module level data
> -  TypedPlanes mMap;
> +  ValueMap mMap;
> +  unsigned mNext;
>
>    /// @brief The TypePlanes map for the function level data
> -  TypedPlanes fMap;
> +  ValueMap fMap;
> +  unsigned fNext;
>
>  /// @}
>
> @@ -1385,6 +1377,7 @@
>    : TheModule(M)    ///< Saved for lazy initialization.
>    , TheFunction(0)
>    , FunctionProcessed(false)
> +  , mMap(), mNext(0), fMap(), fNext(0)
>  {
>  }
>
> @@ -1394,6 +1387,7 @@
>    : TheModule(F ? F->getParent() : 0) ///< Saved for lazy  
> initialization
>    , TheFunction(F) ///< Saved for lazy initialization
>    , FunctionProcessed(false)
> +  , mMap(), mNext(0), fMap(), fNext(0)
>  {
>  }
>
> @@ -1430,6 +1424,7 @@
>  // Process the arguments, basic blocks, and instructions  of a  
> function.
>  void SlotMachine::processFunction() {
>    SC_DEBUG("begin processFunction!\n");
> +  fNext = 0;
>
>    // Add all the function arguments with no names.
>    for(Function::const_arg_iterator AI = TheFunction->arg_begin(),
> @@ -1471,12 +1466,10 @@
>    initialize();
>
>    // Find the type plane in the module map
> -  TypedPlanes::const_iterator MI = mMap.find(V->getType());
> +  ValueMap::const_iterator MI = mMap.find(V);
>    if (MI == mMap.end()) return -1;
> -
> -  // Lookup the value in the module plane's map.
> -  ValueMap::const_iterator MVI = MI->second.map.find(V);
> -  return MVI != MI->second.map.end() ? int(MVI->second) : -1;
> +
> +  return MI->second;
>  }
>
>
> @@ -1487,33 +1480,23 @@
>    // Check for uninitialized state and do lazy initialization.
>    initialize();
>
> -  // Get the type of the value
> -  const Type *VTy = V->getType();
> -
> -  TypedPlanes::const_iterator FI = fMap.find(VTy);
> +  ValueMap::const_iterator FI = fMap.find(V);
>    if (FI == fMap.end()) return -1;
>
> -  // Lookup the Value in the function and module maps.
> -  ValueMap::const_iterator FVI = FI->second.map.find(V);
> -
> -  // If the value doesn't exist in the function map, it is a <badref>
> -  if (FVI == FI->second.map.end()) return -1;
> -
> -  return FVI->second;
> +  return FI->second;
>  }
>
>
>  /// CreateModuleSlot - Insert the specified GlobalValue* into the  
> slot table.
>  void SlotMachine::CreateModuleSlot(const GlobalValue *V) {
>    assert(V && "Can't insert a null Value into SlotMachine!");
> +  assert(V->getType() != Type::VoidTy && "Doesn't need a slot!");
> +  assert(!V->hasName() && "Doesn't need a slot!");
>
> -  unsigned DestSlot = 0;
> -  const Type *VTy = V->getType();
> -
> -  ValuePlane &PlaneMap = mMap[VTy];
> -  DestSlot = PlaneMap.map[V] = PlaneMap.next_slot++;
> +  unsigned DestSlot = mNext++;
> +  mMap[V] = DestSlot;
>
> -  SC_DEBUG("  Inserting value [" << VTy << "] = " << V << " slot=" <<
> +  SC_DEBUG("  Inserting value [" << V->getType() << "] = " << V <<  
> " slot=" <<
>             DestSlot << " [");
>    // G = Global, F = Function, o = other
>    SC_DEBUG((isa<GlobalVariable>(V) ? 'G' : 'F') << "]\n");
> @@ -1525,10 +1508,8 @@
>    const Type *VTy = V->getType();
>    assert(VTy != Type::VoidTy && !V->hasName() && "Doesn't need a  
> slot!");
>
> -  unsigned DestSlot = 0;
> -
> -  ValuePlane &PlaneMap = fMap[VTy];
> -  DestSlot = PlaneMap.map[V] = PlaneMap.next_slot++;
> +  unsigned DestSlot = fNext++;
> +  fMap[V] = DestSlot;
>
>    // G = Global, F = Function, o = other
>    SC_DEBUG("  Inserting value [" << VTy << "] = " << V << " slot=" <<
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From dpatel at apple.com  Mon Mar 19 14:06:59 2007
From: dpatel at apple.com (dpatel at apple.com)
Date: Mon, 19 Mar 2007 12:06:59 -0700 (PDT)
Subject: [llvm-commits] [125159] Fix arry ref size calculation.
Message-ID: <20070319190659.6FA91A4D2E1E@src>

Revision: 125159
Author:   dpatel
Date:     2007-03-19 12:06:59 -0700 (Mon, 19 Mar 2007)

Log Message:
-----------
Fix arry ref size calculation. Patch by Duncan Sands.

Modified Paths:
--------------
    apple-local/branches/llvm/gcc/llvm-convert.cpp

Modified: apple-local/branches/llvm/gcc/llvm-convert.cpp
===================================================================
--- apple-local/branches/llvm/gcc/llvm-convert.cpp	2007-03-19 08:51:20 UTC (rev 125158)
+++ apple-local/branches/llvm/gcc/llvm-convert.cpp	2007-03-19 19:06:59 UTC (rev 125159)
@@ -4562,9 +4562,8 @@
     tree length = arrayLength(TREE_TYPE(Array));
     if (length && !host_integerp(length, 1)) {
       // Make sure that ArrayAddr is of type ElementTy*, then do a 2-index gep.
-      tree ElTy = TREE_TYPE(TREE_TYPE(Array));
       ArrayAddr = BitCastToType(ArrayAddr, PointerType::get(Type::Int8Ty));
-      Value *Scale = Emit(TYPE_SIZE_UNIT(ElTy), 0);
+      Value *Scale = Emit(array_ref_element_size(exp), 0);
       if (Scale->getType() != IntPtrTy)
         Scale = CastToUIntType(Scale, IntPtrTy);
 
@@ -4595,7 +4594,7 @@
   //   float foo(int w, float A[][w], int g) { return A[g][0]; }
   
   ArrayAddr = BitCastToType(ArrayAddr, PointerType::get(Type::Int8Ty));
-  Value *TypeSize = Emit(TYPE_SIZE_UNIT(IndexedType), 0);
+  Value *TypeSize = Emit(array_ref_element_size(exp), 0);
 
   if (TypeSize->getType() != IntPtrTy)
     TypeSize = CastToUIntType(TypeSize, IntPtrTy);




From dpatel at apple.com  Mon Mar 19 14:07:51 2007
From: dpatel at apple.com (Devang Patel)
Date: Mon, 19 Mar 2007 12:07:51 -0700
Subject: [llvm-commits] llvm-gcc: use array_ref_element_size when
	emitting	an ARRAY_REF
In-Reply-To: <200703091056.06713.baldrick@free.fr>
References: <200703091056.06713.baldrick@free.fr>
Message-ID: <43F61085-1319-410C-BC08-EF34F442CC60@apple.com>


On Mar 9, 2007, at 1:56 AM, Duncan Sands wrote:

> The array element type doesn't always have a known size, which is  
> why the
> ARRAY_REF supplies the size, extractable with  
> array_ref_element_size.  Fix
> and Ada testcase attached.
>
> Ciao,

Applied.

-
Devang


From baldrick at free.fr  Mon Mar 19 14:56:35 2007
From: baldrick at free.fr (Duncan Sands)
Date: Mon, 19 Mar 2007 14:56:35 -0500
Subject: [llvm-commits] CVS: llvm/test/AdaFrontend/array_ref.adb
Message-ID: <200703191956.l2JJuZrJ018785@zion.cs.uiuc.edu>



Changes in directory llvm/test/AdaFrontend:

array_ref.adb added (r1.1)
---
Log message:

Test handling of ARRAY_REF when the component type is of unknown size.


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

 array_ref.adb |   11 +++++++++++
 1 files changed, 11 insertions(+)


Index: llvm/test/AdaFrontend/array_ref.adb
diff -c /dev/null llvm/test/AdaFrontend/array_ref.adb:1.1
*** /dev/null	Mon Mar 19 14:56:28 2007
--- llvm/test/AdaFrontend/array_ref.adb	Mon Mar 19 14:56:18 2007
***************
*** 0 ****
--- 1,11 ----
+ -- RUN: %llvmgcc -c %s -o /dev/null
+ procedure Array_Ref is
+    type A is array (Natural range <>, Natural range <>) of Boolean;
+    type A_Access is access A;
+    function Get (X : A_Access) return Boolean is
+    begin
+       return X (0, 0);
+    end;
+ begin
+    null;
+ end;





From asl at math.spbu.ru  Mon Mar 19 15:19:25 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Mon, 19 Mar 2007 15:19:25 -0500
Subject: [llvm-commits] CVS: llvm/lib/System/Win32/Program.inc
Message-ID: <200703192019.l2JKJPr5019142@zion.cs.uiuc.edu>



Changes in directory llvm/lib/System/Win32:

Program.inc updated: 1.22 -> 1.23
---
Log message:

Fix mingw32 build


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

 Program.inc |    1 +
 1 files changed, 1 insertion(+)


Index: llvm/lib/System/Win32/Program.inc
diff -u llvm/lib/System/Win32/Program.inc:1.22 llvm/lib/System/Win32/Program.inc:1.23
--- llvm/lib/System/Win32/Program.inc:1.22	Fri Mar  9 05:53:34 2007
+++ llvm/lib/System/Win32/Program.inc	Mon Mar 19 15:19:08 2007
@@ -100,6 +100,7 @@
 
 #ifdef __MINGW32__
   // Due to unknown reason, mingw32's w32api doesn't have this declaration.
+  extern "C"
   BOOL WINAPI SetInformationJobObject(HANDLE hJob,
                                       JOBOBJECTINFOCLASS JobObjectInfoClass,
                                       LPVOID lpJobObjectInfo,





From reid at x10sys.com  Mon Mar 19 15:35:43 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 15:35:43 -0500
Subject: [llvm-commits] CVS: llvm/test/Assembler/2007-03-19-NegValue.ll
Message-ID: <200703192035.l2JKZhDR019397@zion.cs.uiuc.edu>



Changes in directory llvm/test/Assembler:

2007-03-19-NegValue.ll added (r1.1)
---
Log message:

Test case noticed by Sheng that fails because negative values that are 
greater than 64-bits don't have the sign bits extended on construction of
the APInt.


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

 2007-03-19-NegValue.ll |    7 +++++++
 1 files changed, 7 insertions(+)


Index: llvm/test/Assembler/2007-03-19-NegValue.ll
diff -c /dev/null llvm/test/Assembler/2007-03-19-NegValue.ll:1.1
*** /dev/null	Mon Mar 19 15:35:36 2007
--- llvm/test/Assembler/2007-03-19-NegValue.ll	Mon Mar 19 15:35:26 2007
***************
*** 0 ****
--- 1,7 ----
+ ; Test whether negative values > 64 bits retain their negativeness.
+ ; RUN: llvm-as < %s | llvm-dis | grep 'add i65.*, -1'
+ 
+ define i65 @testConsts(i65 %N) {
+   %a = add i65 %N, -1
+   ret i65 %a
+ }





From reid at x10sys.com  Mon Mar 19 15:37:05 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 15:37:05 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/ADT/APInt.h
Message-ID: <200703192037.l2JKb5fe019436@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/ADT:

APInt.h updated: 1.43 -> 1.44
---
Log message:

Add an indication of signedness to the uint64_t constructor so sign bits
can be extended. This helps fix test/Assembler/2007-03-19-NegValue.ll


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

 APInt.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/ADT/APInt.h
diff -u llvm/include/llvm/ADT/APInt.h:1.43 llvm/include/llvm/ADT/APInt.h:1.44
--- llvm/include/llvm/ADT/APInt.h:1.43	Mon Mar 19 00:22:18 2007
+++ llvm/include/llvm/ADT/APInt.h	Mon Mar 19 15:36:48 2007
@@ -151,7 +151,7 @@
 
 public:
   /// @brief Create a new APInt of numBits width, initialized as val.
-  APInt(uint32_t numBits, uint64_t val);
+  APInt(uint32_t numBits, uint64_t val, bool isSigned = false);
 
   /// Note that numWords can be smaller or larger than the corresponding bit
   /// width but any extraneous bits will be dropped.





From reid at x10sys.com  Mon Mar 19 15:38:04 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 15:38:04 -0500
Subject: [llvm-commits] CVS: llvm/lib/Support/APInt.cpp
Message-ID: <200703192038.l2JKc4aN019469@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Support:

APInt.cpp updated: 1.71 -> 1.72
---
Log message:

Implement extension of sign bits for negative values in the uint64_t
constructor. This helps to fix test/Assembler/2007-03-19-NegValue.ll


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

 APInt.cpp |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)


Index: llvm/lib/Support/APInt.cpp
diff -u llvm/lib/Support/APInt.cpp:1.71 llvm/lib/Support/APInt.cpp:1.72
--- llvm/lib/Support/APInt.cpp:1.71	Mon Mar 12 13:37:25 2007
+++ llvm/lib/Support/APInt.cpp	Mon Mar 19 15:37:47 2007
@@ -43,7 +43,8 @@
   return result;
 }
 
-APInt::APInt(uint32_t numBits, uint64_t val) : BitWidth(numBits), VAL(0) {
+APInt::APInt(uint32_t numBits, uint64_t val, bool isSigned ) 
+  : BitWidth(numBits), VAL(0) {
   assert(BitWidth >= IntegerType::MIN_INT_BITS && "bitwidth too small");
   assert(BitWidth <= IntegerType::MAX_INT_BITS && "bitwidth too large");
   if (isSingleWord())
@@ -51,6 +52,9 @@
   else {
     pVal = getClearedMemory(getNumWords());
     pVal[0] = val;
+    if (isSigned && int64_t(val) < 0) 
+      for (unsigned i = 1; i < getNumWords(); ++i)
+        pVal[i] = -1ULL;
   }
   clearUnusedBits();
 }





From reid at x10sys.com  Mon Mar 19 15:39:30 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 15:39:30 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Constants.cpp
Message-ID: <200703192039.l2JKdU7d019513@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Constants.cpp updated: 1.227 -> 1.228
---
Log message:

Allow ConstantInt::get(Ty, uint64_t) to interpret the 64-bit values as a
negative number. This is needed to fix test/Assembler/2007-03-19-NegValue.ll


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

 Constants.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/lib/VMCore/Constants.cpp
diff -u llvm/lib/VMCore/Constants.cpp:1.227 llvm/lib/VMCore/Constants.cpp:1.228
--- llvm/lib/VMCore/Constants.cpp:1.227	Wed Mar  7 18:59:12 2007
+++ llvm/lib/VMCore/Constants.cpp	Mon Mar 19 15:39:08 2007
@@ -203,9 +203,9 @@
                  DenseMapAPIntKeyInfo> IntMapTy;
 static ManagedStatic<IntMapTy> IntConstants;
 
-ConstantInt *ConstantInt::get(const Type *Ty, uint64_t V) {
+ConstantInt *ConstantInt::get(const Type *Ty, uint64_t V, bool isSigned) {
   const IntegerType *ITy = cast<IntegerType>(Ty);
-  return get(APInt(ITy->getBitWidth(), V));
+  return get(APInt(ITy->getBitWidth(), V, isSigned));
 }
 
 // Get a ConstantInt from an APInt. Note that the value stored in the DenseMap 





From reid at x10sys.com  Mon Mar 19 15:39:30 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 15:39:30 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Constants.h
Message-ID: <200703192039.l2JKdU5T019508@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Constants.h updated: 1.138 -> 1.139
---
Log message:

Allow ConstantInt::get(Ty, uint64_t) to interpret the 64-bit values as a
negative number. This is needed to fix test/Assembler/2007-03-19-NegValue.ll


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

 Constants.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/Constants.h
diff -u llvm/include/llvm/Constants.h:1.138 llvm/include/llvm/Constants.h:1.139
--- llvm/include/llvm/Constants.h:1.138	Thu Mar  1 18:27:06 2007
+++ llvm/include/llvm/Constants.h	Mon Mar 19 15:39:08 2007
@@ -94,7 +94,7 @@
   /// either getSExtValue() or getZExtValue() will yield a correctly sized and
   /// signed value for the type Ty.
   /// @brief Get a ConstantInt for a specific value.
-  static ConstantInt *get(const Type *Ty, uint64_t V);
+  static ConstantInt *get(const Type *Ty, uint64_t V, bool isSigned = false);
 
   /// Return a ConstantInt with the specified value and an implied Type. The
   /// type is the integer type that corresponds to the bit width of the value.





From reid at x10sys.com  Mon Mar 19 15:40:39 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 15:40:39 -0500
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.y
Message-ID: <200703192040.l2JKedve019552@zion.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

llvmAsmParser.y updated: 1.328 -> 1.329
---
Log message:

Fix test/Assembler/2007-03-19-NegValue.ll by using the new "isSigned" 
parameter on ConstantInt::get to indicate the signedness of the intended
value.


---
Diffs of the changes:  (+4 -9)

 llvmAsmParser.y |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.328 llvm/lib/AsmParser/llvmAsmParser.y:1.329
--- llvm/lib/AsmParser/llvmAsmParser.y:1.328	Mon Mar 19 13:39:36 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y	Mon Mar 19 15:40:22 2007
@@ -392,7 +392,7 @@
                      Ty->getDescription() + "'");
       return 0;
     }
-    return ConstantInt::get(Ty, D.ConstPool64);
+    return ConstantInt::get(Ty, D.ConstPool64, true);
 
   case ValID::ConstUIntVal:     // Is it an unsigned const pool reference?
     if (!ConstantInt::isValueValidForType(Ty, D.UConstPool64)) {
@@ -401,7 +401,7 @@
                        "' is invalid or out of range");
         return 0;
       } else {     // This is really a signed reference.  Transmogrify.
-        return ConstantInt::get(Ty, D.ConstPool64);
+        return ConstantInt::get(Ty, D.ConstPool64, true);
       }
     } else {
       return ConstantInt::get(Ty, D.UConstPool64);
@@ -1742,10 +1742,7 @@
   | IntType ESINT64VAL {      // integral constants
     if (!ConstantInt::isValueValidForType($1, $2))
       GEN_ERROR("Constant value doesn't fit in type");
-    APInt Val(64, $2);
-    uint32_t BitWidth = cast<IntegerType>($1)->getBitWidth();
-    Val.sextOrTrunc(BitWidth);
-    $$ = ConstantInt::get(Val);
+    $$ = ConstantInt::get($1, $2, true);
     CHECK_FOR_ERROR
   }
   | IntType ESAPINTVAL {      // arbitrary precision integer constants
@@ -1761,9 +1758,7 @@
   | IntType EUINT64VAL {      // integral constants
     if (!ConstantInt::isValueValidForType($1, $2))
       GEN_ERROR("Constant value doesn't fit in type");
-    uint32_t BitWidth = cast<IntegerType>($1)->getBitWidth();
-    APInt Val(BitWidth, $2);
-    $$ = ConstantInt::get(Val);
+    $$ = ConstantInt::get($1, $2, false);
     CHECK_FOR_ERROR
   }
   | IntType EUAPINTVAL {      // arbitrary precision integer constants





From reid at x10sys.com  Mon Mar 19 15:41:08 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 15:41:08 -0500
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
	llvmAsmParser.y.cvs
Message-ID: <200703192041.l2JKf8ZY019572@zion.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

llvmAsmParser.cpp.cvs updated: 1.73 -> 1.74
llvmAsmParser.y.cvs updated: 1.74 -> 1.75
---
Log message:

Regenerate.


---
Diffs of the changes:  (+146 -156)

 llvmAsmParser.cpp.cvs |  289 ++++++++++++++++++++++++--------------------------
 llvmAsmParser.y.cvs   |   13 --
 2 files changed, 146 insertions(+), 156 deletions(-)


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.73 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.74
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.73	Mon Mar 19 13:40:50 2007
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Mon Mar 19 15:40:51 2007
@@ -716,7 +716,7 @@
                      Ty->getDescription() + "'");
       return 0;
     }
-    return ConstantInt::get(Ty, D.ConstPool64);
+    return ConstantInt::get(Ty, D.ConstPool64, true);
 
   case ValID::ConstUIntVal:     // Is it an unsigned const pool reference?
     if (!ConstantInt::isValueValidForType(Ty, D.UConstPool64)) {
@@ -725,7 +725,7 @@
                        "' is invalid or out of range");
         return 0;
       } else {     // This is really a signed reference.  Transmogrify.
-        return ConstantInt::get(Ty, D.ConstPool64);
+        return ConstantInt::get(Ty, D.ConstPool64, true);
       }
     } else {
       return ConstantInt::get(Ty, D.UConstPool64);
@@ -1695,20 +1695,20 @@
     1272,  1279,  1284,  1292,  1310,  1328,  1333,  1345,  1355,  1359,
     1369,  1376,  1383,  1390,  1395,  1400,  1407,  1408,  1415,  1422,
     1430,  1435,  1446,  1474,  1490,  1519,  1547,  1572,  1591,  1617,
-    1637,  1649,  1656,  1722,  1732,  1742,  1751,  1761,  1769,  1779,
-    1784,  1789,  1797,  1809,  1831,  1839,  1845,  1856,  1861,  1866,
-    1872,  1878,  1887,  1891,  1899,  1899,  1910,  1915,  1923,  1924,
-    1928,  1928,  1932,  1932,  1935,  1938,  1950,  1974,  1985,  1985,
-    1995,  1995,  2003,  2003,  2013,  2016,  2022,  2035,  2039,  2044,
-    2046,  2051,  2056,  2065,  2075,  2086,  2090,  2099,  2108,  2113,
-    2225,  2225,  2227,  2236,  2236,  2238,  2243,  2255,  2259,  2264,
-    2268,  2272,  2276,  2280,  2284,  2288,  2292,  2296,  2321,  2325,
-    2339,  2343,  2347,  2351,  2357,  2357,  2363,  2372,  2376,  2385,
-    2394,  2403,  2407,  2412,  2416,  2420,  2425,  2435,  2454,  2463,
-    2530,  2534,  2541,  2552,  2565,  2575,  2586,  2596,  2604,  2612,
-    2615,  2616,  2623,  2627,  2632,  2653,  2670,  2683,  2696,  2708,
-    2716,  2723,  2729,  2735,  2741,  2756,  2820,  2825,  2829,  2836,
-    2843,  2851,  2858,  2866,  2874,  2888,  2905
+    1637,  1649,  1656,  1722,  1732,  1742,  1748,  1758,  1764,  1774,
+    1779,  1784,  1792,  1804,  1826,  1834,  1840,  1851,  1856,  1861,
+    1867,  1873,  1882,  1886,  1894,  1894,  1905,  1910,  1918,  1919,
+    1923,  1923,  1927,  1927,  1930,  1933,  1945,  1969,  1980,  1980,
+    1990,  1990,  1998,  1998,  2008,  2011,  2017,  2030,  2034,  2039,
+    2041,  2046,  2051,  2060,  2070,  2081,  2085,  2094,  2103,  2108,
+    2220,  2220,  2222,  2231,  2231,  2233,  2238,  2250,  2254,  2259,
+    2263,  2267,  2271,  2275,  2279,  2283,  2287,  2291,  2316,  2320,
+    2334,  2338,  2342,  2346,  2352,  2352,  2358,  2367,  2371,  2380,
+    2389,  2398,  2402,  2407,  2411,  2415,  2420,  2430,  2449,  2458,
+    2525,  2529,  2536,  2547,  2560,  2570,  2581,  2591,  2599,  2607,
+    2610,  2611,  2618,  2622,  2627,  2648,  2665,  2678,  2691,  2703,
+    2711,  2718,  2724,  2730,  2736,  2751,  2815,  2820,  2824,  2831,
+    2838,  2846,  2853,  2861,  2869,  2883,  2900
 };
 #endif
 
@@ -4058,16 +4058,13 @@
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
-    APInt Val(64, (yyvsp[0].SInt64Val));
-    uint32_t BitWidth = cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth();
-    Val.sextOrTrunc(BitWidth);
-    (yyval.ConstVal) = ConstantInt::get(Val);
+    (yyval.ConstVal) = ConstantInt::get((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val), true);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 156:
-#line 1751 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1748 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth();
     if ((yyvsp[0].APIntVal)->getBitWidth() > BitWidth) {
@@ -4081,19 +4078,17 @@
     break;
 
   case 157:
-#line 1761 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1758 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
-    uint32_t BitWidth = cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth();
-    APInt Val(BitWidth, (yyvsp[0].UInt64Val));
-    (yyval.ConstVal) = ConstantInt::get(Val);
+    (yyval.ConstVal) = ConstantInt::get((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val), false);
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 158:
-#line 1769 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1764 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth();
     if ((yyvsp[0].APIntVal)->getBitWidth() > BitWidth) {
@@ -4107,7 +4102,7 @@
     break;
 
   case 159:
-#line 1779 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1774 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     assert(cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?");
     (yyval.ConstVal) = ConstantInt::getTrue();
@@ -4116,7 +4111,7 @@
     break;
 
   case 160:
-#line 1784 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1779 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     assert(cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?");
     (yyval.ConstVal) = ConstantInt::getFalse();
@@ -4125,7 +4120,7 @@
     break;
 
   case 161:
-#line 1789 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1784 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Float & Double constants
     if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].FPVal)))
       GEN_ERROR("Floating point constant invalid for type");
@@ -4135,7 +4130,7 @@
     break;
 
   case 162:
-#line 1797 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1792 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4151,7 +4146,7 @@
     break;
 
   case 163:
-#line 1809 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1804 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-2].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
@@ -4177,7 +4172,7 @@
     break;
 
   case 164:
-#line 1831 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1826 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-5].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
@@ -4189,7 +4184,7 @@
     break;
 
   case 165:
-#line 1839 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1834 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
@@ -4199,7 +4194,7 @@
     break;
 
   case 166:
-#line 1845 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1840 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
@@ -4214,7 +4209,7 @@
     break;
 
   case 167:
-#line 1856 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1851 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
@@ -4223,7 +4218,7 @@
     break;
 
   case 168:
-#line 1861 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1856 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
@@ -4232,7 +4227,7 @@
     break;
 
   case 169:
-#line 1866 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1861 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -4242,7 +4237,7 @@
     break;
 
   case 170:
-#line 1872 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1867 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -4252,7 +4247,7 @@
     break;
 
   case 171:
-#line 1878 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1873 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -4262,7 +4257,7 @@
     break;
 
   case 172:
-#line 1887 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1882 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
@@ -4270,7 +4265,7 @@
     break;
 
   case 173:
-#line 1891 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1886 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
@@ -4279,17 +4274,17 @@
     break;
 
   case 174:
-#line 1899 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1894 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 175:
-#line 1899 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1894 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 176:
-#line 1910 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1905 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4298,7 +4293,7 @@
     break;
 
   case 177:
-#line 1915 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1910 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4307,12 +4302,12 @@
     break;
 
   case 180:
-#line 1928 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1923 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
   case 181:
-#line 1928 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1923 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
@@ -4320,26 +4315,26 @@
     break;
 
   case 182:
-#line 1932 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1927 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
   case 183:
-#line 1932 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1927 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 184:
-#line 1935 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1930 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 185:
-#line 1938 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1933 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     // Emit an error if there are any unresolved types left.
     if (!CurModule.LateResolveTypes.empty()) {
@@ -4355,7 +4350,7 @@
     break;
 
   case 186:
-#line 1950 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1945 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -4383,7 +4378,7 @@
     break;
 
   case 187:
-#line 1974 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1969 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[-2].StrVal), (yyvsp[0].PrimType));
 
@@ -4398,7 +4393,7 @@
     break;
 
   case 188:
-#line 1985 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1980 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     /* "Externally Visible" Linkage */
     if ((yyvsp[0].ConstVal) == 0) 
@@ -4410,14 +4405,14 @@
     break;
 
   case 189:
-#line 1992 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1987 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 190:
-#line 1995 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1990 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
@@ -4427,14 +4422,14 @@
     break;
 
   case 191:
-#line 2000 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1995 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 192:
-#line 2003 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1998 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -4445,7 +4440,7 @@
     break;
 
   case 193:
-#line 2009 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2004 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -4453,21 +4448,21 @@
     break;
 
   case 194:
-#line 2013 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2008 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 195:
-#line 2016 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2011 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 196:
-#line 2022 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2017 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
@@ -4483,7 +4478,7 @@
     break;
 
   case 197:
-#line 2035 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2030 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -4491,7 +4486,7 @@
     break;
 
   case 198:
-#line 2039 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2034 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -4499,7 +4494,7 @@
     break;
 
   case 200:
-#line 2046 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2041 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4508,7 +4503,7 @@
     break;
 
   case 201:
-#line 2051 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2046 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4517,14 +4512,14 @@
     break;
 
   case 202:
-#line 2056 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2051 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
   case 203:
-#line 2065 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2060 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -4538,7 +4533,7 @@
     break;
 
   case 204:
-#line 2075 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2070 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -4552,7 +4547,7 @@
     break;
 
   case 205:
-#line 2086 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2081 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[0].ArgList);
     CHECK_FOR_ERROR
@@ -4560,7 +4555,7 @@
     break;
 
   case 206:
-#line 2090 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2085 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     struct ArgListEntry E;
@@ -4573,7 +4568,7 @@
     break;
 
   case 207:
-#line 2099 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2094 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -4586,7 +4581,7 @@
     break;
 
   case 208:
-#line 2108 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2103 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
@@ -4594,7 +4589,7 @@
     break;
 
   case 209:
-#line 2114 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2109 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   UnEscapeLexed((yyvsp[-6].StrVal));
   std::string FunctionName((yyvsp[-6].StrVal));
@@ -4708,7 +4703,7 @@
     break;
 
   case 212:
-#line 2227 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2222 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -4720,7 +4715,7 @@
     break;
 
   case 215:
-#line 2238 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2233 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   CHECK_FOR_ERROR
@@ -4728,7 +4723,7 @@
     break;
 
   case 216:
-#line 2243 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2238 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[-2].Linkage));
     CurFun.CurrentFunction->setVisibility((yyvsp[-1].Visibility));
@@ -4739,7 +4734,7 @@
     break;
 
   case 217:
-#line 2255 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2250 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -4747,7 +4742,7 @@
     break;
 
   case 218:
-#line 2259 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2254 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -4755,7 +4750,7 @@
     break;
 
   case 219:
-#line 2264 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2259 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val));
     CHECK_FOR_ERROR
@@ -4763,7 +4758,7 @@
     break;
 
   case 220:
-#line 2268 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2263 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
     CHECK_FOR_ERROR
@@ -4771,7 +4766,7 @@
     break;
 
   case 221:
-#line 2272 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2267 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal));
     CHECK_FOR_ERROR
@@ -4779,7 +4774,7 @@
     break;
 
   case 222:
-#line 2276 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2271 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
@@ -4787,7 +4782,7 @@
     break;
 
   case 223:
-#line 2280 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2275 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
@@ -4795,7 +4790,7 @@
     break;
 
   case 224:
-#line 2284 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2279 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
@@ -4803,7 +4798,7 @@
     break;
 
   case 225:
-#line 2288 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2283 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
@@ -4811,7 +4806,7 @@
     break;
 
   case 226:
-#line 2292 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2287 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
@@ -4819,7 +4814,7 @@
     break;
 
   case 227:
-#line 2296 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2291 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType();
     int NumElements = (yyvsp[-1].ConstVector)->size(); 
@@ -4848,7 +4843,7 @@
     break;
 
   case 228:
-#line 2321 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2316 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
@@ -4856,7 +4851,7 @@
     break;
 
   case 229:
-#line 2325 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2320 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
     std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
@@ -4870,7 +4865,7 @@
     break;
 
   case 230:
-#line 2339 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2334 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::createLocalID((yyvsp[0].UIntVal));
     CHECK_FOR_ERROR
@@ -4878,7 +4873,7 @@
     break;
 
   case 231:
-#line 2343 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2338 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[0].UIntVal));
     CHECK_FOR_ERROR
@@ -4886,7 +4881,7 @@
     break;
 
   case 232:
-#line 2347 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2342 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createLocalName((yyvsp[0].StrVal));
     CHECK_FOR_ERROR
@@ -4894,7 +4889,7 @@
     break;
 
   case 233:
-#line 2351 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2346 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createGlobalName((yyvsp[0].StrVal));
     CHECK_FOR_ERROR
@@ -4902,7 +4897,7 @@
     break;
 
   case 236:
-#line 2363 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2358 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4913,7 +4908,7 @@
     break;
 
   case 237:
-#line 2372 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2367 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
@@ -4921,7 +4916,7 @@
     break;
 
   case 238:
-#line 2376 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2371 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
@@ -4929,7 +4924,7 @@
     break;
 
   case 239:
-#line 2385 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2380 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
     CHECK_FOR_ERROR
@@ -4941,7 +4936,7 @@
     break;
 
   case 240:
-#line 2394 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2389 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[0].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -4954,7 +4949,7 @@
     break;
 
   case 241:
-#line 2403 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2398 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
@@ -4962,7 +4957,7 @@
     break;
 
   case 242:
-#line 2407 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2402 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName((yyvsp[0].StrVal)));
     CHECK_FOR_ERROR
@@ -4970,7 +4965,7 @@
     break;
 
   case 243:
-#line 2412 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2407 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {              // Return with a result...
     (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
@@ -4978,7 +4973,7 @@
     break;
 
   case 244:
-#line 2416 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2411 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
     (yyval.TermInstVal) = new ReturnInst();
     CHECK_FOR_ERROR
@@ -4986,7 +4981,7 @@
     break;
 
   case 245:
-#line 2420 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2415 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
@@ -4995,7 +4990,7 @@
     break;
 
   case 246:
-#line 2425 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2420 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {  
     assert(cast<IntegerType>((yyvsp[-7].PrimType))->getBitWidth() == 1 && "Not Bool?");
     BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
@@ -5009,7 +5004,7 @@
     break;
 
   case 247:
-#line 2435 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2430 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-7].PrimType), (yyvsp[-6].ValIDVal));
     CHECK_FOR_ERROR
@@ -5032,7 +5027,7 @@
     break;
 
   case 248:
-#line 2454 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2449 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-6].PrimType), (yyvsp[-5].ValIDVal));
     CHECK_FOR_ERROR
@@ -5045,7 +5040,7 @@
     break;
 
   case 249:
-#line 2464 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2459 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -5115,7 +5110,7 @@
     break;
 
   case 250:
-#line 2530 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2525 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
@@ -5123,7 +5118,7 @@
     break;
 
   case 251:
-#line 2534 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2529 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
@@ -5131,7 +5126,7 @@
     break;
 
   case 252:
-#line 2541 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2536 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[-5].JumpTable);
     Constant *V = cast<Constant>(getExistingVal((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -5146,7 +5141,7 @@
     break;
 
   case 253:
-#line 2552 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2547 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getExistingVal((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -5162,7 +5157,7 @@
     break;
 
   case 254:
-#line 2565 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2560 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
     setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal));
@@ -5174,7 +5169,7 @@
     break;
 
   case 255:
-#line 2575 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2570 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-5].TypeVal))->getDescription());
@@ -5189,7 +5184,7 @@
     break;
 
   case 256:
-#line 2586 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2581 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.PHIList) = (yyvsp[-6].PHIList);
     Value* tmpVal = getVal((yyvsp[-6].PHIList)->front().first->getType(), (yyvsp[-3].ValIDVal));
@@ -5201,7 +5196,7 @@
     break;
 
   case 257:
-#line 2596 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2591 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5213,7 +5208,7 @@
     break;
 
   case 258:
-#line 2604 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2599 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5225,17 +5220,17 @@
     break;
 
   case 259:
-#line 2612 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2607 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueRefList) = new ValueRefList(); ;}
     break;
 
   case 260:
-#line 2615 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2610 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
   case 261:
-#line 2616 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2611 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[-2].ValueList);
     (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
@@ -5244,7 +5239,7 @@
     break;
 
   case 262:
-#line 2623 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2618 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5252,7 +5247,7 @@
     break;
 
   case 263:
-#line 2627 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2622 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5260,7 +5255,7 @@
     break;
 
   case 264:
-#line 2632 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2627 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5285,7 +5280,7 @@
     break;
 
   case 265:
-#line 2653 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2648 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5306,7 +5301,7 @@
     break;
 
   case 266:
-#line 2670 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2665 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5323,7 +5318,7 @@
     break;
 
   case 267:
-#line 2683 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2678 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5340,7 +5335,7 @@
     break;
 
   case 268:
-#line 2696 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2691 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -5356,7 +5351,7 @@
     break;
 
   case 269:
-#line 2708 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2703 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-4].ValueVal)->getType() != Type::Int1Ty)
       GEN_ERROR("select condition must be boolean");
@@ -5368,7 +5363,7 @@
     break;
 
   case 270:
-#line 2716 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2711 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -5379,7 +5374,7 @@
     break;
 
   case 271:
-#line 2723 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2718 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -5389,7 +5384,7 @@
     break;
 
   case 272:
-#line 2729 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2724 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -5399,7 +5394,7 @@
     break;
 
   case 273:
-#line 2735 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2730 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -5409,7 +5404,7 @@
     break;
 
   case 274:
-#line 2741 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2736 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[0].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -5428,7 +5423,7 @@
     break;
 
   case 275:
-#line 2757 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2752 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -5495,7 +5490,7 @@
     break;
 
   case 276:
-#line 2820 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2815 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[0].InstVal);
     CHECK_FOR_ERROR
@@ -5503,7 +5498,7 @@
     break;
 
   case 277:
-#line 2825 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2820 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5511,7 +5506,7 @@
     break;
 
   case 278:
-#line 2829 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2824 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5519,7 +5514,7 @@
     break;
 
   case 279:
-#line 2836 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2831 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5530,7 +5525,7 @@
     break;
 
   case 280:
-#line 2843 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2838 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
@@ -5542,7 +5537,7 @@
     break;
 
   case 281:
-#line 2851 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2846 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5553,7 +5548,7 @@
     break;
 
   case 282:
-#line 2858 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2853 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
@@ -5565,7 +5560,7 @@
     break;
 
   case 283:
-#line 2866 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2861 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[0].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -5576,7 +5571,7 @@
     break;
 
   case 284:
-#line 2874 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2869 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5594,7 +5589,7 @@
     break;
 
   case 285:
-#line 2888 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2883 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5615,7 +5610,7 @@
     break;
 
   case 286:
-#line 2905 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2900 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5638,7 +5633,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 5642 "llvmAsmParser.tab.c"
+#line 5637 "llvmAsmParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -5906,7 +5901,7 @@
 }
 
 
-#line 2922 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2917 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.74 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.75
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.74	Mon Mar 19 13:40:50 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Mon Mar 19 15:40:51 2007
@@ -392,7 +392,7 @@
                      Ty->getDescription() + "'");
       return 0;
     }
-    return ConstantInt::get(Ty, D.ConstPool64);
+    return ConstantInt::get(Ty, D.ConstPool64, true);
 
   case ValID::ConstUIntVal:     // Is it an unsigned const pool reference?
     if (!ConstantInt::isValueValidForType(Ty, D.UConstPool64)) {
@@ -401,7 +401,7 @@
                        "' is invalid or out of range");
         return 0;
       } else {     // This is really a signed reference.  Transmogrify.
-        return ConstantInt::get(Ty, D.ConstPool64);
+        return ConstantInt::get(Ty, D.ConstPool64, true);
       }
     } else {
       return ConstantInt::get(Ty, D.UConstPool64);
@@ -1742,10 +1742,7 @@
   | IntType ESINT64VAL {      // integral constants
     if (!ConstantInt::isValueValidForType($1, $2))
       GEN_ERROR("Constant value doesn't fit in type");
-    APInt Val(64, $2);
-    uint32_t BitWidth = cast<IntegerType>($1)->getBitWidth();
-    Val.sextOrTrunc(BitWidth);
-    $$ = ConstantInt::get(Val);
+    $$ = ConstantInt::get($1, $2, true);
     CHECK_FOR_ERROR
   }
   | IntType ESAPINTVAL {      // arbitrary precision integer constants
@@ -1761,9 +1758,7 @@
   | IntType EUINT64VAL {      // integral constants
     if (!ConstantInt::isValueValidForType($1, $2))
       GEN_ERROR("Constant value doesn't fit in type");
-    uint32_t BitWidth = cast<IntegerType>($1)->getBitWidth();
-    APInt Val(BitWidth, $2);
-    $$ = ConstantInt::get(Val);
+    $$ = ConstantInt::get($1, $2, false);
     CHECK_FOR_ERROR
   }
   | IntType EUAPINTVAL {      // arbitrary precision integer constants





From reid at x10sys.com  Mon Mar 19 15:48:08 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 15:48:08 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703192048.l2JKm8E5019684@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.662 -> 1.663
---
Log message:

Remove a redundant clause in an if statement. 
Patch by Sheng Zhou.


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

 InstructionCombining.cpp |    1 -
 1 files changed, 1 deletion(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.662 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.663
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.662	Sun Mar 18 17:51:34 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Mar 19 15:47:50 2007
@@ -8158,7 +8158,6 @@
   // Check to see if we are changing the return type...
   if (OldRetTy != FT->getReturnType()) {
     if (Callee->isDeclaration() && !Caller->use_empty() && 
-        OldRetTy != FT->getReturnType() &&
         // Conversion is ok if changing from pointer to int of same size.
         !(isa<PointerType>(FT->getReturnType()) &&
           TD->getIntPtrType() == OldRetTy))





From dpatel at apple.com  Mon Mar 19 15:55:02 2007
From: dpatel at apple.com (dpatel at apple.com)
Date: Mon, 19 Mar 2007 13:55:02 -0700 (PDT)
Subject: [llvm-commits] [125160] Better support for variable size struct
	fields.
Message-ID: <20070319205502.57CDCA51EA27@src>

Revision: 125160
Author:   dpatel
Date:     2007-03-19 13:55:02 -0700 (Mon, 19 Mar 2007)

Log Message:
-----------
Better support for variable size struct fields.
Patch by Duncan Sands.

Modified Paths:
--------------
    apple-local/branches/llvm/gcc/llvm-convert.cpp
    apple-local/branches/llvm/gcc/llvm-types.cpp

Modified: apple-local/branches/llvm/gcc/llvm-convert.cpp
===================================================================
--- apple-local/branches/llvm/gcc/llvm-convert.cpp	2007-03-19 19:06:59 UTC (rev 125159)
+++ apple-local/branches/llvm/gcc/llvm-convert.cpp	2007-03-19 20:55:02 UTC (rev 125160)
@@ -4660,12 +4660,6 @@
     assert(DECL_LLVM_SET_P(FieldDecl) && "Struct not laid out for LLVM?");
     ConstantInt *CI = cast<ConstantInt>(DECL_LLVM(FieldDecl));
     uint32_t MemberIndex = CI->getZExtValue();
-    if (MemberIndex == ~0U) {
-      assert(isStructWithVarSizeArrayAtEnd(StructTy) &&
-             "Isn't var sized array access!");
-      CI = ConstantInt::get(Type::Int32Ty, StructTy->getNumContainedTypes()-1);
-      MemberIndex = CI->getZExtValue();
-    }
     assert(MemberIndex < StructTy->getNumContainedTypes() &&
            "Field Idx out of range!");
     FieldPtr = new GetElementPtrInst(StructAddrLV.Ptr,
@@ -5476,35 +5470,32 @@
       // If not, things are much simpler.
       assert(DECL_LLVM_SET_P(Field) && "Struct not laid out for LLVM?");
       unsigned FieldNo = cast<ConstantInt>(DECL_LLVM(Field))->getZExtValue();
-      
+      assert(FieldNo < ResultElts.size() && "Invalid struct field number!");
+
+      // Example: struct X { int A; char C[]; } x = { 4, "foo" };
+      assert(TYPE_SIZE(TREE_TYPE(Field)) ||
+             (FieldNo == ResultElts.size()-1 &&
+              isStructWithVarSizeArrayAtEnd(STy))
+             && "field with no size is not array at end of struct!");
+
       // If this is an initialization of a global that ends with a variable
       // sized array at its end, and the initializer has a non-zero number of
-      // elements, we must handle this case now.  In this case, FieldNo is ~0U
-      // and Val contains the actual type for the array.  
-      if (FieldNo == ~0U) {
-        // Handle: struct X { int A; char C[]; } x = { 4, "foo" };
-        assert(isStructWithVarSizeArrayAtEnd(STy) &&
-               "Struct doesn't end with variable sized array!");
-        FieldNo = STy->getNumElements()-1;
-        ResultElts[FieldNo] = Val;
-      } else {
-        assert(FieldNo < ResultElts.size() && "Invalid struct field number!");
-
-        // Otherwise, we know that the initializer has to match the element type
-        // of the LLVM structure field.  If not, then there is something that is
-        // not straight-forward going on.  For example, we could be initializing
-        // an unaligned integer field (e.g. due to attribute packed) with an 
-        // integer.  The struct field will have type [4 x ubyte] instead of
-        // "int" for example.  If we ignored this, we would lay out the
-        // initializer wrong.
-        if (Val->getType() != STy->getElementType(FieldNo))
-          Val = ConvertStructFieldInitializerToType(Val, 
+      // elements, then Val contains the actual type for the array.  Otherwise,
+      // we know that the initializer has to match the element type of the LLVM
+      // structure field.  If not, then there is something that is not
+      // straight-forward going on.  For example, we could be initializing an
+      // unaligned integer field (e.g. due to attribute packed) with an
+      // integer.  The struct field will have type [4 x ubyte] instead of
+      // "int" for example.  If we ignored this, we would lay out the
+      // initializer wrong.
+      if (TYPE_SIZE(TREE_TYPE(Field)) &&
+          Val->getType() != STy->getElementType(FieldNo))
+        Val = ConvertStructFieldInitializerToType(Val,
                                                   STy->getElementType(FieldNo));
 
-        ResultElts[FieldNo] = Val;
-      }
+      ResultElts[FieldNo] = Val;
     }
-    
+
     NextField = TREE_CHAIN(Field);
   }
   
@@ -5716,31 +5707,18 @@
     ConstantInt *CI = cast<ConstantInt>(DECL_LLVM(FieldDecl));
     uint64_t MemberIndex = CI->getZExtValue();
     
-    if (MemberIndex  != ~0U) {
-      std::vector<Value*> Idxs;
-      Idxs.push_back(Constant::getNullValue(Type::Int32Ty));
-      Idxs.push_back(CI);
-      FieldPtr = ConstantExpr::getGetElementPtr(StructAddrLV, &Idxs[0], 
-                                                Idxs.size());
-      
-      // Now that we did an offset from the start of the struct, subtract off
-      // the offset from BitStart.
-      if (MemberIndex) {
-        const StructLayout *SL = TD.getStructLayout(cast<StructType>(StructTy));
-        BitStart -= SL->getElementOffset(MemberIndex) * 8;
-      }
-    } else {
-      // We were unable to make a nice offset, emit an ugly one.
-      Constant *Offset = Convert(field_offset);
-      FieldPtr = ConstantExpr::getPtrToInt(StructAddrLV, Offset->getType());
-      FieldPtr = ConstantExpr::getAdd(FieldPtr, Offset);
-      FieldPtr = ConstantExpr::getIntToPtr(FieldPtr, PointerType::get(FieldTy));
-      
-      // Do horrible pointer arithmetic to get the address of the field.
-      unsigned ByteOffset = TREE_INT_CST_LOW(field_offset);
-      BitStart -= ByteOffset * 8;
-    }
+    std::vector<Value*> Idxs;
+    Idxs.push_back(Constant::getNullValue(Type::Int32Ty));
+    Idxs.push_back(CI);
+    FieldPtr = ConstantExpr::getGetElementPtr(StructAddrLV, &Idxs[0],
+                                              Idxs.size());
     
+    // Now that we did an offset from the start of the struct, subtract off
+    // the offset from BitStart.
+    if (MemberIndex) {
+      const StructLayout *SL = TD.getStructLayout(cast<StructType>(StructTy));
+      BitStart -= SL->getElementOffset(MemberIndex) * 8;
+    }
   } else {
     Constant *Offset = Convert(field_offset);
     Constant *Ptr = ConstantExpr::getPtrToInt(StructAddrLV, Offset->getType());

Modified: apple-local/branches/llvm/gcc/llvm-types.cpp
===================================================================
--- apple-local/branches/llvm/gcc/llvm-types.cpp	2007-03-19 19:06:59 UTC (rev 125159)
+++ apple-local/branches/llvm/gcc/llvm-types.cpp	2007-03-19 20:55:02 UTC (rev 125160)
@@ -962,8 +962,11 @@
       while (CurFieldNo < ElementOffsetInBytes.size() &&
              getFieldEndOffsetInBytes(CurFieldNo)*8 <= FieldOffsetInBits)
         ++CurFieldNo;
-      if (CurFieldNo >= ElementOffsetInBytes.size()) return ~0U;
-      return CurFieldNo;
+      if (CurFieldNo < ElementOffsetInBytes.size())
+        return CurFieldNo;
+      // Otherwise, we couldn't find the field!
+      assert(0 && "Could not find field!");
+      return ~0U;
     }
 
     // Handle zero sized fields now.  If the next field is zero sized, return
@@ -1009,28 +1012,15 @@
   return Result;
 }
 
-/// isNotLastField - Return true if this is not the last field in its record.
-///
-static bool isNotLastField(tree Field) {
-  for (Field = TREE_CHAIN(Field); Field; Field = TREE_CHAIN(Field))
-    if (TREE_CODE(Field) == FIELD_DECL)
-      return true;
-  return false;
-}
-
-
 /// DecodeStructFields - This method decodes the specified field, if it is a
 /// FIELD_DECL, adding or updating the specified StructTypeConversionInfo to
 /// reflect it.  
 void TypeConverter::DecodeStructFields(tree Field,
                                        StructTypeConversionInfo &Info) {
   if (TREE_CODE(Field) != FIELD_DECL ||
-      // Don't include variable sized fields, doing so would break anything
-      // after them... unless this is the last field.
-      ((TYPE_SIZE(TREE_TYPE(Field)) == 0 ||
-        TREE_CODE(TYPE_SIZE(TREE_TYPE(Field))) != INTEGER_CST) &&
-       isNotLastField(Field))) return;
-  
+      TREE_CODE(DECL_FIELD_OFFSET(Field)) != INTEGER_CST)
+    return;
+
   // Handle bit-fields specially.
   if (DECL_BIT_FIELD_TYPE(Field)) {
     DecodeStructBitField(Field, Info);
@@ -1218,12 +1208,8 @@
   // variable offset.
   unsigned CurFieldNo = 0;
   for (tree Field = TYPE_FIELDS(type); Field; Field = TREE_CHAIN(Field))
-    if (TREE_CODE(Field) == FIELD_DECL) {
-      // If this field comes after a variable sized element, stop trying to
-      // assign DECL_LLVM's.
-      if (TREE_CODE(DECL_FIELD_OFFSET(Field)) != INTEGER_CST)
-        break;
-      
+    if (TREE_CODE(Field) == FIELD_DECL &&
+        TREE_CODE(DECL_FIELD_OFFSET(Field)) == INTEGER_CST) {
       unsigned FieldOffsetInBits = getFieldOffsetInBits(Field);
       tree FieldType = TREE_TYPE(Field);
       
@@ -1241,10 +1227,9 @@
       
       // Figure out if this field is zero bits wide, e.g. {} or [0 x int].  Do
       // not include variable sized fields here.
-      bool isZeroSizeField = 
-        TYPE_SIZE(FieldType) && TREE_CODE(TYPE_SIZE(FieldType)) == INTEGER_CST&&
-        TREE_INT_CST_LOW(TYPE_SIZE(FieldType)) == 0;
-        
+      bool isZeroSizeField = !TYPE_SIZE(FieldType) ||
+        integer_zerop(TYPE_SIZE(FieldType));
+
       unsigned FieldNo = 
         Info.getLLVMFieldFor(FieldOffsetInBits, CurFieldNo, isZeroSizeField);
       SET_DECL_LLVM(Field, ConstantInt::get(Type::Int32Ty, FieldNo));




From dpatel at apple.com  Mon Mar 19 15:55:48 2007
From: dpatel at apple.com (Devang Patel)
Date: Mon, 19 Mar 2007 13:55:48 -0700
Subject: [llvm-commits] llvm-gcc: better support for variable size
	struct	fields
In-Reply-To: <200703061725.32640.baldrick@free.fr>
References: <200703061725.32640.baldrick@free.fr>
Message-ID: <7183A53F-A790-43EB-8ACB-C9EC8A075632@apple.com>


On Mar 6, 2007, at 8:25 AM, Duncan Sands wrote:

> This patch applies on top of the previously posted patch
> "llvm-gcc: use component_ref_field_offset in component references",
> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20070226/045399.html 
> .
>
> This fixes wrong handling of structs containing more than one
> variable sized field.  Two C testcases are attached.  Consider
> for example the struct from VarSizeInStruct1:
>   struct f { char w; char x[n]; char z[]; };
> DecodeStructFields does the following: it creates a field for
> w; it skips x; it doesn't skip z because it is the last field,
> however it thinks it starts at byte offset 0 because it starts
> at the variable offset n+1, and so pops w out of the struct
> and replaces it with z, leading to the LLVM struct { [0 * i8] }.
> This causes an assertion failure later on in EmitLV_COMPONENT_REF.
> The other testcase is similar, and leads to a different assertion
> failure.
>
> I first prepared a minimal fix, but later noticed that the code for
> handling variable sized struct fields was unnecessarily complicated
> and came up with this more involved patch, which removes a bunch of
> special casing.  The existing code seems rather fixated on whether
> TYPE_SIZE is constant or not, when what really matters is whether the
> field starts at a constant offset.  I simply skip over fields if and
> only if they don't start at a constant offset, and let variable sized
> fields be emitted and indexed like any others (no more ~0U field  
> indices).
> I remove the special casing for ~0U field indices everywhere in favour
> of the generic code, for example in EmitLV_COMPONENT_REF.  The only
> place where something still needs to be done is in  
> ConvertRecordCONSTRUCTOR,
> but there too the code simplifies.
>
> I see no additional failures in the regression test suite or in
> MultiSource with these changes.

Applied.
-
Devang


From reid at x10sys.com  Mon Mar 19 15:58:35 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 15:58:35 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703192058.l2JKwZQi019961@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.663 -> 1.664
---
Log message:

1. Use APInt::getSignBit to reduce clutter (patch by Sheng Zhou)
2. Replace uses of the "isPositive" utility function with APInt::isPositive


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

 InstructionCombining.cpp |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.663 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.664
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.663	Mon Mar 19 15:47:50 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Mar 19 15:58:18 2007
@@ -2760,7 +2760,7 @@
 // highest order bit set.
 static bool isSignBit(ConstantInt *CI) {
   unsigned NumBits = CI->getType()->getPrimitiveSizeInBits();
-  return (CI->getZExtValue() & (~0ULL >> (64-NumBits))) == (1ULL << (NumBits-1));
+  return CI->getValue() == APInt::getSignBit(NumBits);
 }
 
 Instruction *InstCombiner::visitSub(BinaryOperator &I) {
@@ -4925,10 +4925,6 @@
   return Changed ? &I : 0;
 }
 
-static bool isPositive(ConstantInt *C) {
-  return C->getSExtValue() >= 0;
-}
-
 /// AddWithOverflow - Compute Result = In1+In2, returning true if the result
 /// overflowed for this type.
 static bool AddWithOverflow(ConstantInt *&Result, ConstantInt *In1,
@@ -5707,12 +5703,12 @@
             LoBound = Prod;
             LoOverflow = ProdOV;
             HiOverflow = ProdOV || AddWithOverflow(HiBound, LoBound, DivRHS);
-          } else if (isPositive(DivRHS)) { // Divisor is > 0.
+          } else if (DivRHS->getValue().isPositive()) { // Divisor is > 0.
             if (CI->isNullValue()) {       // (X / pos) op 0
               // Can't overflow.
               LoBound = cast<ConstantInt>(ConstantExpr::getNeg(SubOne(DivRHS)));
               HiBound = DivRHS;
-            } else if (isPositive(CI)) {   // (X / pos) op pos
+            } else if (CI->getValue().isPositive()) {   // (X / pos) op pos
               LoBound = Prod;
               LoOverflow = ProdOV;
               HiOverflow = ProdOV || AddWithOverflow(HiBound, Prod, DivRHS);
@@ -5729,7 +5725,7 @@
               HiBound = cast<ConstantInt>(ConstantExpr::getNeg(DivRHS));
               if (HiBound == DivRHS)
                 LoBound = 0;               // - INTMIN = INTMIN
-            } else if (isPositive(CI)) {   // (X / neg) op pos
+            } else if (CI->getValue().isPositive()) {   // (X / neg) op pos
               HiOverflow = LoOverflow = ProdOV;
               if (!LoOverflow)
                 LoOverflow = AddWithOverflow(LoBound, Prod, AddOne(DivRHS));





From reid at x10sys.com  Mon Mar 19 16:05:00 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 16:05:00 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703192105.l2JL50kY020167@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.664 -> 1.665
---
Log message:

Implement isOneBitSet in terms of APInt::countPopulation.


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

 InstructionCombining.cpp |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.664 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.665
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.664	Mon Mar 19 15:58:18 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Mar 19 16:04:43 2007
@@ -3474,8 +3474,7 @@
 // isOneBitSet - Return true if there is exactly one bit set in the specified
 // constant.
 static bool isOneBitSet(const ConstantInt *CI) {
-  uint64_t V = CI->getZExtValue();
-  return V && (V & (V-1)) == 0;
+  return CI->getValue().countPopulation() == 1;
 }
 
 #if 0   // Currently unused





From reid at x10sys.com  Mon Mar 19 16:08:24 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 16:08:24 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703192108.l2JL8OM1020273@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.665 -> 1.666
---
Log message:

Implement isMinValuePlusOne using facilities of APInt instead of uint64_t
Patch by Zhou Sheng.


---
Diffs of the changes:  (+4 -5)

 InstructionCombining.cpp |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.665 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.666
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.665	Mon Mar 19 16:04:43 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Mar 19 16:08:07 2007
@@ -3463,12 +3463,11 @@
 static bool isMinValuePlusOne(const ConstantInt *C, bool isSigned) {
   if (isSigned) {
     // Calculate 1111111111000000000000
-    unsigned TypeBits = C->getType()->getPrimitiveSizeInBits();
-    int64_t Val = -1;                    // All ones
-    Val <<= TypeBits-1;                  // Shift over to the right spot
-    return C->getSExtValue() == Val+1;
+    uint32_t TypeBits = C->getType()->getPrimitiveSizeInBits();
+    APInt Val(APInt::getSignedMinValue(TypeBits));
+    return C->getValue() == Val+1;
   }
-  return C->getZExtValue() == 1; // unsigned
+  return C->getValue() == 1; // unsigned
 }
 
 // isOneBitSet - Return true if there is exactly one bit set in the specified





From reid at x10sys.com  Mon Mar 19 16:10:46 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 16:10:46 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703192110.l2JLAkpU020368@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.666 -> 1.667
---
Log message:

Implement isMaxValueMinusOne in terms of APInt instead of uint64_t.
Patch by Sheng Zhou.


---
Diffs of the changes:  (+4 -5)

 InstructionCombining.cpp |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.666 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.667
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.666	Mon Mar 19 16:08:07 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Mar 19 16:10:28 2007
@@ -3449,14 +3449,13 @@
 
 // isMaxValueMinusOne - return true if this is Max-1
 static bool isMaxValueMinusOne(const ConstantInt *C, bool isSigned) {
+  uint32_t TypeBits = C->getType()->getPrimitiveSizeInBits();
   if (isSigned) {
     // Calculate 0111111111..11111
-    unsigned TypeBits = C->getType()->getPrimitiveSizeInBits();
-    int64_t Val = INT64_MAX;             // All ones
-    Val >>= 64-TypeBits;                 // Shift out unwanted 1 bits...
-    return C->getSExtValue() == Val-1;
+    APInt Val(APInt::getSignedMaxValue(TypeBits));
+    return C->getValue() == Val-1;
   }
-  return C->getZExtValue() == C->getType()->getBitMask()-1;
+  return C->getValue() == APInt::getAllOnesValue(TypeBits) - 1;
 }
 
 // isMinValuePlusOne - return true if this is Min+1





From clattner at apple.com  Mon Mar 19 16:16:08 2007
From: clattner at apple.com (Chris Lattner)
Date: Mon, 19 Mar 2007 14:16:08 -0700
Subject: [llvm-commits]
	CVS:	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
In-Reply-To: <200703192058.l2JKwZQi019961@zion.cs.uiuc.edu>
References: <200703192058.l2JKwZQi019961@zion.cs.uiuc.edu>
Message-ID: <46CD3215-DA30-4EF3-B20C-8B77FDC1CF79@apple.com>

> 1. Use APInt::getSignBit to reduce clutter (patch by Sheng Zhou)
> 2. Replace uses of the "isPositive" utility function with  
> APInt::isPositive

Oooh, beautiful.  Nice work guys,

-Chris

>
> ---
> Diffs of the changes:  (+4 -8)
>
>  InstructionCombining.cpp |   12 ++++--------
>  1 files changed, 4 insertions(+), 8 deletions(-)
>
>
> Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
> diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.663  
> llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.664
> --- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.663	Mon  
> Mar 19 15:47:50 2007
> +++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Mar 19  
> 15:58:18 2007
> @@ -2760,7 +2760,7 @@
>  // highest order bit set.
>  static bool isSignBit(ConstantInt *CI) {
>    unsigned NumBits = CI->getType()->getPrimitiveSizeInBits();
> -  return (CI->getZExtValue() & (~0ULL >> (64-NumBits))) == (1ULL  
> << (NumBits-1));
> +  return CI->getValue() == APInt::getSignBit(NumBits);
>  }
>
>  Instruction *InstCombiner::visitSub(BinaryOperator &I) {
> @@ -4925,10 +4925,6 @@
>    return Changed ? &I : 0;
>  }
>
> -static bool isPositive(ConstantInt *C) {
> -  return C->getSExtValue() >= 0;
> -}
> -
>  /// AddWithOverflow - Compute Result = In1+In2, returning true if  
> the result
>  /// overflowed for this type.
>  static bool AddWithOverflow(ConstantInt *&Result, ConstantInt *In1,
> @@ -5707,12 +5703,12 @@
>              LoBound = Prod;
>              LoOverflow = ProdOV;
>              HiOverflow = ProdOV || AddWithOverflow(HiBound,  
> LoBound, DivRHS);
> -          } else if (isPositive(DivRHS)) { // Divisor is > 0.
> +          } else if (DivRHS->getValue().isPositive()) { // Divisor  
> is > 0.
>              if (CI->isNullValue()) {       // (X / pos) op 0
>                // Can't overflow.
>                LoBound = cast<ConstantInt>(ConstantExpr::getNeg 
> (SubOne(DivRHS)));
>                HiBound = DivRHS;
> -            } else if (isPositive(CI)) {   // (X / pos) op pos
> +            } else if (CI->getValue().isPositive()) {   // (X /  
> pos) op pos
>                LoBound = Prod;
>                LoOverflow = ProdOV;
>                HiOverflow = ProdOV || AddWithOverflow(HiBound,  
> Prod, DivRHS);
> @@ -5729,7 +5725,7 @@
>                HiBound = cast<ConstantInt>(ConstantExpr::getNeg 
> (DivRHS));
>                if (HiBound == DivRHS)
>                  LoBound = 0;               // - INTMIN = INTMIN
> -            } else if (isPositive(CI)) {   // (X / neg) op pos
> +            } else if (CI->getValue().isPositive()) {   // (X /  
> neg) op pos
>                HiOverflow = LoOverflow = ProdOV;
>                if (!LoOverflow)
>                  LoOverflow = AddWithOverflow(LoBound, Prod, AddOne 
> (DivRHS));
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From clattner at apple.com  Mon Mar 19 16:16:47 2007
From: clattner at apple.com (Chris Lattner)
Date: Mon, 19 Mar 2007 14:16:47 -0700
Subject: [llvm-commits]
	CVS:	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
In-Reply-To: <200703192105.l2JL50kY020167@zion.cs.uiuc.edu>
References: <200703192105.l2JL50kY020167@zion.cs.uiuc.edu>
Message-ID: <DD39E813-F590-480C-BB12-15192D0CCA35@apple.com>

> Implement isOneBitSet in terms of APInt::countPopulation.

> @@ -3474,8 +3474,7 @@
>  // isOneBitSet - Return true if there is exactly one bit set in  
> the specified
>  // constant.
>  static bool isOneBitSet(const ConstantInt *CI) {
> -  uint64_t V = CI->getZExtValue();
> -  return V && (V & (V-1)) == 0;
> +  return CI->getValue().countPopulation() == 1;
>  }

Are you sure this is a good idea?  countPopulation is *much* slower  
than a couple of and's and a subtract.

-Chris


From reid at x10sys.com  Mon Mar 19 16:19:19 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 16:19:19 -0500
Subject: [llvm-commits] CVS: llvm/lib/Support/APInt.cpp
Message-ID: <200703192119.l2JLJJGW020723@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Support:

APInt.cpp updated: 1.72 -> 1.73
---
Log message:

Fix coding standards violation.


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

 APInt.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Support/APInt.cpp
diff -u llvm/lib/Support/APInt.cpp:1.72 llvm/lib/Support/APInt.cpp:1.73
--- llvm/lib/Support/APInt.cpp:1.72	Mon Mar 19 15:37:47 2007
+++ llvm/lib/Support/APInt.cpp	Mon Mar 19 16:19:02 2007
@@ -43,7 +43,7 @@
   return result;
 }
 
-APInt::APInt(uint32_t numBits, uint64_t val, bool isSigned ) 
+APInt::APInt(uint32_t numBits, uint64_t val, bool isSigned) 
   : BitWidth(numBits), VAL(0) {
   assert(BitWidth >= IntegerType::MIN_INT_BITS && "bitwidth too small");
   assert(BitWidth <= IntegerType::MAX_INT_BITS && "bitwidth too large");





From rspencer at reidspencer.com  Mon Mar 19 16:21:27 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Mon, 19 Mar 2007 14:21:27 -0700
Subject: [llvm-commits]
	CVS:	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
In-Reply-To: <DD39E813-F590-480C-BB12-15192D0CCA35@apple.com>
References: <200703192105.l2JL50kY020167@zion.cs.uiuc.edu>
	<DD39E813-F590-480C-BB12-15192D0CCA35@apple.com>
Message-ID: <1174339287.13912.245.camel@bashful.x10sys.com>

On Mon, 2007-03-19 at 14:16 -0700, Chris Lattner wrote:
> > Implement isOneBitSet in terms of APInt::countPopulation.
> 
> > @@ -3474,8 +3474,7 @@
> >  // isOneBitSet - Return true if there is exactly one bit set in  
> > the specified
> >  // constant.
> >  static bool isOneBitSet(const ConstantInt *CI) {
> > -  uint64_t V = CI->getZExtValue();
> > -  return V && (V & (V-1)) == 0;
> > +  return CI->getValue().countPopulation() == 1;
> >  }
> 
> Are you sure this is a good idea?  countPopulation is *much* slower  
> than a couple of and's and a subtract.

Its the temporary construction of APInts that makes the performance of
the existing algorithm poor. This will construct 3 temporaries, each
potentially with a malloc. Using countPopulation is constant time (I
agree, not super fast, but consistent) and much easier to read in the
code.  

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



From reid at x10sys.com  Mon Mar 19 16:30:07 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 16:30:07 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703192130.l2JLU7js021026@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.667 -> 1.668
---
Log message:

APIntify the isHighOnes utility function.


---
Diffs of the changes:  (+6 -5)

 InstructionCombining.cpp |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.667 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.668
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.667	Mon Mar 19 16:10:28 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Mar 19 16:29:50 2007
@@ -3491,14 +3491,15 @@
 // isHighOnes - Return true if the constant is of the form 1+0+.
 // This is the same as lowones(~X).
 static bool isHighOnes(const ConstantInt *CI) {
-  uint64_t V = ~CI->getZExtValue();
-  if (~V == 0) return false;  // 0's does not match "1+"
+  if (CI->getValue() == 0) return false;  // 0's does not match "1+"
+
+  APInt V(~CI->getValue());
 
   // There won't be bits set in parts that the type doesn't contain.
-  V &= ConstantInt::getAllOnesValue(CI->getType())->getZExtValue();
+  V &= APInt::getAllOnesValue(CI->getType()->getBitWidth());
 
-  uint64_t U = V+1;  // If it is low ones, this should be a power of two.
-  return U && V && (U & V) == 0;
+  APInt U(V+1);  // If it is low ones, this should be a power of two.
+  return (U!=0) && (V!=0) && (U & V) == 0;
 }
 
 /// getICmpCode - Encode a icmp predicate into a three bit mask.  These bits





From dpatel at apple.com  Mon Mar 19 17:21:42 2007
From: dpatel at apple.com (Devang Patel)
Date: Mon, 19 Mar 2007 17:21:42 -0500
Subject: [llvm-commits] CVS: llvm/docs/WritingAnLLVMPass.html
Message-ID: <200703192221.l2JMLgmp022300@zion.cs.uiuc.edu>



Changes in directory llvm/docs:

WritingAnLLVMPass.html updated: 1.53 -> 1.54
---
Log message:

Document LoopPass.


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

 WritingAnLLVMPass.html |   90 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 89 insertions(+), 1 deletion(-)


Index: llvm/docs/WritingAnLLVMPass.html
diff -u llvm/docs/WritingAnLLVMPass.html:1.53 llvm/docs/WritingAnLLVMPass.html:1.54
--- llvm/docs/WritingAnLLVMPass.html:1.53	Wed Mar 14 14:32:21 2007
+++ llvm/docs/WritingAnLLVMPass.html	Mon Mar 19 17:21:25 2007
@@ -43,6 +43,14 @@
         <li><a href="#doFinalization_mod">The <tt>doFinalization(Module
                                             &amp;)</tt> method</a></li>
         </ul></li>
+     <li><a href="#LoopPass">The <tt>LoopPass</tt> class</a>
+        <ul>
+        <li><a href="#doInitialization_loop">The <tt>doInitialization(Loop *,
+                                            LPPassManager &amp;)</tt> method</a></li>
+        <li><a href="#runOnLoop">The <tt>runOnLoop</tt> method</a></li>
+        <li><a href="#doFinalization_loop">The <tt>doFinalization()
+                                            </tt> method</a></li>
+        </ul></li>
      <li><a href="#BasicBlockPass">The <tt>BasicBlockPass</tt> class</a>
         <ul>
         <li><a href="#doInitialization_fn">The <tt>doInitialization(Function
@@ -126,6 +134,7 @@
 the <tt><a href="#ModulePass">ModulePass</a></tt>, <tt><a
 href="#CallGraphSCCPass">CallGraphSCCPass</a></tt>, <tt><a
 href="#FunctionPass">FunctionPass</a></tt>, or <tt><a
+href="#LoopPass">LoopPass</a></tt>, or <tt><a
 href="#BasicBlockPass">BasicBlockPass</a></tt> classes, which gives the system
 more information about what your pass does, and how it can be combined with
 other passes.  One of the main features of the LLVM Pass Framework is that it
@@ -689,6 +698,85 @@
 
 <!-- ======================================================================= -->
 <div class="doc_subsection">
+  <a name="LoopPass">The <tt>LoopPass</tt> class </a>
+</div>
+
+<div class="doc_text">
+
+<p> All <tt>LoopPass</tt> execute on each loop in the function independent of
+all of the other loops in the function. <tt>LoopPass</tt> processes loops in
+loop nest order such that outer most loop is processed last. </p>
+
+<p> <tt>LoopPass</tt> subclasses are allowed to update loop nest using
+<tt>LPPassManager</tt> interface. Implementing a loop pass is usually
+straightforward. <tt>Looppass</tt>'s may overload three virtual methods to
+do their work. All these methods should return true if they modified the 
+program, or false if they didn't. </p>
+</div>
+
+<!-- _______________________________________________________________________ -->
+<div class="doc_subsubsection">
+  <a name="doInitialization_loop">The <tt>doInitialization(Loop *,
+                                                 LPPassManager &amp;)</tt>
+  method</a>
+</div>
+
+<div class="doc_text">
+
+<div class="doc_code"><pre>
+  <b>virtual bool</b> doInitialization(Loop *, LPPassManager &amp;LPM);
+</pre></div>
+
+The <tt>doInitialization</tt> method is designed to do simple initialization 
+type of stuff that does not depend on the functions being processed.  The 
+<tt>doInitialization</tt> method call is not scheduled to overlap with any 
+other pass executions (thus it should be very fast). LPPassManager 
+interface should be used to access Function or Module level analysis
+information.</p>
+
+</div>
+
+
+<!-- _______________________________________________________________________ -->
+<div class="doc_subsubsection">
+  <a name="runOnLoop">The <tt>runOnLoop</tt> method</a>
+</div>
+
+<div class="doc_text">
+
+<div class="doc_code"><pre>
+  <b>virtual bool</b> runOnLoop(Loop *, LPPassManager &amp;LPM) = 0;
+</pre></div><p>
+
+<p>The <tt>runOnLoop</tt> method must be implemented by your subclass to do
+the transformation or analysis work of your pass.  As usual, a true value should
+be returned if the function is modified. <tt>LPPassManager</tt> interface
+should be used to update loop nest.</p>
+
+</div>
+
+<!-- _______________________________________________________________________ -->
+<div class="doc_subsubsection">
+  <a name="doFinalization_loop">The <tt>doFinalization()</tt> method</a>
+</div>
+
+<div class="doc_text">
+
+<div class="doc_code"><pre>
+  <b>virtual bool</b> doFinalization();
+</pre></div>
+
+<p>The <tt>doFinalization</tt> method is an infrequently used method that is
+called when the pass framework has finished calling <a
+href="#runOnLoop"><tt>runOnLoop</tt></a> for every loop in the
+program being compiled. </p>
+
+</div>
+
+
+
+<!-- ======================================================================= -->
+<div class="doc_subsection">
   <a name="BasicBlockPass">The <tt>BasicBlockPass</tt> class</a>
 </div>
 
@@ -1711,7 +1799,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.org">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2007/03/14 19:32:21 $
+  Last modified: $Date: 2007/03/19 22:21:25 $
 </address>
 
 </body>





From reid at x10sys.com  Mon Mar 19 18:28:38 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 18:28:38 -0500
Subject: [llvm-commits] CVS:
	llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll
Message-ID: <200703192328.l2JNScSD026083@zion.cs.uiuc.edu>



Changes in directory llvm/test/Transforms/InstCombine:

2007-03-19-BadTruncChangePR1261.ll added (r1.1)
---
Log message:

Add test case for PR1261: http://llvm.org/PR1261 , currently XFAILed.


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

 2007-03-19-BadTruncChangePR1261.ll |   14 ++++++++++++++
 1 files changed, 14 insertions(+)


Index: llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll:1.1
*** /dev/null	Mon Mar 19 18:28:26 2007
--- llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll	Mon Mar 19 18:28:16 2007
***************
*** 0 ****
--- 1,14 ----
+ ; For PR1261. Before bit accurate type support in InstCombine, this would
+ ; turn the sext into a zext.
+ ; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis &&
+ ; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | not grep zext
+ ; XFAIL: *
+ 
+ define i16 @test(i31 %zzz) {
+ entry:
+   %A = sext i31 %zzz to i32
+   %B = add i32 %A, 16384
+   %C = lshr i32 %B, 15
+   %D = trunc i32 %C to i16
+   ret i16 %D
+ }





From reid at x10sys.com  Mon Mar 19 18:36:36 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 18:36:36 -0500
Subject: [llvm-commits] CVS:
	llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll
Message-ID: <200703192336.l2JNaaVD026286@zion.cs.uiuc.edu>



Changes in directory llvm/test/Transforms/InstCombine:

2007-03-19-BadTruncChangePR1261.ll updated: 1.1 -> 1.2
---
Log message:

Make this test a little simpler/faster.


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

 2007-03-19-BadTruncChangePR1261.ll |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)


Index: llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll
diff -u llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll:1.1 llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll:1.2
--- llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll:1.1	Mon Mar 19 18:28:16 2007
+++ llvm/test/Transforms/InstCombine/2007-03-19-BadTruncChangePR1261.ll	Mon Mar 19 18:36:19 2007
@@ -1,7 +1,6 @@
 ; For PR1261. Before bit accurate type support in InstCombine, this would
 ; turn the sext into a zext.
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis &&
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | not grep zext
+; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | grep sext
 ; XFAIL: *
 
 define i16 @test(i31 %zzz) {





From dpatel at apple.com  Mon Mar 19 18:38:02 2007
From: dpatel at apple.com (dpatel at apple.com)
Date: Mon, 19 Mar 2007 16:38:02 -0700 (PDT)
Subject: [llvm-commits] [125161] Return the correct type for ARRAY_RANGE_REF.
Message-ID: <20070319233802.455ADA58F55A@src>

Revision: 125161
Author:   dpatel
Date:     2007-03-19 16:38:02 -0700 (Mon, 19 Mar 2007)

Log Message:
-----------
Return the correct type for ARRAY_RANGE_REF.
Patch by Duncan Sands.

Modified Paths:
--------------
    apple-local/branches/llvm/gcc/llvm-convert.cpp

Modified: apple-local/branches/llvm/gcc/llvm-convert.cpp
===================================================================
--- apple-local/branches/llvm/gcc/llvm-convert.cpp	2007-03-19 20:55:02 UTC (rev 125160)
+++ apple-local/branches/llvm/gcc/llvm-convert.cpp	2007-03-19 23:38:02 UTC (rev 125161)
@@ -4558,6 +4558,8 @@
 
   // If this is an index into an array, codegen as a GEP.
   if (TREE_CODE(TREE_TYPE(Array)) == ARRAY_TYPE) {
+    Value *Ptr;
+
     // Check for variable sized array reference.
     tree length = arrayLength(TREE_TYPE(Array));
     if (length && !host_integerp(length, 1)) {
@@ -4568,13 +4570,16 @@
         Scale = CastToUIntType(Scale, IntPtrTy);
 
       IndexVal = BinaryOperator::createMul(IndexVal, Scale, "tmp", CurBB);
-      Value *Ptr = new GetElementPtrInst(ArrayAddr, IndexVal, "tmp", CurBB);
-      return BitCastToType(Ptr, PointerType::get(ConvertType(TREE_TYPE(exp))));
+      Ptr = new GetElementPtrInst(ArrayAddr, IndexVal, "tmp", CurBB);
+    } else {
+      // Otherwise, this is not a variable-sized array, use a GEP to index.
+      Ptr = new GetElementPtrInst(ArrayAddr, ConstantInt::get(Type::Int32Ty, 0),
+                                  IndexVal, "tmp", CurBB);
     }
 
-    // Otherwise, this is not a variable-sized array, use a GEP to index.
-    return new GetElementPtrInst(ArrayAddr, ConstantInt::get(Type::Int32Ty, 0),
-                                 IndexVal, "tmp", CurBB);
+    // The result type is an ElementTy* in the case of an ARRAY_REF, an array
+    // of ElementTy in the case of ARRAY_RANGE_REF.  Return the correct type.
+    return BitCastToType(Ptr, PointerType::get(ConvertType(TREE_TYPE(exp))));
   }
 
   // Otherwise, this is an index off a pointer, codegen as a 2-idx GEP.




From dpatel at apple.com  Mon Mar 19 18:38:50 2007
From: dpatel at apple.com (Devang Patel)
Date: Mon, 19 Mar 2007 16:38:50 -0700
Subject: [llvm-commits] llvm-gcc: return the correct type for
	ARRAY_RANGE_REF
In-Reply-To: <200703142351.52555.baldrick@free.fr>
References: <200703142351.52555.baldrick@free.fr>
Message-ID: <85422C9A-5D3E-4749-A3F2-98DC8DF65196@apple.com>


On Mar 14, 2007, at 3:51 PM, Duncan Sands wrote:

> An ARRAY_RANGE_REF is for extracting a range of elements from
> an array, for example elements 1 to 2 of an [3 x i32], while
> ARRAY_REF is for extracting a single element, say element 2.
> EmitLV_ARRAY_REF, which handles both expression types, should
> return a [2 x i32]* in the first case and an i32* in the second
> case (currently it always returns a pointer to the element type).
> The testcase is, as ever, in Ada (Ada is the only front-end that
> generates ARRAY_RANGE_REF).

Applied.

-
Devang


From clattner at apple.com  Mon Mar 19 19:02:08 2007
From: clattner at apple.com (Chris Lattner)
Date: Mon, 19 Mar 2007 17:02:08 -0700
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
In-Reply-To: <1174339287.13912.245.camel@bashful.x10sys.com>
References: <200703192105.l2JL50kY020167@zion.cs.uiuc.edu>
	<DD39E813-F590-480C-BB12-15192D0CCA35@apple.com>
	<1174339287.13912.245.camel@bashful.x10sys.com>
Message-ID: <D946FAED-6612-4EB8-8204-9379E6DB080A@apple.com>

On Mar 19, 2007, at 2:21 PM, Reid Spencer wrote:
> On Mon, 2007-03-19 at 14:16 -0700, Chris Lattner wrote:
>>> Implement isOneBitSet in terms of APInt::countPopulation.
>>
>>> @@ -3474,8 +3474,7 @@
>>>  // isOneBitSet - Return true if there is exactly one bit set in
>>> the specified
>>>  // constant.
>>>  static bool isOneBitSet(const ConstantInt *CI) {
>>> -  uint64_t V = CI->getZExtValue();
>>> -  return V && (V & (V-1)) == 0;
>>> +  return CI->getValue().countPopulation() == 1;
>>>  }
>>
>> Are you sure this is a good idea?  countPopulation is *much* slower
>> than a couple of and's and a subtract.
>
> Its the temporary construction of APInts that makes the performance of
> the existing algorithm poor. This will construct 3 temporaries, each
> potentially with a malloc. Using countPopulation is constant time (I
> agree, not super fast, but consistent) and much easier to read in the
> code.

Optimizing for the "big" apint case isn't interesting, please  
optimize for the small case.

-Chris


From clattner at apple.com  Mon Mar 19 19:04:33 2007
From: clattner at apple.com (Chris Lattner)
Date: Mon, 19 Mar 2007 17:04:33 -0700
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
In-Reply-To: <D946FAED-6612-4EB8-8204-9379E6DB080A@apple.com>
References: <200703192105.l2JL50kY020167@zion.cs.uiuc.edu>
	<DD39E813-F590-480C-BB12-15192D0CCA35@apple.com>
	<1174339287.13912.245.camel@bashful.x10sys.com>
	<D946FAED-6612-4EB8-8204-9379E6DB080A@apple.com>
Message-ID: <06ADB760-405D-480B-8F8E-4344B8C6161C@apple.com>


On Mar 19, 2007, at 5:02 PM, Chris Lattner wrote:

> On Mar 19, 2007, at 2:21 PM, Reid Spencer wrote:
>> On Mon, 2007-03-19 at 14:16 -0700, Chris Lattner wrote:
>>>> Implement isOneBitSet in terms of APInt::countPopulation.
>>>
>>>> @@ -3474,8 +3474,7 @@
>>>>  // isOneBitSet - Return true if there is exactly one bit set in
>>>> the specified
>>>>  // constant.
>>>>  static bool isOneBitSet(const ConstantInt *CI) {
>>>> -  uint64_t V = CI->getZExtValue();
>>>> -  return V && (V & (V-1)) == 0;
>>>> +  return CI->getValue().countPopulation() == 1;
>>>>  }
>>>
>>> Are you sure this is a good idea?  countPopulation is *much* slower
>>> than a couple of and's and a subtract.
>>
>> Its the temporary construction of APInts that makes the  
>> performance of
>> the existing algorithm poor. This will construct 3 temporaries, each
>> potentially with a malloc. Using countPopulation is constant time (I
>> agree, not super fast, but consistent) and much easier to read in the
>> code.
>
> Optimizing for the "big" apint case isn't interesting, please
> optimize for the small case.

Better yet, just call APInt::isPowerOf2.

-Chris


From reid at x10sys.com  Mon Mar 19 19:17:14 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 19:17:14 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703200017.l2K0HEWq029518@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.668 -> 1.669
---
Log message:

Make isOneBitSet faster by using APInt::isPowerOf2. Thanks Chris.


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

 InstructionCombining.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.668 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.669
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.668	Mon Mar 19 16:29:50 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Mar 19 19:16:52 2007
@@ -3472,7 +3472,7 @@
 // isOneBitSet - Return true if there is exactly one bit set in the specified
 // constant.
 static bool isOneBitSet(const ConstantInt *CI) {
-  return CI->getValue().countPopulation() == 1;
+  return CI->getValue().isPowerOf2();
 }
 
 #if 0   // Currently unused





From sabre at nondot.org  Mon Mar 19 19:18:31 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 19 Mar 2007 19:18:31 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Value.cpp
Message-ID: <200703200018.l2K0IVad029585@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Value.cpp updated: 1.71 -> 1.72
---
Log message:

Fix a nasty memory leak, caused by my revamp of the value symbol table.



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

 Value.cpp |    5 +++++
 1 files changed, 5 insertions(+)


Index: llvm/lib/VMCore/Value.cpp
diff -u llvm/lib/VMCore/Value.cpp:1.71 llvm/lib/VMCore/Value.cpp:1.72
--- llvm/lib/VMCore/Value.cpp:1.71	Sun Mar  4 18:00:42 2007
+++ llvm/lib/VMCore/Value.cpp	Mon Mar 19 19:18:10 2007
@@ -56,6 +56,11 @@
 #endif
   assert(use_begin() == use_end() && "Uses remain when a value is destroyed!");
 
+  // If this value is named, destroy the name.  This should not be in a symtab
+  // at this point.
+  if (Name)
+    Name->Destroy();
+  
   // There should be no uses of this object anymore, remove it.
   LeakDetector::removeGarbageObject(this);
 }





From dalej at apple.com  Mon Mar 19 19:31:14 2007
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 19 Mar 2007 19:31:14 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMISelLowering.h
Message-ID: <200703200031.l2K0VESI032042@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMISelLowering.h updated: 1.4 -> 1.5
---
Log message:

fix obvious comment bug


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

 ARMISelLowering.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Target/ARM/ARMISelLowering.h
diff -u llvm/lib/Target/ARM/ARMISelLowering.h:1.4 llvm/lib/Target/ARM/ARMISelLowering.h:1.5
--- llvm/lib/Target/ARM/ARMISelLowering.h:1.4	Fri Mar 16 03:43:56 2007
+++ llvm/lib/Target/ARM/ARMISelLowering.h	Mon Mar 19 19:30:56 2007
@@ -67,7 +67,7 @@
   }
 
   //===----------------------------------------------------------------------===//
-  //  ARMTargetLowering - X86 Implementation of the TargetLowering interface
+  //  ARMTargetLowering - ARM Implementation of the TargetLowering interface
   
   class ARMTargetLowering : public TargetLowering {
     int VarArgsFrameIndex;            // FrameIndex for start of varargs area.





From dalej at apple.com  Mon Mar 19 19:48:10 2007
From: dalej at apple.com (Dale Johannesen)
Date: Mon, 19 Mar 2007 19:48:10 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
Message-ID: <200703200048.l2K0mALl002097@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

LoopStrengthReduce.cpp updated: 1.118 -> 1.119
---
Log message:

use types of loads and stores, not address, in CheckForIVReuse


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

 LoopStrengthReduce.cpp |   35 ++++++++++++++++++++++++++++-------
 1 files changed, 28 insertions(+), 7 deletions(-)


Index: llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
diff -u llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.118 llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.119
--- llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.118	Tue Mar 13 15:34:37 2007
+++ llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp	Mon Mar 19 19:47:50 2007
@@ -43,6 +43,9 @@
 STATISTIC(NumVariable, "Number of PHIs with variable strides");
 
 namespace {
+
+  class BasedUser;
+
   /// IVStrideUse - Keep track of one use of a strided induction variable, where
   /// the stride is stored externally.  The Offset member keeps track of the 
   /// offset from the IV, User is the actual user of the operand, and 'Operand'
@@ -174,7 +177,10 @@
 
     void OptimizeIndvars(Loop *L);
 
-    unsigned CheckForIVReuse(const SCEVHandle&, IVExpr&, const Type*);
+    unsigned CheckForIVReuse(const SCEVHandle&, IVExpr&, const Type*,
+                             const std::vector<BasedUser>& UsersToProcess);
+
+    bool ValidStride(int64_t, const std::vector<BasedUser>& UsersToProcess);
 
     void StrengthReduceStridedIVUsers(const SCEVHandle &Stride,
                                       IVUsersOfOneStride &Uses,
@@ -871,13 +877,25 @@
   return false;
 }
 
+/// ValidStride - Check whether the given Scale is valid for all loads and 
+/// stores in UsersToProcess.  Pulled into a function to avoid disturbing the
+/// sensibilities of those who dislike goto's.
+///
+bool LoopStrengthReduce::ValidStride(int64_t Scale, 
+                               const std::vector<BasedUser>& UsersToProcess) {
+  for (unsigned i=0, e = UsersToProcess.size(); i!=e; ++i)
+    if (!TLI->isLegalAddressScale(Scale, UsersToProcess[i].Inst->getType()))
+      return false;
+  return true;
+}
 
 /// CheckForIVReuse - Returns the multiple if the stride is the multiple
 /// of a previous stride and it is a legal value for the target addressing
 /// mode scale component. 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(const SCEVHandle &Stride,
-                                             IVExpr &IV, const Type *Ty) {
+unsigned LoopStrengthReduce::CheckForIVReuse(const SCEVHandle &Stride, 
+                                IVExpr &IV, const Type *Ty,
+                                const std::vector<BasedUser>& UsersToProcess) {
   if (!TLI) return 0;
 
   if (SCEVConstant *SC = dyn_cast<SCEVConstant>(Stride)) {
@@ -890,7 +908,11 @@
       if (unsigned(abs(SInt)) < SSInt || (SInt % SSInt) != 0)
         continue;
       int64_t Scale = SInt / SSInt;
-      if (TLI->isLegalAddressScale(Scale, Ty)) {
+      // Check that this stride is valid for all the types used for loads and
+      // stores; if it can be used for some and not others, we might as well use
+      // the original stride everywhere, since we have to create the IV for it
+      // anyway.
+      if (ValidStride(Scale, UsersToProcess))
         for (std::vector<IVExpr>::iterator II = SI->second.IVs.begin(),
                IE = SI->second.IVs.end(); II != IE; ++II)
           // FIXME: Only handle base == 0 for now.
@@ -899,10 +921,8 @@
             IV = *II;
             return Scale;
           }
-      }
     }
   }
-
   return 0;
 }
 
@@ -955,7 +975,8 @@
   Value   *IncV   = NULL;
   IVExpr   ReuseIV;
   unsigned RewriteFactor = CheckForIVReuse(Stride, ReuseIV,
-                                           CommonExprs->getType());
+                                           CommonExprs->getType(),
+                                           UsersToProcess);
   if (RewriteFactor != 0) {
     DOUT << "BASED ON IV of STRIDE " << *ReuseIV.Stride
          << " and BASE " << *ReuseIV.Base << " :\n";





From reid at x10sys.com  Mon Mar 19 20:13:20 2007
From: reid at x10sys.com (Reid Spencer)
Date: Mon, 19 Mar 2007 20:13:20 -0500
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.y
Message-ID: <200703200113.l2K1DKHQ002608@zion.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

llvmAsmParser.y updated: 1.329 -> 1.330
---
Log message:

Plug some PATypeHolder memory leaks.


---
Diffs of the changes:  (+25 -6)

 llvmAsmParser.y |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.329 llvm/lib/AsmParser/llvmAsmParser.y:1.330
--- llvm/lib/AsmParser/llvmAsmParser.y:1.329	Mon Mar 19 15:40:22 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y	Mon Mar 19 20:13:00 2007
@@ -513,9 +513,16 @@
     CurFun.CurrentFunction->getBasicBlockList().remove(BB);
     CurFun.CurrentFunction->getBasicBlockList().push_back(BB);
 
+    // We're about to erase the entry, save the key so we can clean it up.
+    ValID Tmp = BBI->first;
+
     // Erase the forward ref from the map as its no longer "forward"
     CurFun.BBForwardRefs.erase(ID);
 
+    // The key has been removed from the map but so we don't want to leave 
+    // strdup'd memory around so destroy it too.
+    Tmp.destroy();
+
     // If its a numbered definition, bump the number and set the BB value.
     if (ID.Type == ValID::LocalID) {
       assert(ID.Num == CurFun.NextValNum && "Invalid new block number");
@@ -1294,8 +1301,10 @@
     std::vector<FunctionType::ParameterAttributes> Attrs;
     Attrs.push_back($5);
     for (TypeWithAttrsList::iterator I=$3->begin(), E=$3->end(); I != E; ++I) {
-      Params.push_back(I->Ty->get());
-      if (I->Ty->get() != Type::VoidTy)
+      const Type *Ty = I->Ty->get();
+      delete I->Ty; I->Ty = 0;
+      Params.push_back(Ty);
+      if (Ty != Type::VoidTy)
         Attrs.push_back(I->Attrs);
     }
     bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
@@ -1312,8 +1321,10 @@
     std::vector<FunctionType::ParameterAttributes> Attrs;
     Attrs.push_back($5);
     for (TypeWithAttrsList::iterator I=$3->begin(), E=$3->end(); I != E; ++I) {
-      Params.push_back(I->Ty->get());
-      if (I->Ty->get() != Type::VoidTy)
+      const Type* Ty = I->Ty->get();
+      delete I->Ty; I->Ty = 0;
+      Params.push_back(Ty);
+      if (Ty != Type::VoidTy)
         Attrs.push_back(I->Attrs);
     }
     bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
@@ -1429,11 +1440,13 @@
 //
 TypeListI : Types {
     $$ = new std::list<PATypeHolder>();
-    $$->push_back(*$1); delete $1;
+    $$->push_back(*$1); 
+    delete $1;
     CHECK_FOR_ERROR
   }
   | TypeListI ',' Types {
-    ($$=$1)->push_back(*$3); delete $3;
+    ($$=$1)->push_back(*$3); 
+    delete $3;
     CHECK_FOR_ERROR
   };
 
@@ -2479,6 +2492,8 @@
       PFTy = PointerType::get(Ty);
     }
 
+    delete $3;
+
     Value *V = getVal(PFTy, $4);   // Get the function we're calling...
     CHECK_FOR_ERROR
     BasicBlock *Normal = getBBVal($11);
@@ -2595,6 +2610,7 @@
     $$ = new ValueRefList();
     ValueRefListEntry E; E.Attrs = $3; E.Val = getVal($1->get(), $2);
     $$->push_back(E);
+    delete $1;
   }
   | ValueRefList ',' Types ValueRef OptParamAttrs {
     if (!UpRefs.empty())
@@ -2602,6 +2618,7 @@
     $$ = $1;
     ValueRefListEntry E; E.Attrs = $5; E.Val = getVal($3->get(), $4);
     $$->push_back(E);
+    delete $3;
     CHECK_FOR_ERROR
   }
   | /*empty*/ { $$ = new ValueRefList(); };
@@ -2674,6 +2691,7 @@
     $$ = CmpInst::create($1, $2, tmpVal1, tmpVal2);
     if ($$ == 0)
       GEN_ERROR("icmp operator returned null");
+    delete $3;
   }
   | FCMP FPredicates Types ValueRef ',' ValueRef  {
     if (!UpRefs.empty())
@@ -2687,6 +2705,7 @@
     $$ = CmpInst::create($1, $2, tmpVal1, tmpVal2);
     if ($$ == 0)
       GEN_ERROR("fcmp operator returned null");
+    delete $3;
   }
   | CastOps ResolvedVal TO Types {
     if (!UpRefs.empty())





From sabre at nondot.org  Mon Mar 19 21:11:14 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 19 Mar 2007 21:11:14 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/ADT/BitVector.h
Message-ID: <200703200211.l2K2BE7M003777@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/ADT:

BitVector.h updated: 1.17 -> 1.18
---
Log message:

Add a dtor to fix leaks from all clients of BitVector.


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

 BitVector.h |    4 ++++
 1 files changed, 4 insertions(+)


Index: llvm/include/llvm/ADT/BitVector.h
diff -u llvm/include/llvm/ADT/BitVector.h:1.17 llvm/include/llvm/ADT/BitVector.h:1.18
--- llvm/include/llvm/ADT/BitVector.h:1.17	Thu Mar  1 20:31:37 2007
+++ llvm/include/llvm/ADT/BitVector.h	Mon Mar 19 21:10:56 2007
@@ -86,6 +86,10 @@
     Bits = new BitWord[Capacity];
     std::copy(RHS.Bits, &RHS.Bits[Capacity], Bits);
   }
+  
+  ~BitVector() {
+    delete[] Bits;
+  }
 
   /// size - Returns the number of bits in this bitvector.
   unsigned size() const { return Size; }





From zhousheng00 at gmail.com  Mon Mar 19 21:18:33 2007
From: zhousheng00 at gmail.com (Zhou Sheng)
Date: Mon, 19 Mar 2007 21:18:33 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/ADT/APInt.h
Message-ID: <200703200218.l2K2IXxw003911@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/ADT:

APInt.h updated: 1.44 -> 1.45
---
Log message:

Correct the name: isStrictPositive --> isStrictlyPositive.


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

 APInt.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/ADT/APInt.h
diff -u llvm/include/llvm/ADT/APInt.h:1.44 llvm/include/llvm/ADT/APInt.h:1.45
--- llvm/include/llvm/ADT/APInt.h:1.44	Mon Mar 19 15:36:48 2007
+++ llvm/include/llvm/ADT/APInt.h	Mon Mar 19 21:18:16 2007
@@ -376,7 +376,7 @@
 
   /// This just tests if the value of this APInt is strictly positive (> 0).
   /// @brief Determine if this APInt Value is strictly positive.
-  inline bool isStrictPositive() const {
+  inline bool isStrictlyPositive() const {
     return isPositive() && (*this) != 0;
   }
 





From sabre at nondot.org  Mon Mar 19 21:26:10 2007
From: sabre at nondot.org (Chris Lattner)
Date: Mon, 19 Mar 2007 21:26:10 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMISelLowering.cpp
Message-ID: <200703200226.l2K2QAjq004081@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMISelLowering.cpp updated: 1.25 -> 1.26
---
Log message:

fix indentation


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

 ARMISelLowering.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Target/ARM/ARMISelLowering.cpp
diff -u llvm/lib/Target/ARM/ARMISelLowering.cpp:1.25 llvm/lib/Target/ARM/ARMISelLowering.cpp:1.26
--- llvm/lib/Target/ARM/ARMISelLowering.cpp:1.25	Mon Mar 19 02:48:02 2007
+++ llvm/lib/Target/ARM/ARMISelLowering.cpp	Mon Mar 19 21:25:53 2007
@@ -161,7 +161,7 @@
 
   // Only ARMv6 has BSWAP.
   if (!Subtarget->hasV6Ops())
-      setOperationAction(ISD::BSWAP, MVT::i32, Expand);
+    setOperationAction(ISD::BSWAP, MVT::i32, Expand);
 
   // These are expanded into libcalls.
   setOperationAction(ISD::SDIV,  MVT::i32, Expand);





From clattner at apple.com  Mon Mar 19 21:27:59 2007
From: clattner at apple.com (Chris Lattner)
Date: Mon, 19 Mar 2007 19:27:59 -0700
Subject: [llvm-commits] llvm-gcc: better support for variable size
	struct	fields
In-Reply-To: <200703061725.32640.baldrick@free.fr>
References: <200703061725.32640.baldrick@free.fr>
Message-ID: <775D1826-6931-4F63-8CF3-04AE29A13D88@apple.com>


On Mar 6, 2007, at 8:25 AM, Duncan Sands wrote:

> This patch applies on top of the previously posted patch
> "llvm-gcc: use component_ref_field_offset in component references",
> http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of- 
> Mon-20070226/045399.html.
>
> Duncan.
> <var_size.diff>
> <2007-03-06-VarSizeInStruct1.c>
> <2007-03-06-VarSizeInStruct2.c>

Cool, thanks for applying this Devang,

Duncan, can you check in the testcases plz?

-Chris



From clattner at apple.com  Mon Mar 19 21:39:16 2007
From: clattner at apple.com (Chris Lattner)
Date: Mon, 19 Mar 2007 19:39:16 -0700
Subject: [llvm-commits]
	CVS:	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
In-Reply-To: <200703192130.l2JLU7js021026@zion.cs.uiuc.edu>
References: <200703192130.l2JLU7js021026@zion.cs.uiuc.edu>
Message-ID: <7D638BAE-3678-439E-8C6D-907F3BD16A0D@apple.com>

> APIntify the isHighOnes utility function.

> Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
> diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.667  
> llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.668
> --- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.667	Mon  
> Mar 19 16:10:28 2007
> +++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Mar 19  
> 16:29:50 2007
> @@ -3491,14 +3491,15 @@
>  // isHighOnes - Return true if the constant is of the form 1+0+.
>  // This is the same as lowones(~X).
>  static bool isHighOnes(const ConstantInt *CI) {
> -  uint64_t V = ~CI->getZExtValue();
> -  if (~V == 0) return false;  // 0's does not match "1+"
> +  if (CI->getValue() == 0) return false;  // 0's does not match "1+"

Why not call isZero() ?

> +
> +  APInt V(~CI->getValue());
>
>    // There won't be bits set in parts that the type doesn't contain.
> -  V &= ConstantInt::getAllOnesValue(CI->getType())->getZExtValue();
> +  V &= APInt::getAllOnesValue(CI->getType()->getBitWidth());

This is an obvious no-op, please remove it.

> -  uint64_t U = V+1;  // If it is low ones, this should be a power  
> of two.
> -  return U && V && (U & V) == 0;
> +  APInt U(V+1);  // If it is low ones, this should be a power of two.
> +  return (U!=0) && (V!=0) && (U & V) == 0;
>  }

Please change this to ispoweroftwo(V+1), at which point you can drop  
the isZero check above.

-Chris

>
>  /// getICmpCode - Encode a icmp predicate into a three bit mask.   
> These bits
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From sabre at nondot.org  Tue Mar 20 01:01:58 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 20 Mar 2007 01:01:58 -0500
Subject: [llvm-commits] CVS: llvm/test/CodeGen/X86/shift-codegen.ll
Message-ID: <200703200601.l2K61wRr012673@zion.cs.uiuc.edu>



Changes in directory llvm/test/CodeGen/X86:

shift-codegen.ll added (r1.1)
---
Log message:

These functions should use shll, not lea.


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

 shift-codegen.ll |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+)


Index: llvm/test/CodeGen/X86/shift-codegen.ll
diff -c /dev/null llvm/test/CodeGen/X86/shift-codegen.ll:1.1
*** /dev/null	Tue Mar 20 01:01:51 2007
--- llvm/test/CodeGen/X86/shift-codegen.ll	Tue Mar 20 01:01:41 2007
***************
*** 0 ****
--- 1,27 ----
+ ; RUN: llvm-as < %s | llc -relocation-model=static -march=x86 | grep 'shll $3' | wc -l | grep 2
+ 
+ ; This should produce two shll instructions, not any lea's.
+ 
+ target triple = "i686-apple-darwin8"
+ @Y = weak global i32 0          ; <i32*> [#uses=1]
+ @X = weak global i32 0          ; <i32*> [#uses=2]
+ 
+ implementation   ; Functions:
+ 
+ define void @fn1() {
+ entry:
+         %tmp = load i32* @Y             ; <i32> [#uses=1]
+         %tmp1 = shl i32 %tmp, 3         ; <i32> [#uses=1]
+         %tmp2 = load i32* @X            ; <i32> [#uses=1]
+         %tmp3 = or i32 %tmp1, %tmp2             ; <i32> [#uses=1]
+         store i32 %tmp3, i32* @X
+         ret void
+ }
+ 
+ define i32 @fn2(i32 %X, i32 %Y) {
+ entry:
+         %tmp2 = shl i32 %Y, 3           ; <i32> [#uses=1]
+         %tmp4 = or i32 %tmp2, %X                ; <i32> [#uses=1]
+         ret i32 %tmp4
+ }
+ 





From sabre at nondot.org  Tue Mar 20 01:08:46 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 20 Mar 2007 01:08:46 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
	X86InstrInfo.cpp
Message-ID: <200703200608.l2K68kq4012829@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86ISelDAGToDAG.cpp updated: 1.145 -> 1.146
X86InstrInfo.cpp updated: 1.78 -> 1.79
---
Log message:

Two changes: 
1) codegen a shift of a register as a shift, not an LEA.
2) teach the RA to convert a shift to an LEA instruction if it wants something
   in three-address form.

This gives us asm diffs like:

-       leal (,%eax,4), %eax
+       shll $2, %eax

which is faster on some processors and smaller on all of them.

and, more interestingly:

-       movl 24(%esi), %eax
-       leal (,%eax,4), %edi
+       movl 24(%esi), %edi
+       shll $2, %edi

Without #2, #1 was a significant pessimization in some cases.

This implements CodeGen/X86/shift-codegen.ll



---
Diffs of the changes:  (+39 -13)

 X86ISelDAGToDAG.cpp |    7 +++----
 X86InstrInfo.cpp    |   45 ++++++++++++++++++++++++++++++++++++---------
 2 files changed, 39 insertions(+), 13 deletions(-)


Index: llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
diff -u llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.145 llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.146
--- llvm/lib/Target/X86/X86ISelDAGToDAG.cpp:1.145	Sun Feb  4 14:18:17 2007
+++ llvm/lib/Target/X86/X86ISelDAGToDAG.cpp	Tue Mar 20 01:08:29 2007
@@ -886,10 +886,9 @@
   else
     AM.IndexReg = CurDAG->getRegister(0, VT);
 
-  if (AM.Scale > 2) 
-    Complexity += 2;
-  // Don't match just leal(,%reg,2). It's cheaper to do addl %reg, %reg
-  else if (AM.Scale > 1)
+  // Don't match just leal(,%reg,2). It's cheaper to do addl %reg, %reg, or with
+  // a simple shift.
+  if (AM.Scale > 1)
     Complexity++;
 
   // FIXME: We are artificially lowering the criteria to turn ADD %reg, $GA


Index: llvm/lib/Target/X86/X86InstrInfo.cpp
diff -u llvm/lib/Target/X86/X86InstrInfo.cpp:1.78 llvm/lib/Target/X86/X86InstrInfo.cpp:1.79
--- llvm/lib/Target/X86/X86InstrInfo.cpp:1.78	Thu Mar  8 16:09:11 2007
+++ llvm/lib/Target/X86/X86InstrInfo.cpp	Tue Mar 20 01:08:29 2007
@@ -132,29 +132,57 @@
 
   MachineInstr *NewMI = NULL;
   // FIXME: 16-bit LEA's are really slow on Athlons, but not bad on P4's.  When
-  // we have subtarget support, enable the 16-bit LEA generation here.
+  // we have better subtarget support, enable the 16-bit LEA generation here.
   bool DisableLEA16 = true;
 
   switch (MI->getOpcode()) {
-  default: break;
+  default: return 0;
   case X86::SHUFPSrri: {
     assert(MI->getNumOperands() == 4 && "Unknown shufps instruction!");
-    const X86Subtarget *Subtarget = &TM.getSubtarget<X86Subtarget>();
+    if (!TM.getSubtarget<X86Subtarget>().hasSSE2()) return 0;
+    
     unsigned A = MI->getOperand(0).getReg();
     unsigned B = MI->getOperand(1).getReg();
     unsigned C = MI->getOperand(2).getReg();
-    unsigned M = MI->getOperand(3).getImmedValue();
-    if (!Subtarget->hasSSE2() || B != C) return 0;
+    unsigned M = MI->getOperand(3).getImm();
+    if (B != C) return 0;
     NewMI = BuildMI(get(X86::PSHUFDri), A).addReg(B).addImm(M);
-    goto Done;
+    break;
+  }
+  case X86::SHL32ri: {
+    assert(MI->getNumOperands() == 3 && "Unknown shift instruction!");
+    // NOTE: LEA doesn't produce flags like shift does, but LLVM never uses
+    // the flags produced by a shift yet, so this is safe.
+    unsigned Dest = MI->getOperand(0).getReg();
+    unsigned Src = MI->getOperand(1).getReg();
+    unsigned ShAmt = MI->getOperand(2).getImm();
+    if (ShAmt == 0 || ShAmt >= 4) return 0;
+    
+    NewMI = BuildMI(get(X86::LEA32r), Dest)
+      .addReg(0).addImm(1 << ShAmt).addReg(Src).addImm(0);
+    break;
+  }
+  case X86::SHL16ri: {
+    assert(MI->getNumOperands() == 3 && "Unknown shift instruction!");
+    if (DisableLEA16) return 0;
+    
+    // NOTE: LEA doesn't produce flags like shift does, but LLVM never uses
+    // the flags produced by a shift yet, so this is safe.
+    unsigned Dest = MI->getOperand(0).getReg();
+    unsigned Src = MI->getOperand(1).getReg();
+    unsigned ShAmt = MI->getOperand(2).getImm();
+    if (ShAmt == 0 || ShAmt >= 4) return 0;
+    
+    NewMI = BuildMI(get(X86::LEA16r), Dest)
+      .addReg(0).addImm(1 << ShAmt).addReg(Src).addImm(0);
+    break;
   }
   }
 
   // FIXME: None of these instructions are promotable to LEAs without
   // additional information.  In particular, LEA doesn't set the flags that
   // add and inc do.  :(
-  return 0;
-
+  if (0)
   switch (MI->getOpcode()) {
   case X86::INC32r:
   case X86::INC64_32r:
@@ -220,7 +248,6 @@
     break;
   }
 
-Done:
   if (NewMI) {
     NewMI->copyKillDeadInfo(MI);
     LV.instructionChanged(MI, NewMI);  // Update live variables





From evan.cheng at apple.com  Tue Mar 20 03:06:12 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 03:06:12 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/MRegisterInfo.h
Message-ID: <200703200806.l2K86CHh015002@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

MRegisterInfo.h updated: 1.101 -> 1.102
---
Log message:

Added MRegisterInfo hook to re-materialize an instruction.

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

 MRegisterInfo.h |    7 +++++++
 1 files changed, 7 insertions(+)


Index: llvm/include/llvm/Target/MRegisterInfo.h
diff -u llvm/include/llvm/Target/MRegisterInfo.h:1.101 llvm/include/llvm/Target/MRegisterInfo.h:1.102
--- llvm/include/llvm/Target/MRegisterInfo.h:1.101	Tue Mar  6 04:04:38 2007
+++ llvm/include/llvm/Target/MRegisterInfo.h	Tue Mar 20 03:05:54 2007
@@ -374,6 +374,13 @@
                             unsigned DestReg, unsigned SrcReg,
                             const TargetRegisterClass *RC) const = 0;
 
+  /// reMaterialize - Re-issue the specified 'original' instruction at the
+  /// specific location targeting a new destination register.
+  virtual void reMaterialize(MachineBasicBlock &MBB,
+                             MachineBasicBlock::iterator MI,
+                             unsigned DestReg,
+                             const MachineInstr *Orig) const = 0;
+
   /// foldMemoryOperand - Attempt to fold a load or store of the
   /// specified stack slot into the specified machine instruction for
   /// the specified operand.  If this is possible, a new instruction





From evan.cheng at apple.com  Tue Mar 20 03:07:21 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 03:07:21 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMRegisterInfo.h
	ARMRegisterInfo.cpp
Message-ID: <200703200807.l2K87LAm015053@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMRegisterInfo.h updated: 1.16 -> 1.17
ARMRegisterInfo.cpp updated: 1.83 -> 1.84
---
Log message:

Added MRegisterInfo hook to re-materialize an instruction.

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

 ARMRegisterInfo.cpp |   51 +++++++++++++++++++++++++++++++++++----------------
 ARMRegisterInfo.h   |    3 +++
 2 files changed, 38 insertions(+), 16 deletions(-)


Index: llvm/lib/Target/ARM/ARMRegisterInfo.h
diff -u llvm/lib/Target/ARM/ARMRegisterInfo.h:1.16 llvm/lib/Target/ARM/ARMRegisterInfo.h:1.17
--- llvm/lib/Target/ARM/ARMRegisterInfo.h:1.16	Tue Mar  6 04:03:56 2007
+++ llvm/lib/Target/ARM/ARMRegisterInfo.h	Tue Mar 20 03:07:04 2007
@@ -60,6 +60,9 @@
                     unsigned DestReg, unsigned SrcReg,
                     const TargetRegisterClass *RC) const;
 
+  void reMaterialize(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI,
+                     unsigned DestReg, const MachineInstr *Orig) const;
+
   MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum,
                                   int FrameIndex) const;
 


Index: llvm/lib/Target/ARM/ARMRegisterInfo.cpp
diff -u llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.83 llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.84
--- llvm/lib/Target/ARM/ARMRegisterInfo.cpp:1.83	Mon Mar 19 02:48:02 2007
+++ llvm/lib/Target/ARM/ARMRegisterInfo.cpp	Tue Mar 20 03:07:04 2007
@@ -195,6 +195,38 @@
     abort();
 }
 
+/// emitLoadConstPool - Emits a load from constpool to materialize the
+/// specified immediate.
+static void emitLoadConstPool(MachineBasicBlock &MBB,
+                              MachineBasicBlock::iterator &MBBI,
+                              unsigned DestReg, int Val, 
+                              const TargetInstrInfo &TII, bool isThumb) {
+  MachineFunction &MF = *MBB.getParent();
+  MachineConstantPool *ConstantPool = MF.getConstantPool();
+  Constant *C = ConstantInt::get(Type::Int32Ty, Val);
+  unsigned Idx = ConstantPool->getConstantPoolIndex(C, 2);
+  if (isThumb)
+    BuildMI(MBB, MBBI, TII.get(ARM::tLDRcp), DestReg).addConstantPoolIndex(Idx);
+  else
+    BuildMI(MBB, MBBI, TII.get(ARM::LDRcp), DestReg).addConstantPoolIndex(Idx)
+      .addReg(0).addImm(0);
+}
+
+void ARMRegisterInfo::reMaterialize(MachineBasicBlock &MBB,
+                                    MachineBasicBlock::iterator I,
+                                    unsigned DestReg,
+                                    const MachineInstr *Orig) const {
+  if (Orig->getOpcode() == ARM::MOVi2pieces) {
+    emitLoadConstPool(MBB, I, DestReg, Orig->getOperand(1).getImmedValue(),
+                      TII, false);
+    return;
+  }
+
+  MachineInstr *MI = Orig->clone();
+  MI->getOperand(0).setReg(DestReg);
+  MBB.insert(I, MI);
+}
+
 /// isLowRegister - Returns true if the register is low register r0-r7.
 ///
 static bool isLowRegister(unsigned Reg) {
@@ -410,19 +442,6 @@
   return NumMIs;
 }
 
-/// emitLoadConstPool - Emits a load from constpool to materialize NumBytes
-/// immediate.
-static void emitLoadConstPool(MachineBasicBlock &MBB,
-                              MachineBasicBlock::iterator &MBBI,
-                              unsigned DestReg, int NumBytes, 
-                              const TargetInstrInfo &TII) {
-  MachineFunction &MF = *MBB.getParent();
-  MachineConstantPool *ConstantPool = MF.getConstantPool();
-  Constant *C = ConstantInt::get(Type::Int32Ty, NumBytes);
-  unsigned Idx = ConstantPool->getConstantPoolIndex(C, 2);
-  BuildMI(MBB, MBBI, TII.get(ARM::tLDRpci), DestReg).addConstantPoolIndex(Idx);
-}
-
 /// emitThumbRegPlusImmInReg - Emits a series of instructions to materialize
 /// a destreg = basereg + immediate in Thumb code. Materialize the immediate
 /// in a register using mov / mvn sequences or load the immediate from a
@@ -459,7 +478,7 @@
       BuildMI(MBB, MBBI, TII.get(ARM::tNEG), LdReg)
         .addReg(LdReg, false, false, true);
     } else
-      emitLoadConstPool(MBB, MBBI, LdReg, NumBytes, TII);
+      emitLoadConstPool(MBB, MBBI, LdReg, NumBytes, TII, true);
 
     // Emit add / sub.
     int Opc = (isSub) ? ARM::tSUBrr : (isHigh ? ARM::tADDhirr : ARM::tADDrr);
@@ -885,7 +904,7 @@
         if (FrameReg == ARM::SP)
           emitThumbRegPlusImmInReg(MBB, II, TmpReg, FrameReg,Offset,false,TII);
         else {
-          emitLoadConstPool(MBB, II, TmpReg, Offset, TII);
+          emitLoadConstPool(MBB, II, TmpReg, Offset, TII, true);
           UseRR = true;
         }
       } else
@@ -920,7 +939,7 @@
         if (FrameReg == ARM::SP)
           emitThumbRegPlusImmInReg(MBB, II, TmpReg, FrameReg,Offset,false,TII);
         else {
-          emitLoadConstPool(MBB, II, TmpReg, Offset, TII);
+          emitLoadConstPool(MBB, II, TmpReg, Offset, TII, true);
           UseRR = true;
         }
       } else





From evan.cheng at apple.com  Tue Mar 20 03:08:03 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 03:08:03 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp
	AlphaRegisterInfo.h
Message-ID: <200703200808.l2K8838m015078@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/Alpha:

AlphaRegisterInfo.cpp updated: 1.63 -> 1.64
AlphaRegisterInfo.h updated: 1.22 -> 1.23
---
Log message:

Added MRegisterInfo hook to re-materialize an instruction.

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

 AlphaRegisterInfo.cpp |    9 +++++++++
 AlphaRegisterInfo.h   |    3 +++
 2 files changed, 12 insertions(+)


Index: llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp
diff -u llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp:1.63 llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp:1.64
--- llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp:1.63	Tue Feb 27 18:18:31 2007
+++ llvm/lib/Target/Alpha/AlphaRegisterInfo.cpp	Tue Mar 20 03:07:46 2007
@@ -155,6 +155,15 @@
   }
 }
 
+void AlphaRegisterInfo::reMaterialize(MachineBasicBlock &MBB,
+                                      MachineBasicBlock::iterator I,
+                                      unsigned DestReg,
+                                      const MachineInstr *Orig) const {
+  MachineInstr *MI = Orig->clone();
+  MI->getOperand(0).setReg(DestReg);
+  MBB.insert(I, MI);
+}
+
 const unsigned* AlphaRegisterInfo::getCalleeSavedRegs() const {
   static const unsigned CalleeSavedRegs[] = {
     Alpha::R9, Alpha::R10,


Index: llvm/lib/Target/Alpha/AlphaRegisterInfo.h
diff -u llvm/lib/Target/Alpha/AlphaRegisterInfo.h:1.22 llvm/lib/Target/Alpha/AlphaRegisterInfo.h:1.23
--- llvm/lib/Target/Alpha/AlphaRegisterInfo.h:1.22	Tue Feb 27 18:18:31 2007
+++ llvm/lib/Target/Alpha/AlphaRegisterInfo.h	Tue Mar 20 03:07:46 2007
@@ -45,6 +45,9 @@
                     unsigned DestReg, unsigned SrcReg,
                     const TargetRegisterClass *RC) const;
 
+  void reMaterialize(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI,
+                     unsigned DestReg, const MachineInstr *Orig) const;
+
   const unsigned *getCalleeSavedRegs() const;
 
   const TargetRegisterClass* const* getCalleeSavedRegClasses() const;





From evan.cheng at apple.com  Tue Mar 20 03:08:21 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 03:08:21 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/IA64/IA64RegisterInfo.cpp
	IA64RegisterInfo.h
Message-ID: <200703200808.l2K88La3015096@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/IA64:

IA64RegisterInfo.cpp updated: 1.34 -> 1.35
IA64RegisterInfo.h updated: 1.16 -> 1.17
---
Log message:

Added MRegisterInfo hook to re-materialize an instruction.

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

 IA64RegisterInfo.cpp |    9 +++++++++
 IA64RegisterInfo.h   |    3 +++
 2 files changed, 12 insertions(+)


Index: llvm/lib/Target/IA64/IA64RegisterInfo.cpp
diff -u llvm/lib/Target/IA64/IA64RegisterInfo.cpp:1.34 llvm/lib/Target/IA64/IA64RegisterInfo.cpp:1.35
--- llvm/lib/Target/IA64/IA64RegisterInfo.cpp:1.34	Tue Feb 27 18:18:52 2007
+++ llvm/lib/Target/IA64/IA64RegisterInfo.cpp	Tue Mar 20 03:08:04 2007
@@ -93,6 +93,15 @@
     BuildMI(MBB, MI, TII.get(IA64::MOV), DestReg).addReg(SrcReg);
 }
 
+void IA64RegisterInfo::reMaterialize(MachineBasicBlock &MBB,
+                                     MachineBasicBlock::iterator I,
+                                     unsigned DestReg,
+                                     const MachineInstr *Orig) const {
+  MachineInstr *MI = Orig->clone();
+  MI->getOperand(0).setReg(DestReg);
+  MBB.insert(I, MI);
+}
+
 const unsigned* IA64RegisterInfo::getCalleeSavedRegs() const {
   static const unsigned CalleeSavedRegs[] = {
     IA64::r5,  0


Index: llvm/lib/Target/IA64/IA64RegisterInfo.h
diff -u llvm/lib/Target/IA64/IA64RegisterInfo.h:1.16 llvm/lib/Target/IA64/IA64RegisterInfo.h:1.17
--- llvm/lib/Target/IA64/IA64RegisterInfo.h:1.16	Tue Feb 27 18:18:52 2007
+++ llvm/lib/Target/IA64/IA64RegisterInfo.h	Tue Mar 20 03:08:04 2007
@@ -44,6 +44,9 @@
                     unsigned DestReg, unsigned SrcReg,
                     const TargetRegisterClass *RC) const;
 
+  void reMaterialize(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI,
+                     unsigned DestReg, const MachineInstr *Orig) const;
+
   const unsigned *getCalleeSavedRegs() const;
 
   const TargetRegisterClass* const* getCalleeSavedRegClasses() const;





From evan.cheng at apple.com  Tue Mar 20 03:08:47 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 03:08:47 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
	PPCRegisterInfo.h
Message-ID: <200703200808.l2K88lJ6015122@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPCRegisterInfo.cpp updated: 1.116 -> 1.117
PPCRegisterInfo.h updated: 1.33 -> 1.34
---
Log message:

Added MRegisterInfo hook to re-materialize an instruction.

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

 PPCRegisterInfo.cpp |    9 +++++++++
 PPCRegisterInfo.h   |    3 +++
 2 files changed, 12 insertions(+)


Index: llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
diff -u llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp:1.116 llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp:1.117
--- llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp:1.116	Tue Mar  6 04:05:14 2007
+++ llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp	Tue Mar 20 03:08:30 2007
@@ -239,6 +239,15 @@
   }
 }
 
+void PPCRegisterInfo::reMaterialize(MachineBasicBlock &MBB,
+                                    MachineBasicBlock::iterator I,
+                                    unsigned DestReg,
+                                    const MachineInstr *Orig) const {
+  MachineInstr *MI = Orig->clone();
+  MI->getOperand(0).setReg(DestReg);
+  MBB.insert(I, MI);
+}
+
 const unsigned* PPCRegisterInfo::getCalleeSavedRegs() const {
   // 32-bit Darwin calling convention. 
   static const unsigned Darwin32_CalleeSavedRegs[] = {


Index: llvm/lib/Target/PowerPC/PPCRegisterInfo.h
diff -u llvm/lib/Target/PowerPC/PPCRegisterInfo.h:1.33 llvm/lib/Target/PowerPC/PPCRegisterInfo.h:1.34
--- llvm/lib/Target/PowerPC/PPCRegisterInfo.h:1.33	Tue Mar  6 04:05:14 2007
+++ llvm/lib/Target/PowerPC/PPCRegisterInfo.h	Tue Mar 20 03:08:30 2007
@@ -49,6 +49,9 @@
                     unsigned DestReg, unsigned SrcReg,
                     const TargetRegisterClass *RC) const;
 
+  void reMaterialize(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI,
+                     unsigned DestReg, const MachineInstr *Orig) const;
+
   /// foldMemoryOperand - PowerPC (like most RISC's) can only fold spills into
   /// copy instructions, turning them into load/store instructions.
   virtual MachineInstr* foldMemoryOperand(MachineInstr* MI, unsigned OpNum,





From evan.cheng at apple.com  Tue Mar 20 03:09:05 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 03:09:05 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcRegisterInfo.cpp
	SparcRegisterInfo.h
Message-ID: <200703200809.l2K895aD015145@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/Sparc:

SparcRegisterInfo.cpp updated: 1.57 -> 1.58
SparcRegisterInfo.h updated: 1.22 -> 1.23
---
Log message:

Added MRegisterInfo hook to re-materialize an instruction.

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

 SparcRegisterInfo.cpp |    9 +++++++++
 SparcRegisterInfo.h   |    3 +++
 2 files changed, 12 insertions(+)


Index: llvm/lib/Target/Sparc/SparcRegisterInfo.cpp
diff -u llvm/lib/Target/Sparc/SparcRegisterInfo.cpp:1.57 llvm/lib/Target/Sparc/SparcRegisterInfo.cpp:1.58
--- llvm/lib/Target/Sparc/SparcRegisterInfo.cpp:1.57	Tue Feb 27 18:20:02 2007
+++ llvm/lib/Target/Sparc/SparcRegisterInfo.cpp	Tue Mar 20 03:08:48 2007
@@ -77,6 +77,15 @@
     assert (0 && "Can't copy this register");
 }
 
+void SparcRegisterInfo::reMaterialize(MachineBasicBlock &MBB,
+                                      MachineBasicBlock::iterator I,
+                                      unsigned DestReg,
+                                      const MachineInstr *Orig) const {
+  MachineInstr *MI = Orig->clone();
+  MI->getOperand(0).setReg(DestReg);
+  MBB.insert(I, MI);
+}
+
 MachineInstr *SparcRegisterInfo::foldMemoryOperand(MachineInstr* MI,
                                                    unsigned OpNum,
                                                    int FI) const {


Index: llvm/lib/Target/Sparc/SparcRegisterInfo.h
diff -u llvm/lib/Target/Sparc/SparcRegisterInfo.h:1.22 llvm/lib/Target/Sparc/SparcRegisterInfo.h:1.23
--- llvm/lib/Target/Sparc/SparcRegisterInfo.h:1.22	Tue Feb 27 18:20:02 2007
+++ llvm/lib/Target/Sparc/SparcRegisterInfo.h	Tue Mar 20 03:08:48 2007
@@ -44,6 +44,9 @@
                     unsigned DestReg, unsigned SrcReg,
                     const TargetRegisterClass *RC) const;
   
+  void reMaterialize(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI,
+                     unsigned DestReg, const MachineInstr *Orig) const;
+
   virtual MachineInstr* foldMemoryOperand(MachineInstr* MI,
                                           unsigned OpNum,
                                           int FrameIndex) const;





From evan.cheng at apple.com  Tue Mar 20 03:09:55 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 03:09:55 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86RegisterInfo.h
	X86RegisterInfo.cpp
Message-ID: <200703200809.l2K89t2b015182@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86RegisterInfo.h updated: 1.50 -> 1.51
X86RegisterInfo.cpp updated: 1.207 -> 1.208
---
Log message:

Added MRegisterInfo hook to re-materialize an instruction.

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

 X86RegisterInfo.cpp |   10 ++++++++++
 X86RegisterInfo.h   |    3 +++
 2 files changed, 13 insertions(+)


Index: llvm/lib/Target/X86/X86RegisterInfo.h
diff -u llvm/lib/Target/X86/X86RegisterInfo.h:1.50 llvm/lib/Target/X86/X86RegisterInfo.h:1.51
--- llvm/lib/Target/X86/X86RegisterInfo.h:1.50	Tue Feb 27 18:20:26 2007
+++ llvm/lib/Target/X86/X86RegisterInfo.h	Tue Mar 20 03:09:38 2007
@@ -58,6 +58,9 @@
                     MachineBasicBlock::iterator MI,
                     unsigned DestReg, unsigned SrcReg,
                     const TargetRegisterClass *RC) const;
+ 
+  void reMaterialize(MachineBasicBlock &MBB, MachineBasicBlock::iterator MI,
+                     unsigned DestReg, const MachineInstr *Orig) const;
 
   /// foldMemoryOperand - If this target supports it, fold a load or store of
   /// the specified stack slot into the specified machine instruction for the


Index: llvm/lib/Target/X86/X86RegisterInfo.cpp
diff -u llvm/lib/Target/X86/X86RegisterInfo.cpp:1.207 llvm/lib/Target/X86/X86RegisterInfo.cpp:1.208
--- llvm/lib/Target/X86/X86RegisterInfo.cpp:1.207	Thu Mar  8 16:09:11 2007
+++ llvm/lib/Target/X86/X86RegisterInfo.cpp	Tue Mar 20 03:09:38 2007
@@ -167,6 +167,16 @@
   BuildMI(MBB, MI, TII.get(Opc), DestReg).addReg(SrcReg);
 }
 
+
+void X86RegisterInfo::reMaterialize(MachineBasicBlock &MBB,
+                                    MachineBasicBlock::iterator I,
+                                    unsigned DestReg,
+                                    const MachineInstr *Orig) const {
+  MachineInstr *MI = Orig->clone();
+  MI->getOperand(0).setReg(DestReg);
+  MBB.insert(I, MI);
+}
+
 static MachineInstr *FuseTwoAddrInst(unsigned Opcode, unsigned FrameIndex,
                                      MachineInstr *MI,
                                      const TargetInstrInfo &TII) {





From evan.cheng at apple.com  Tue Mar 20 03:10:34 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 03:10:34 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/README-Thumb.txt
Message-ID: <200703200810.l2K8AYRh015217@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

README-Thumb.txt updated: 1.8 -> 1.9
---
Log message:

New entry.

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

 README-Thumb.txt |   13 +++++++++++++
 1 files changed, 13 insertions(+)


Index: llvm/lib/Target/ARM/README-Thumb.txt
diff -u llvm/lib/Target/ARM/README-Thumb.txt:1.8 llvm/lib/Target/ARM/README-Thumb.txt:1.9
--- llvm/lib/Target/ARM/README-Thumb.txt:1.8	Wed Feb  7 03:22:15 2007
+++ llvm/lib/Target/ARM/README-Thumb.txt	Tue Mar 20 03:10:17 2007
@@ -154,3 +154,16 @@
 (when hasFP is true or stack size is large) and restore R3 from that register
 instead. This allows us to at least get rid of the save to r12 everytime it is
 used.
+
+//===---------------------------------------------------------------------===//
+
+Poor codegen test/CodeGen/ARM/select.ll f7:
+
+	ldr r5, LCPI1_0
+LPC0:
+	add r5, pc
+	ldr r6, LCPI1_1
+	ldr r2, LCPI1_2
+	cpy r3, r6
+	cpy lr, pc
+	bx r5





From evan.cheng at apple.com  Tue Mar 20 03:11:47 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 03:11:47 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMAsmPrinter.cpp
	ARMInstrInfo.td
Message-ID: <200703200811.l2K8Blhx015252@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMAsmPrinter.cpp updated: 1.61 -> 1.62
ARMInstrInfo.td updated: 1.91 -> 1.92
---
Log message:

Make two piece constant generation as a single instruction. It's re-materialized as a load from constantpool.

---
Diffs of the changes:  (+55 -30)

 ARMAsmPrinter.cpp |   37 +++++++++++++++++++++++++++++--------
 ARMInstrInfo.td   |   48 ++++++++++++++++++++++++++----------------------
 2 files changed, 55 insertions(+), 30 deletions(-)


Index: llvm/lib/Target/ARM/ARMAsmPrinter.cpp
diff -u llvm/lib/Target/ARM/ARMAsmPrinter.cpp:1.61 llvm/lib/Target/ARM/ARMAsmPrinter.cpp:1.62
--- llvm/lib/Target/ARM/ARMAsmPrinter.cpp:1.61	Thu Mar  8 16:42:46 2007
+++ llvm/lib/Target/ARM/ARMAsmPrinter.cpp	Tue Mar 20 03:11:30 2007
@@ -82,6 +82,7 @@
     void printOperand(const MachineInstr *MI, int opNum,
                       const char *Modifier = 0);
     void printSOImmOperand(const MachineInstr *MI, int opNum);
+    void printSOImm2PartOperand(const MachineInstr *MI, int opNum);
     void printSORegOperand(const MachineInstr *MI, int opNum);
     void printAddrMode2Operand(const MachineInstr *MI, int OpNo);
     void printAddrMode2OffsetOperand(const MachineInstr *MI, int OpNo);
@@ -309,14 +310,10 @@
   }
 }
 
-/// printSOImmOperand - SOImm is 4-bit rotate amount in bits 8-11 with 8-bit
-/// immediate in bits 0-7.
-void ARMAsmPrinter::printSOImmOperand(const MachineInstr *MI, int OpNum) {
-  const MachineOperand &MO = MI->getOperand(OpNum);
-  assert(MO.isImmediate() && (MO.getImmedValue() < (1 << 12)) &&
-         "Not a valid so_imm value!");
-  unsigned Imm = ARM_AM::getSOImmValImm(MO.getImmedValue());
-  unsigned Rot = ARM_AM::getSOImmValRot(MO.getImmedValue());
+static void printSOImm(std::ostream &O, int64_t V, const TargetAsmInfo *TAI) {
+  assert(V < (1 << 12) && "Not a valid so_imm value!");
+  unsigned Imm = ARM_AM::getSOImmValImm(V);
+  unsigned Rot = ARM_AM::getSOImmValRot(V);
   
   // Print low-level immediate formation info, per
   // A5.1.3: "Data-processing operands - Immediate".
@@ -329,6 +326,30 @@
   }
 }
 
+/// printSOImmOperand - SOImm is 4-bit rotate amount in bits 8-11 with 8-bit
+/// immediate in bits 0-7.
+void ARMAsmPrinter::printSOImmOperand(const MachineInstr *MI, int OpNum) {
+  const MachineOperand &MO = MI->getOperand(OpNum);
+  assert(MO.isImmediate() && "Not a valid so_imm value!");
+  printSOImm(O, MO.getImmedValue(), TAI);
+}
+
+/// printSOImm2PartOperand - SOImm is broken into two pieces using a mov
+/// followed by a or to materialize.
+void ARMAsmPrinter::printSOImm2PartOperand(const MachineInstr *MI, int OpNum) {
+  const MachineOperand &MO = MI->getOperand(OpNum);
+  assert(MO.isImmediate() && "Not a valid so_imm value!");
+  unsigned V1 = ARM_AM::getSOImmTwoPartFirst(MO.getImmedValue());
+  unsigned V2 = ARM_AM::getSOImmTwoPartSecond(MO.getImmedValue());
+  printSOImm(O, ARM_AM::getSOImmVal(V1), TAI);
+  O << "\n\torr ";
+  printOperand(MI, 0); 
+  O << ", ";
+  printOperand(MI, 0); 
+  O << ", ";
+  printSOImm(O, ARM_AM::getSOImmVal(V2), TAI);
+}
+
 // so_reg is a 4-operand unit corresponding to register forms of the A5.1
 // "Addressing Mode 1 - Data-processing operands" forms.  This includes:
 //    REG 0   0    - e.g. R5


Index: llvm/lib/Target/ARM/ARMInstrInfo.td
diff -u llvm/lib/Target/ARM/ARMInstrInfo.td:1.91 llvm/lib/Target/ARM/ARMInstrInfo.td:1.92
--- llvm/lib/Target/ARM/ARMInstrInfo.td:1.91	Mon Mar 19 02:48:02 2007
+++ llvm/lib/Target/ARM/ARMInstrInfo.td	Tue Mar 20 03:11:30 2007
@@ -147,24 +147,6 @@
 }]>;
 
 
-// Break so_imm's up into two pieces.  This handles immediates with up to 16
-// bits set in them.  This uses so_imm2part to match and so_imm2part_[12] to
-// get the first/second pieces.
-def so_imm2part : PatLeaf<(imm), [{
-  return ARM_AM::isSOImmTwoPartVal((unsigned)N->getValue());
-}]>;
-
-def so_imm2part_1 : SDNodeXForm<imm, [{
-  unsigned V = ARM_AM::getSOImmTwoPartFirst((unsigned)N->getValue());
-  return CurDAG->getTargetConstant(ARM_AM::getSOImmVal(V), MVT::i32);
-}]>;
-
-def so_imm2part_2 : SDNodeXForm<imm, [{
-  unsigned V = ARM_AM::getSOImmTwoPartSecond((unsigned)N->getValue());
-  return CurDAG->getTargetConstant(ARM_AM::getSOImmVal(V), MVT::i32);
-}]>;
-
-
 
 //===----------------------------------------------------------------------===//
 // Operand Definitions.
@@ -217,6 +199,25 @@
   let PrintMethod = "printSOImmOperand";
 }
 
+// Break so_imm's up into two pieces.  This handles immediates with up to 16
+// bits set in them.  This uses so_imm2part to match and so_imm2part_[12] to
+// get the first/second pieces.
+def so_imm2part : Operand<i32>,
+                  PatLeaf<(imm),
+             [{ return ARM_AM::isSOImmTwoPartVal((unsigned)N->getValue()); }]> {
+  let PrintMethod = "printSOImm2PartOperand";
+}
+
+def so_imm2part_1 : SDNodeXForm<imm, [{
+  unsigned V = ARM_AM::getSOImmTwoPartFirst((unsigned)N->getValue());
+  return CurDAG->getTargetConstant(ARM_AM::getSOImmVal(V), MVT::i32);
+}]>;
+
+def so_imm2part_2 : SDNodeXForm<imm, [{
+  unsigned V = ARM_AM::getSOImmTwoPartSecond((unsigned)N->getValue());
+  return CurDAG->getTargetConstant(ARM_AM::getSOImmVal(V), MVT::i32);
+}]>;
+
 
 // Define ARM specific addressing modes.
 
@@ -371,6 +372,8 @@
   : I<ops, AddrMode4, Size4Bytes, IndexModeNone, asm, "", pattern>;
 class AIx2<dag ops, string asm, list<dag> pattern>
   : I<ops, AddrModeNone, Size8Bytes, IndexModeNone, asm, "", pattern>;
+class AI1x2<dag ops, string asm, list<dag> pattern>
+  : I<ops, AddrMode1, Size8Bytes, IndexModeNone, asm, "", pattern>;
 
 // Pre-indexed ops
 class AI2pr<dag ops, string asm, string cstr, list<dag> pattern>
@@ -1064,14 +1067,15 @@
 def : ARMPat<(ARMWrapper  tglobaladdr :$dst), (LEApcrel tglobaladdr :$dst)>;
 def : ARMPat<(ARMWrapper  tconstpool  :$dst), (LEApcrel tconstpool  :$dst)>;
 def : ARMPat<(ARMWrapperJT tjumptable:$dst, imm:$id),
-          (LEApcrelJT tjumptable:$dst, imm:$id)>;
+             (LEApcrelJT tjumptable:$dst, imm:$id)>;
 
 // Large immediate handling.
 
 // Two piece so_imms.
-def : ARMPat<(i32 so_imm2part:$src),
-             (ORRri (MOVi (so_imm2part_1 imm:$src)),
-                    (so_imm2part_2 imm:$src))>;
+let isReMaterializable = 1 in
+def MOVi2pieces : AI1x2<(ops GPR:$dst, so_imm2part:$src),
+                         "mov $dst, $src",
+                         [(set GPR:$dst, so_imm2part:$src)]>;
 
 def : ARMPat<(or GPR:$LHS, so_imm2part:$RHS),
               (ORRri (ORRri GPR:$LHS, (so_imm2part_1 imm:$RHS)),





From evan.cheng at apple.com  Tue Mar 20 03:14:12 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 03:14:12 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/LiveInterval.h
Message-ID: <200703200814.l2K8ECHK015325@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/CodeGen:

LiveInterval.h updated: 1.34 -> 1.35
---
Log message:

First cut trivial re-materialization support.

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

 LiveInterval.h |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)


Index: llvm/include/llvm/CodeGen/LiveInterval.h
diff -u llvm/include/llvm/CodeGen/LiveInterval.h:1.34 llvm/include/llvm/CodeGen/LiveInterval.h:1.35
--- llvm/include/llvm/CodeGen/LiveInterval.h:1.34	Sat Dec 16 23:15:12 2006
+++ llvm/include/llvm/CodeGen/LiveInterval.h	Tue Mar 20 03:13:50 2007
@@ -28,6 +28,7 @@
 #include <cassert>
 
 namespace llvm {
+  class MachineInstr;
   class MRegisterInfo;
 
   /// LiveRange structure - This represents a simple register range in the
@@ -81,6 +82,7 @@
     typedef SmallVector<LiveRange,4> Ranges;
     unsigned reg;        // the register of this interval
     float weight;        // weight of this interval
+    MachineInstr* remat; // definition if the definition rematerializable
     Ranges ranges;       // the ranges in which this register is live
   private:
     /// ValueNumberInfo - If this value number is not defined by a copy, this
@@ -92,7 +94,7 @@
   public:
 
     LiveInterval(unsigned Reg, float Weight)
-      : reg(Reg), weight(Weight) {
+      : reg(Reg), weight(Weight), remat(NULL) {
     }
 
     typedef Ranges::iterator iterator;
@@ -119,6 +121,7 @@
     void swap(LiveInterval& other) {
       std::swap(reg, other.reg);
       std::swap(weight, other.weight);
+      std::swap(remat, other.remat);
       std::swap(ranges, other.ranges);
       std::swap(ValueNumberInfo, other.ValueNumberInfo);
     }





From evan.cheng at apple.com  Tue Mar 20 03:14:12 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 03:14:12 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
	RegAllocLinearScan.cpp VirtRegMap.cpp VirtRegMap.h
Message-ID: <200703200814.l2K8ECLO015336@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

LiveIntervalAnalysis.cpp updated: 1.225 -> 1.226
RegAllocLinearScan.cpp updated: 1.141 -> 1.142
VirtRegMap.cpp updated: 1.104 -> 1.105
VirtRegMap.h updated: 1.26 -> 1.27
---
Log message:

First cut trivial re-materialization support.

---
Diffs of the changes:  (+151 -26)

 LiveIntervalAnalysis.cpp |   31 +++++++++++++++---
 RegAllocLinearScan.cpp   |   20 +++++++++--
 VirtRegMap.cpp           |   80 +++++++++++++++++++++++++++++++++++++++--------
 VirtRegMap.h             |   46 ++++++++++++++++++++++++---
 4 files changed, 151 insertions(+), 26 deletions(-)


Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.225 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.226
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.225	Mon Mar 19 13:08:26 2007
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Tue Mar 20 03:13:50 2007
@@ -50,6 +50,11 @@
   EnableJoining("join-liveintervals",
                 cl::desc("Coallesce copies (default=true)"),
                 cl::init(true));
+
+  static cl::opt<bool>
+  EnableReMat("enable-rematerialization",
+                cl::desc("Perform trivial re-materialization"),
+                cl::init(false));
 }
 
 void LiveIntervals::getAnalysisUsage(AnalysisUsage &AU) const {
@@ -155,8 +160,7 @@
         RemoveMachineInstrFromMaps(mii);
         mii = mbbi->erase(mii);
         ++numPeep;
-      }
-      else {
+      } else {
         for (unsigned i = 0, e = mii->getNumOperands(); i != e; ++i) {
           const MachineOperand &mop = mii->getOperand(i);
           if (mop.isRegister() && mop.getReg() &&
@@ -165,9 +169,13 @@
             unsigned reg = rep(mop.getReg());
             mii->getOperand(i).setReg(reg);
 
+            // If the definition instruction is re-materializable, its spill
+            // weight is zero.
             LiveInterval &RegInt = getInterval(reg);
-            RegInt.weight +=
-              (mop.isUse() + mop.isDef()) * pow(10.0F, (int)loopDepth);
+            if (!RegInt.remat) {
+              RegInt.weight +=
+                (mop.isUse() + mop.isDef()) * pow(10.0F, (int)loopDepth);
+            }
           }
         }
         ++mii;
@@ -300,7 +308,9 @@
       for (unsigned i = 0; i != MI->getNumOperands(); ++i) {
         MachineOperand& mop = MI->getOperand(i);
         if (mop.isRegister() && mop.getReg() == li.reg) {
-          if (MachineInstr *fmi = mri_->foldMemoryOperand(MI, i, slot)) {
+          MachineInstr *fmi = li.remat ? NULL
+            : mri_->foldMemoryOperand(MI, i, slot);
+          if (fmi) {
             // Attempt to fold the memory reference into the instruction.  If we
             // can do this, we don't need to insert spill code.
             if (lv_)
@@ -345,8 +355,11 @@
 
             // create a new register for this spill
             vrm.grow();
+            if (li.remat)
+              vrm.setVirtIsReMaterialized(NewVReg, li.remat);
             vrm.assignVirt2StackSlot(NewVReg, slot);
             LiveInterval &nI = getOrCreateInterval(NewVReg);
+            nI.remat = li.remat;
             assert(nI.empty());
 
             // the spill weight is now infinity as it
@@ -422,6 +435,11 @@
   // done once for the vreg.  We use an empty interval to detect the first
   // time we see a vreg.
   if (interval.empty()) {
+    // Remember if the definition can be rematerialized.
+    if (EnableReMat &&
+        vi.DefInst && tii_->isReMaterializable(vi.DefInst->getOpcode()))
+      interval.remat = vi.DefInst;
+
     // Get the Idx of the defining instructions.
     unsigned defIndex = getDefIndex(MIIdx);
 
@@ -497,6 +515,9 @@
     }
 
   } else {
+    // Can't safely assume definition is rematierializable anymore.
+    interval.remat = NULL;
+
     // If this is the second time we see a virtual register definition, it
     // must be due to phi elimination or two addr elimination.  If this is
     // the result of two address elimination, then the vreg is one of the


Index: llvm/lib/CodeGen/RegAllocLinearScan.cpp
diff -u llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.141 llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.142
--- llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.141	Sun Feb 25 03:39:02 2007
+++ llvm/lib/CodeGen/RegAllocLinearScan.cpp	Tue Mar 20 03:13:50 2007
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "regalloc"
+#include "llvm/CodeGen/LiveVariables.h"
 #include "llvm/CodeGen/LiveIntervalAnalysis.h"
 #include "PhysRegTracker.h"
 #include "VirtRegMap.h"
@@ -600,7 +601,12 @@
   // linearscan.
   if (cur->weight != HUGE_VALF && cur->weight <= minWeight) {
     DOUT << "\t\t\tspilling(c): " << *cur << '\n';
-    int slot = vrm_->assignVirt2StackSlot(cur->reg);
+    // if the current interval is re-materializable, remember so and don't
+    // assign it a spill slot.
+    if (cur->remat)
+      vrm_->setVirtIsReMaterialized(cur->reg, cur->remat);
+    int slot = cur->remat ? vrm_->assignVirtReMatId(cur->reg)
+      : vrm_->assignVirt2StackSlot(cur->reg);
     std::vector<LiveInterval*> added =
       li_->addIntervalsForSpills(*cur, *vrm_, slot);
     if (added.empty())
@@ -627,7 +633,7 @@
   std::vector<LiveInterval*> added;
   assert(MRegisterInfo::isPhysicalRegister(minReg) &&
          "did not choose a register to spill?");
-  std::vector<bool> toSpill(mri_->getNumRegs(), false);
+  BitVector toSpill(mri_->getNumRegs());
 
   // We are going to spill minReg and all its aliases.
   toSpill[minReg] = true;
@@ -653,7 +659,10 @@
         cur->overlapsFrom(*i->first, i->second)) {
       DOUT << "\t\t\tspilling(a): " << *i->first << '\n';
       earliestStart = std::min(earliestStart, i->first->beginNumber());
-      int slot = vrm_->assignVirt2StackSlot(i->first->reg);
+      if (i->first->remat)
+        vrm_->setVirtIsReMaterialized(reg, i->first->remat);
+      int slot = i->first->remat ? vrm_->assignVirtReMatId(reg)
+        : vrm_->assignVirt2StackSlot(reg);
       std::vector<LiveInterval*> newIs =
         li_->addIntervalsForSpills(*i->first, *vrm_, slot);
       std::copy(newIs.begin(), newIs.end(), std::back_inserter(added));
@@ -667,7 +676,10 @@
         cur->overlapsFrom(*i->first, i->second-1)) {
       DOUT << "\t\t\tspilling(i): " << *i->first << '\n';
       earliestStart = std::min(earliestStart, i->first->beginNumber());
-      int slot = vrm_->assignVirt2StackSlot(reg);
+      if (i->first->remat)
+        vrm_->setVirtIsReMaterialized(reg, i->first->remat);
+      int slot = i->first->remat ? vrm_->assignVirtReMatId(reg)
+        : vrm_->assignVirt2StackSlot(reg);
       std::vector<LiveInterval*> newIs =
         li_->addIntervalsForSpills(*i->first, *vrm_, slot);
       std::copy(newIs.begin(), newIs.end(), std::back_inserter(added));


Index: llvm/lib/CodeGen/VirtRegMap.cpp
diff -u llvm/lib/CodeGen/VirtRegMap.cpp:1.104 llvm/lib/CodeGen/VirtRegMap.cpp:1.105
--- llvm/lib/CodeGen/VirtRegMap.cpp:1.104	Sat Mar  3 00:32:37 2007
+++ llvm/lib/CodeGen/VirtRegMap.cpp	Tue Mar 20 03:13:50 2007
@@ -35,6 +35,7 @@
 using namespace llvm;
 
 STATISTIC(NumSpills, "Number of register spills");
+STATISTIC(NumReMats, "Number of re-materialization");
 STATISTIC(NumStores, "Number of stores added");
 STATISTIC(NumLoads , "Number of loads added");
 STATISTIC(NumReused, "Number of values reused");
@@ -60,7 +61,8 @@
 
 VirtRegMap::VirtRegMap(MachineFunction &mf)
   : TII(*mf.getTarget().getInstrInfo()), MF(mf), 
-    Virt2PhysMap(NO_PHYS_REG), Virt2StackSlotMap(NO_STACK_SLOT) {
+    Virt2PhysMap(NO_PHYS_REG), Virt2StackSlotMap(NO_STACK_SLOT),
+    ReMatId(MAX_STACK_SLOT+1) {
   grow();
 }
 
@@ -88,6 +90,15 @@
   Virt2StackSlotMap[virtReg] = frameIndex;
 }
 
+int VirtRegMap::assignVirtReMatId(unsigned virtReg) {
+  assert(MRegisterInfo::isVirtualRegister(virtReg));
+  assert(Virt2StackSlotMap[virtReg] == NO_STACK_SLOT &&
+         "attempt to assign re-mat id to already spilled register");
+  Virt2StackSlotMap[virtReg] = ReMatId;
+  ++NumReMats;
+  return ReMatId++;
+}
+
 void VirtRegMap::virtFolded(unsigned VirtReg, MachineInstr *OldMI,
                             unsigned OpNo, MachineInstr *NewMI) {
   // Move previous memory references folded to new instruction.
@@ -227,13 +238,17 @@
       DOUT << "\n**** Local spiller rewriting function '"
            << MF.getFunction()->getName() << "':\n";
 
+      std::vector<MachineInstr *> ReMatedMIs;
       for (MachineFunction::iterator MBB = MF.begin(), E = MF.end();
            MBB != E; ++MBB)
-        RewriteMBB(*MBB, VRM);
+        RewriteMBB(*MBB, VRM, ReMatedMIs);
+      for (unsigned i = 0, e = ReMatedMIs.size(); i != e; ++i)
+        delete ReMatedMIs[i];
       return true;
     }
   private:
-    void RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM);
+    void RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM,
+                    std::vector<MachineInstr*> &ReMatedMIs);
   };
 }
 
@@ -338,8 +353,11 @@
     SpillSlotsAvailable[Slot] =
       std::make_pair((Reg << 1) | (unsigned)CanClobber, DefUses);
   
-    DOUT << "Remembering SS#" << Slot << " in physreg "
-         << MRI->getName(Reg) << "\n";
+    if (Slot > VirtRegMap::MAX_STACK_SLOT)
+      DOUT << "Remembering RM#" << Slot-VirtRegMap::MAX_STACK_SLOT-1;
+    else
+      DOUT << "Remembering SS#" << Slot;
+    DOUT << " in physreg " << MRI->getName(Reg) << "\n";
   }
 
   /// canClobberPhysReg - Return true if the spiller is allowed to change the 
@@ -405,7 +423,11 @@
            "Bidirectional map mismatch!");
     SpillSlotsAvailable.erase(Slot);
     DOUT << "PhysReg " << MRI->getName(PhysReg)
-         << " clobbered, invalidating SS#" << Slot << "\n";
+         << " clobbered, invalidating ";
+    if (Slot > VirtRegMap::MAX_STACK_SLOT)
+      DOUT << "RM#" << Slot-VirtRegMap::MAX_STACK_SLOT-1 << "\n";
+    else
+      DOUT << "SS#" << Slot << "\n";
   }
 }
 
@@ -599,7 +621,8 @@
 
 /// rewriteMBB - Keep track of which spills are available even after the
 /// register allocator is done with them.  If possible, avoid reloading vregs.
-void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM) {
+void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM,
+                              std::vector<MachineInstr*> &ReMatedMIs) {
 
   DOUT << MBB.getBasicBlock()->getName() << ":\n";
 
@@ -629,6 +652,27 @@
     // Loop over all of the implicit defs, clearing them from our available
     // sets.
     const TargetInstrDescriptor *TID = MI.getInstrDescriptor();
+
+    // If this instruction is being rematerialized, just remove it!
+    if (TID->Flags & M_REMATERIALIZIBLE) {
+      bool Remove = true;
+      for (unsigned i = 0, e = MI.getNumOperands(); i != e; ++i) {
+        MachineOperand &MO = MI.getOperand(i);
+        if (!MO.isRegister() || MO.getReg() == 0)
+          continue;   // Ignore non-register operands.
+        if (MO.isDef() && !VRM.isReMaterialized(MO.getReg())) {
+          Remove = false;
+          break;
+        }
+      }
+      if (Remove) {
+        VRM.RemoveFromFoldedVirtMap(&MI);
+        ReMatedMIs.push_back(MI.removeFromParent());
+        MII = NextMII;
+        continue;
+      }
+    }
+
     const unsigned *ImpDef = TID->ImplicitDefs;
     if (ImpDef) {
       for ( ; *ImpDef; ++ImpDef) {
@@ -670,6 +714,7 @@
       if (!MO.isUse())
         continue;  // Handle defs in the loop below (handle use&def here though)
 
+      bool doReMat = VRM.isReMaterialized(VirtReg);
       int StackSlot = VRM.getStackSlot(VirtReg);
       unsigned PhysReg;
 
@@ -695,7 +740,11 @@
         
         if (CanReuse) {
           // If this stack slot value is already available, reuse it!
-          DOUT << "Reusing SS#" << StackSlot << " from physreg "
+          if (StackSlot > VirtRegMap::MAX_STACK_SLOT)
+            DOUT << "Reusing RM#" << StackSlot-VirtRegMap::MAX_STACK_SLOT-1;
+          else
+            DOUT << "Reusing SS#" << StackSlot;
+          DOUT << " from physreg "
                << MRI->getName(PhysReg) << " for vreg"
                << VirtReg <<" instead of reloading into physreg "
                << MRI->getName(VRM.getPhys(VirtReg)) << "\n";
@@ -767,8 +816,11 @@
         // incoming, we don't need to inserted a dead copy.
         if (DesignatedReg == PhysReg) {
           // If this stack slot value is already available, reuse it!
-          DOUT << "Reusing SS#" << StackSlot << " from physreg "
-               << MRI->getName(PhysReg) << " for vreg"
+          if (StackSlot > VirtRegMap::MAX_STACK_SLOT)
+            DOUT << "Reusing RM#" << StackSlot-VirtRegMap::MAX_STACK_SLOT-1;
+          else
+            DOUT << "Reusing SS#" << StackSlot;
+          DOUT << " from physreg " << MRI->getName(PhysReg) << " for vreg"
                << VirtReg
                << " instead of reloading into same physreg.\n";
           MI.getOperand(i).setReg(PhysReg);
@@ -828,12 +880,16 @@
       
       PhysRegsUsed[PhysReg] = true;
       ReusedOperands.markClobbered(PhysReg);
-      MRI->loadRegFromStackSlot(MBB, &MI, PhysReg, StackSlot, RC);
+      if (doReMat)
+        MRI->reMaterialize(MBB, &MI, PhysReg, VRM.getReMaterializedMI(VirtReg));
+      else
+        MRI->loadRegFromStackSlot(MBB, &MI, PhysReg, StackSlot, RC);
       // This invalidates PhysReg.
       Spills.ClobberPhysReg(PhysReg);
 
       // Any stores to this stack slot are not dead anymore.
-      MaybeDeadStores.erase(StackSlot);
+      if (!doReMat)
+        MaybeDeadStores.erase(StackSlot);
       Spills.addAvailable(StackSlot, &MI, PhysReg);
       // Assumes this is the last use. IsKill will be unset if reg is reused
       // unless it's a two-address operand.


Index: llvm/lib/CodeGen/VirtRegMap.h
diff -u llvm/lib/CodeGen/VirtRegMap.h:1.26 llvm/lib/CodeGen/VirtRegMap.h:1.27
--- llvm/lib/CodeGen/VirtRegMap.h:1.26	Wed Jan 31 23:31:50 2007
+++ llvm/lib/CodeGen/VirtRegMap.h	Tue Mar 20 03:13:50 2007
@@ -18,6 +18,7 @@
 #define LLVM_CODEGEN_VIRTREGMAP_H
 
 #include "llvm/Target/MRegisterInfo.h"
+#include "llvm/ADT/BitVector.h"
 #include "llvm/ADT/IndexedMap.h"
 #include "llvm/Support/Streams.h"
 #include <map>
@@ -28,6 +29,12 @@
 
   class VirtRegMap {
   public:
+    enum {
+      NO_PHYS_REG = 0,
+      NO_STACK_SLOT = ~0 >> 1,
+      MAX_STACK_SLOT = (1 << 18)-1
+    };
+
     enum ModRef { isRef = 1, isMod = 2, isModRef = 3 };
     typedef std::multimap<MachineInstr*,
                           std::pair<unsigned, ModRef> > MI2VirtMapTy;
@@ -53,14 +60,20 @@
     /// read/written by this instruction.
     MI2VirtMapTy MI2VirtMap;
 
+    /// ReMatMap - This is irtual register to re-materialized instruction
+    /// mapping. Each virtual register whose definition is going to be
+    /// re-materialized has an entry in it.
+    std::map<unsigned, const MachineInstr*> ReMatMap;
+
+    /// ReMatId - Instead of assigning a stack slot to a to be rematerialized
+    /// virtaul register, an unique id is being assinged. This keeps track of
+    /// the highest id used so far. Note, this starts at (1<<18) to avoid
+    /// conflicts with stack slot numbers.
+    int ReMatId;
+
     VirtRegMap(const VirtRegMap&);     // DO NOT IMPLEMENT
     void operator=(const VirtRegMap&); // DO NOT IMPLEMENT
 
-    enum {
-      NO_PHYS_REG = 0,
-      NO_STACK_SLOT = ~0 >> 1
-    };
-
   public:
     VirtRegMap(MachineFunction &mf);
 
@@ -125,6 +138,29 @@
     /// the specified stack slot
     void assignVirt2StackSlot(unsigned virtReg, int frameIndex);
 
+    /// @brief assign an unique re-materialization id to the specified
+    /// virtual register.
+    int assignVirtReMatId(unsigned virtReg);
+
+    /// @brief returns true if the specified virtual register is being
+    /// re-materialized.
+    bool isReMaterialized(unsigned virtReg) const {
+      return ReMatMap.count(virtReg) != 0;
+    }
+
+    /// @brief returns the original machine instruction being re-issued
+    /// to re-materialize the specified virtual register.
+    const MachineInstr *getReMaterializedMI(unsigned virtReg) {
+      return ReMatMap[virtReg];
+    }
+
+    /// @brief records the specified virtual register will be
+    /// re-materialized and the original instruction which will be re-issed
+    /// for this purpose.
+    void setVirtIsReMaterialized(unsigned virtReg, MachineInstr *def) {
+      ReMatMap[virtReg] = def;
+    }
+
     /// @brief Updates information about the specified virtual register's value
     /// folded into newMI machine instruction.  The OpNum argument indicates the
     /// operand number of OldMI that is folded.





From baldrick at free.fr  Tue Mar 20 04:18:36 2007
From: baldrick at free.fr (Duncan Sands)
Date: Tue, 20 Mar 2007 10:18:36 +0100
Subject: [llvm-commits]
	=?iso-8859-1?q?llvm-gcc=3A_better_support_for_vari?=
	=?iso-8859-1?q?able_size_struct=09fields?=
In-Reply-To: <775D1826-6931-4F63-8CF3-04AE29A13D88@apple.com>
References: <200703061725.32640.baldrick@free.fr>
	<775D1826-6931-4F63-8CF3-04AE29A13D88@apple.com>
Message-ID: <200703201018.37697.baldrick@free.fr>

> Cool, thanks for applying this Devang,
> 
> Duncan, can you check in the testcases plz?

I'm waiting for the patch to hit the subversion mirror.

Ciao,

Duncan.


From baldrick at free.fr  Tue Mar 20 04:50:59 2007
From: baldrick at free.fr (Duncan Sands)
Date: Tue, 20 Mar 2007 04:50:59 -0500
Subject: [llvm-commits] CVS: llvm/test/AdaFrontend/array_range_ref.adb
Message-ID: <200703200950.l2K9oxOE017622@zion.cs.uiuc.edu>



Changes in directory llvm/test/AdaFrontend:

array_range_ref.adb added (r1.1)
---
Log message:

Test that ARRAY_RANGE_REF returns an array not an element.


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

 array_range_ref.adb |    7 +++++++
 1 files changed, 7 insertions(+)


Index: llvm/test/AdaFrontend/array_range_ref.adb
diff -c /dev/null llvm/test/AdaFrontend/array_range_ref.adb:1.1
*** /dev/null	Tue Mar 20 04:50:52 2007
--- llvm/test/AdaFrontend/array_range_ref.adb	Tue Mar 20 04:50:42 2007
***************
*** 0 ****
--- 1,7 ----
+ -- RUN: %llvmgcc -c %s -o /dev/null
+ procedure Array_Range_Ref is
+    A : String (1 .. 3);
+    B : String := A (A'RANGE)(1 .. 3);
+ begin
+    null;
+ end;





From baldrick at free.fr  Tue Mar 20 04:54:19 2007
From: baldrick at free.fr (Duncan Sands)
Date: Tue, 20 Mar 2007 04:54:19 -0500
Subject: [llvm-commits] CVS: llvm/test/AdaFrontend/var_size.adb var_size.ads
Message-ID: <200703200954.l2K9sJ0g017698@zion.cs.uiuc.edu>



Changes in directory llvm/test/AdaFrontend:

var_size.adb added (r1.1)
var_size.ads added (r1.1)
---
Log message:

Ada testcase for structs with multiple variable sized fields.


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

 var_size.adb |    7 +++++++
 var_size.ads |    7 +++++++
 2 files changed, 14 insertions(+)


Index: llvm/test/AdaFrontend/var_size.adb
diff -c /dev/null llvm/test/AdaFrontend/var_size.adb:1.1
*** /dev/null	Tue Mar 20 04:54:12 2007
--- llvm/test/AdaFrontend/var_size.adb	Tue Mar 20 04:54:02 2007
***************
*** 0 ****
--- 1,7 ----
+ -- RUN: %llvmgcc -c %s -o /dev/null
+ package body Var_Size is
+    function A (X : T) return String is
+    begin
+       return X.A;
+    end;
+ end;


Index: llvm/test/AdaFrontend/var_size.ads
diff -c /dev/null llvm/test/AdaFrontend/var_size.ads:1.1
*** /dev/null	Tue Mar 20 04:54:19 2007
--- llvm/test/AdaFrontend/var_size.ads	Tue Mar 20 04:54:02 2007
***************
*** 0 ****
--- 1,7 ----
+ package Var_Size is
+    type T (Length : Natural) is record
+       A : String (1 .. Length);
+       B : String (1 .. Length);
+    end record;
+    function A (X : T) return String;
+ end;





From zhousheng00 at gmail.com  Tue Mar 20 07:49:28 2007
From: zhousheng00 at gmail.com (Zhou Sheng)
Date: Tue, 20 Mar 2007 07:49:28 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703201249.l2KCnSmq021045@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.669 -> 1.670
---
Log message:

Simplify isHighOnes().


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

 InstructionCombining.cpp |   10 +---------
 1 files changed, 1 insertion(+), 9 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.669 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.670
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.669	Mon Mar 19 19:16:52 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Tue Mar 20 07:49:06 2007
@@ -3491,15 +3491,7 @@
 // isHighOnes - Return true if the constant is of the form 1+0+.
 // This is the same as lowones(~X).
 static bool isHighOnes(const ConstantInt *CI) {
-  if (CI->getValue() == 0) return false;  // 0's does not match "1+"
-
-  APInt V(~CI->getValue());
-
-  // There won't be bits set in parts that the type doesn't contain.
-  V &= APInt::getAllOnesValue(CI->getType()->getBitWidth());
-
-  APInt U(V+1);  // If it is low ones, this should be a power of two.
-  return (U!=0) && (V!=0) && (U & V) == 0;
+  return (~CI->getValue() + 1).isPowerOf2();
 }
 
 /// getICmpCode - Encode a icmp predicate into a three bit mask.  These bits





From baldrick at free.fr  Tue Mar 20 09:13:41 2007
From: baldrick at free.fr (Duncan Sands)
Date: Tue, 20 Mar 2007 09:13:41 -0500
Subject: [llvm-commits] CVS:
	llvm/test/CFrontend/2007-03-06-VarSizeInStruct1.c
	2007-03-06-VarSizeInStruct2.c
Message-ID: <200703201413.l2KEDfwZ022720@zion.cs.uiuc.edu>



Changes in directory llvm/test/CFrontend:

2007-03-06-VarSizeInStruct1.c added (r1.1)
2007-03-06-VarSizeInStruct2.c added (r1.1)
---
Log message:

Test handling of structs with multiple variable-sized fields.


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

 2007-03-06-VarSizeInStruct1.c |    8 ++++++++
 2007-03-06-VarSizeInStruct2.c |    8 ++++++++
 2 files changed, 16 insertions(+)


Index: llvm/test/CFrontend/2007-03-06-VarSizeInStruct1.c
diff -c /dev/null llvm/test/CFrontend/2007-03-06-VarSizeInStruct1.c:1.1
*** /dev/null	Tue Mar 20 09:13:30 2007
--- llvm/test/CFrontend/2007-03-06-VarSizeInStruct1.c	Tue Mar 20 09:13:20 2007
***************
*** 0 ****
--- 1,8 ----
+ // RUN: %llvmgcc %s -S -o -
+ void* p (int n) {
+   struct f {
+     char w; char x[n]; char z[];
+   } F;
+   F.x[0]='x';
+   return &F;
+ }


Index: llvm/test/CFrontend/2007-03-06-VarSizeInStruct2.c
diff -c /dev/null llvm/test/CFrontend/2007-03-06-VarSizeInStruct2.c:1.1
*** /dev/null	Tue Mar 20 09:13:41 2007
--- llvm/test/CFrontend/2007-03-06-VarSizeInStruct2.c	Tue Mar 20 09:13:20 2007
***************
*** 0 ****
--- 1,8 ----
+ // RUN: %llvmgcc %s -S -o -
+ char p (int n) {
+   struct f {
+     char w; char x[n]; char y[n];
+   } F;
+ 
+   return F.x[0];
+ }





From asl at math.spbu.ru  Tue Mar 20 11:29:45 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Tue, 20 Mar 2007 19:29:45 +0300
Subject: [llvm-commits] SwitchLowering refactoring patch for review
Message-ID: <1174408185.9390.132.camel@asl.dorms.spbu.ru>

Hello, Everyone.

The prev. message from me was sent from obsolete e-mail address.

This is the first patch targeting switch lowering refactoring as
indicated in PR926.

Currently it implements "worklist" strategy, where we're deciding either
emit JT or split the case range or each step (not only in the early
beginning). Also, I've included some heuristic to calculate pivot:
maximise sum of densities of RHS & LHS. This lead to unbalanced tree,
but really increase chances of JT emission in the future.

E.g. we split switch (0-5, 120-126, 1024) into 2 JT's and 1 specific
comparison + some "glue" code to discriminate cases.

Tested with:

1. llvm-gcc bootstrap
2. Building mozilla & qt with bootstrapped compiler.

-- 
With best regards, Anton Korobeynikov.

Faculty of Mathematics & Mechanics, Saint Petersburg State University.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: switch-lower-refactoring.diff
Type: text/x-patch
Size: 29118 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070320/a691a057/attachment.bin 

From asl at sophsolutions.com  Tue Mar 20 11:21:47 2007
From: asl at sophsolutions.com (aSL)
Date: Tue, 20 Mar 2007 19:21:47 +0300
Subject: [llvm-commits] SwitchLowering refactoring patch for review
Message-ID: <1174407707.9390.128.camel@asl.dorms.spbu.ru>

Hello, Everyone.

This is the first patch targeting switch lowering refactoring as
indicated in PR926.

Currently it implements "worklist" strategy, where we're deciding either
emit JT or split the case range or each step (not only in the early
beginning). Also, I've included some heuristic to calculate pivot:
maximise sum of densities of RHS & LHS. This lead to unbalanced tree,
but really increase chances of JT emission in the future.

E.g. we split switch (0-5, 120-126, 1024) into 2 JT's and 1 specific
comparison + some "glue" code to discriminate cases.

Tested with:

1. llvm-gcc bootstrap
2. Building mozilla & qt with bootstrapped compiler.

 
-- 
With best regards, Anton Korobeynikov.

Faculty of Mathematics & Mechanics, Saint Petersburg State University.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: switch-lower-refactoring.diff
Type: text/x-patch
Size: 29118 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070320/6d077dd8/attachment.bin 

From lauro.venancio at gmail.com  Tue Mar 20 11:47:04 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Tue, 20 Mar 2007 11:47:04 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
Message-ID: <200703201647.l2KGl4xf026041@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

ScheduleDAG.cpp updated: 1.122 -> 1.123
---
Log message:

CopyToReg source operand can be a physical register.


---
Diffs of the changes:  (+19 -3)

 ScheduleDAG.cpp |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.122 llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.123
--- llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.122	Sat Feb 17 00:38:37 2007
+++ llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp	Tue Mar 20 11:46:44 2007
@@ -475,9 +475,25 @@
       else
         InReg = getVR(Node->getOperand(2), VRBaseMap);
       unsigned DestReg = cast<RegisterSDNode>(Node->getOperand(1))->getReg();
-      if (InReg != DestReg)   // Coalesced away the copy?
-        MRI->copyRegToReg(*BB, BB->end(), DestReg, InReg,
-                          RegMap->getRegClass(InReg));
+      if (InReg != DestReg)  {// Coalesced away the copy?
+        const TargetRegisterClass *TRC = 0;
+        // Get the target register class
+        if (MRegisterInfo::isVirtualRegister(InReg)) {
+          TRC = RegMap->getRegClass(InReg);
+        } else {
+          // Pick the register class of the right type that contains this
+          // physreg.
+          for (MRegisterInfo::regclass_iterator I = MRI->regclass_begin(),
+                 E = MRI->regclass_end(); I != E; ++I)
+            if ((*I)->hasType(Node->getOperand(2).getValueType()) &&
+                (*I)->contains(InReg)) {
+              TRC = *I;
+              break;
+            }
+          assert(TRC && "Couldn't find register class for reg copy!");
+        }
+        MRI->copyRegToReg(*BB, BB->end(), DestReg, InReg, TRC);
+      }
       break;
     }
     case ISD::CopyFromReg: {





From reid at x10sys.com  Tue Mar 20 12:18:53 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 12:18:53 -0500
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.y
Message-ID: <200703201718.l2KHIrK4026797@zion.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

llvmAsmParser.y updated: 1.330 -> 1.331
---
Log message:

Don't delete things before their last use (avoids bad reads).


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

 llvmAsmParser.y |    2 --
 1 files changed, 2 deletions(-)


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.330 llvm/lib/AsmParser/llvmAsmParser.y:1.331
--- llvm/lib/AsmParser/llvmAsmParser.y:1.330	Mon Mar 19 20:13:00 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y	Tue Mar 20 12:18:33 2007
@@ -1302,7 +1302,6 @@
     Attrs.push_back($5);
     for (TypeWithAttrsList::iterator I=$3->begin(), E=$3->end(); I != E; ++I) {
       const Type *Ty = I->Ty->get();
-      delete I->Ty; I->Ty = 0;
       Params.push_back(Ty);
       if (Ty != Type::VoidTy)
         Attrs.push_back(I->Attrs);
@@ -1322,7 +1321,6 @@
     Attrs.push_back($5);
     for (TypeWithAttrsList::iterator I=$3->begin(), E=$3->end(); I != E; ++I) {
       const Type* Ty = I->Ty->get();
-      delete I->Ty; I->Ty = 0;
       Params.push_back(Ty);
       if (Ty != Type::VoidTy)
         Attrs.push_back(I->Attrs);





From reid at x10sys.com  Tue Mar 20 12:19:52 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 12:19:52 -0500
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
	llvmAsmParser.y.cvs
Message-ID: <200703201719.l2KHJquC026837@zion.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

llvmAsmParser.cpp.cvs updated: 1.75 -> 1.76
llvmAsmParser.y.cvs updated: 1.76 -> 1.77
---
Log message:

Regenerate.


---
Diffs of the changes:  (+172 -176)

 llvmAsmParser.cpp.cvs |  346 ++++++++++++++++++++++++--------------------------
 llvmAsmParser.y.cvs   |    2 
 2 files changed, 172 insertions(+), 176 deletions(-)


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.75 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.76
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.75	Mon Mar 19 20:13:36 2007
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Tue Mar 20 12:19:31 2007
@@ -1699,23 +1699,23 @@
     1185,  1186,  1187,  1194,  1195,  1196,  1197,  1200,  1201,  1206,
     1207,  1210,  1211,  1218,  1219,  1225,  1226,  1234,  1242,  1243,
     1248,  1249,  1250,  1255,  1268,  1268,  1268,  1268,  1271,  1275,
-    1279,  1286,  1291,  1299,  1319,  1339,  1344,  1356,  1366,  1370,
-    1380,  1387,  1394,  1401,  1406,  1411,  1418,  1419,  1426,  1433,
-    1441,  1447,  1459,  1487,  1503,  1532,  1560,  1585,  1604,  1630,
-    1650,  1662,  1669,  1735,  1745,  1755,  1761,  1771,  1777,  1787,
-    1792,  1797,  1805,  1817,  1839,  1847,  1853,  1864,  1869,  1874,
-    1880,  1886,  1895,  1899,  1907,  1907,  1918,  1923,  1931,  1932,
-    1936,  1936,  1940,  1940,  1943,  1946,  1958,  1982,  1993,  1993,
-    2003,  2003,  2011,  2011,  2021,  2024,  2030,  2043,  2047,  2052,
-    2054,  2059,  2064,  2073,  2083,  2094,  2098,  2107,  2116,  2121,
-    2233,  2233,  2235,  2244,  2244,  2246,  2251,  2263,  2267,  2272,
-    2276,  2280,  2284,  2288,  2292,  2296,  2300,  2304,  2329,  2333,
-    2347,  2351,  2355,  2359,  2365,  2365,  2371,  2380,  2384,  2393,
-    2402,  2411,  2415,  2420,  2424,  2428,  2433,  2443,  2462,  2471,
-    2540,  2544,  2551,  2562,  2575,  2585,  2596,  2606,  2615,  2624,
-    2627,  2628,  2635,  2639,  2644,  2665,  2682,  2696,  2710,  2722,
-    2730,  2737,  2743,  2749,  2755,  2770,  2834,  2839,  2843,  2850,
-    2857,  2865,  2872,  2880,  2888,  2902,  2919
+    1279,  1286,  1291,  1299,  1318,  1337,  1342,  1354,  1364,  1368,
+    1378,  1385,  1392,  1399,  1404,  1409,  1416,  1417,  1424,  1431,
+    1439,  1445,  1457,  1485,  1501,  1530,  1558,  1583,  1602,  1628,
+    1648,  1660,  1667,  1733,  1743,  1753,  1759,  1769,  1775,  1785,
+    1790,  1795,  1803,  1815,  1837,  1845,  1851,  1862,  1867,  1872,
+    1878,  1884,  1893,  1897,  1905,  1905,  1916,  1921,  1929,  1930,
+    1934,  1934,  1938,  1938,  1941,  1944,  1956,  1980,  1991,  1991,
+    2001,  2001,  2009,  2009,  2019,  2022,  2028,  2041,  2045,  2050,
+    2052,  2057,  2062,  2071,  2081,  2092,  2096,  2105,  2114,  2119,
+    2231,  2231,  2233,  2242,  2242,  2244,  2249,  2261,  2265,  2270,
+    2274,  2278,  2282,  2286,  2290,  2294,  2298,  2302,  2327,  2331,
+    2345,  2349,  2353,  2357,  2363,  2363,  2369,  2378,  2382,  2391,
+    2400,  2409,  2413,  2418,  2422,  2426,  2431,  2441,  2460,  2469,
+    2538,  2542,  2549,  2560,  2573,  2583,  2594,  2604,  2613,  2622,
+    2625,  2626,  2633,  2637,  2642,  2663,  2680,  2694,  2708,  2720,
+    2728,  2735,  2741,  2747,  2753,  2768,  2832,  2837,  2841,  2848,
+    2855,  2863,  2870,  2878,  2886,  2900,  2917
 };
 #endif
 
@@ -3518,7 +3518,6 @@
     Attrs.push_back((yyvsp[0].ParamAttrs));
     for (TypeWithAttrsList::iterator I=(yyvsp[-2].TypeWithAttrsList)->begin(), E=(yyvsp[-2].TypeWithAttrsList)->end(); I != E; ++I) {
       const Type *Ty = I->Ty->get();
-      delete I->Ty; I->Ty = 0;
       Params.push_back(Ty);
       if (Ty != Type::VoidTy)
         Attrs.push_back(I->Attrs);
@@ -3535,14 +3534,13 @@
     break;
 
   case 124:
-#line 1319 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1318 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Params;
     std::vector<FunctionType::ParameterAttributes> Attrs;
     Attrs.push_back((yyvsp[0].ParamAttrs));
     for (TypeWithAttrsList::iterator I=(yyvsp[-2].TypeWithAttrsList)->begin(), E=(yyvsp[-2].TypeWithAttrsList)->end(); I != E; ++I) {
       const Type* Ty = I->Ty->get();
-      delete I->Ty; I->Ty = 0;
       Params.push_back(Ty);
       if (Ty != Type::VoidTy)
         Attrs.push_back(I->Attrs);
@@ -3558,7 +3556,7 @@
     break;
 
   case 125:
-#line 1339 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1337 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
     delete (yyvsp[-1].TypeVal);
@@ -3567,7 +3565,7 @@
     break;
 
   case 126:
-#line 1344 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1342 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {          // Vector type?
      const llvm::Type* ElemTy = (yyvsp[-1].TypeVal)->get();
      if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
@@ -3583,7 +3581,7 @@
     break;
 
   case 127:
-#line 1356 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1354 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
@@ -3597,7 +3595,7 @@
     break;
 
   case 128:
-#line 1366 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1364 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
@@ -3605,7 +3603,7 @@
     break;
 
   case 129:
-#line 1370 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1368 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-2].TypeList)->begin(),
@@ -3619,7 +3617,7 @@
     break;
 
   case 130:
-#line 1380 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1378 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
@@ -3627,7 +3625,7 @@
     break;
 
   case 131:
-#line 1387 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1385 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     (yyval.TypeWithAttrs).Ty = (yyvsp[-1].TypeVal); 
     (yyval.TypeWithAttrs).Attrs = (yyvsp[0].ParamAttrs); 
@@ -3635,7 +3633,7 @@
     break;
 
   case 132:
-#line 1394 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1392 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -3646,14 +3644,14 @@
     break;
 
   case 133:
-#line 1401 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1399 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
   case 134:
-#line 1406 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1404 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     (yyval.TypeWithAttrsList)->push_back((yyvsp[0].TypeWithAttrs));
@@ -3662,7 +3660,7 @@
     break;
 
   case 135:
-#line 1411 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1409 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList))->push_back((yyvsp[0].TypeWithAttrs));
     CHECK_FOR_ERROR
@@ -3670,7 +3668,7 @@
     break;
 
   case 137:
-#line 1419 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1417 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet;
@@ -3681,7 +3679,7 @@
     break;
 
   case 138:
-#line 1426 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1424 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet;
@@ -3692,7 +3690,7 @@
     break;
 
   case 139:
-#line 1433 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1431 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
@@ -3700,7 +3698,7 @@
     break;
 
   case 140:
-#line 1441 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1439 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[0].TypeVal)); 
@@ -3710,7 +3708,7 @@
     break;
 
   case 141:
-#line 1447 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1445 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(*(yyvsp[0].TypeVal)); 
     delete (yyvsp[0].TypeVal);
@@ -3719,7 +3717,7 @@
     break;
 
   case 142:
-#line 1459 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1457 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -3751,7 +3749,7 @@
     break;
 
   case 143:
-#line 1487 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1485 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -3771,7 +3769,7 @@
     break;
 
   case 144:
-#line 1503 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1501 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -3804,7 +3802,7 @@
     break;
 
   case 145:
-#line 1532 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1530 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -3836,7 +3834,7 @@
     break;
 
   case 146:
-#line 1560 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1558 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal)->get());
     if (STy == 0)
@@ -3865,7 +3863,7 @@
     break;
 
   case 147:
-#line 1585 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1583 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -3888,7 +3886,7 @@
     break;
 
   case 148:
-#line 1604 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1602 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-5].TypeVal)->get());
     if (STy == 0)
@@ -3918,7 +3916,7 @@
     break;
 
   case 149:
-#line 1630 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1628 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
@@ -3942,7 +3940,7 @@
     break;
 
   case 150:
-#line 1650 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1648 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -3958,7 +3956,7 @@
     break;
 
   case 151:
-#line 1662 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1660 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -3969,7 +3967,7 @@
     break;
 
   case 152:
-#line 1669 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1667 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4039,7 +4037,7 @@
     break;
 
   case 153:
-#line 1735 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1733 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4053,7 +4051,7 @@
     break;
 
   case 154:
-#line 1745 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1743 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4067,7 +4065,7 @@
     break;
 
   case 155:
-#line 1755 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1753 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
@@ -4077,7 +4075,7 @@
     break;
 
   case 156:
-#line 1761 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1759 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth();
     if ((yyvsp[0].APIntVal)->getBitWidth() > BitWidth) {
@@ -4091,7 +4089,7 @@
     break;
 
   case 157:
-#line 1771 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1769 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
@@ -4101,7 +4099,7 @@
     break;
 
   case 158:
-#line 1777 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1775 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth();
     if ((yyvsp[0].APIntVal)->getBitWidth() > BitWidth) {
@@ -4115,7 +4113,7 @@
     break;
 
   case 159:
-#line 1787 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1785 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     assert(cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?");
     (yyval.ConstVal) = ConstantInt::getTrue();
@@ -4124,7 +4122,7 @@
     break;
 
   case 160:
-#line 1792 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1790 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     assert(cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?");
     (yyval.ConstVal) = ConstantInt::getFalse();
@@ -4133,7 +4131,7 @@
     break;
 
   case 161:
-#line 1797 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1795 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Float & Double constants
     if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].FPVal)))
       GEN_ERROR("Floating point constant invalid for type");
@@ -4143,7 +4141,7 @@
     break;
 
   case 162:
-#line 1805 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1803 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4159,7 +4157,7 @@
     break;
 
   case 163:
-#line 1817 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1815 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-2].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
@@ -4185,7 +4183,7 @@
     break;
 
   case 164:
-#line 1839 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1837 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-5].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
@@ -4197,7 +4195,7 @@
     break;
 
   case 165:
-#line 1847 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1845 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
@@ -4207,7 +4205,7 @@
     break;
 
   case 166:
-#line 1853 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1851 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
@@ -4222,7 +4220,7 @@
     break;
 
   case 167:
-#line 1864 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1862 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
@@ -4231,7 +4229,7 @@
     break;
 
   case 168:
-#line 1869 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1867 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
@@ -4240,7 +4238,7 @@
     break;
 
   case 169:
-#line 1874 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1872 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -4250,7 +4248,7 @@
     break;
 
   case 170:
-#line 1880 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1878 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -4260,7 +4258,7 @@
     break;
 
   case 171:
-#line 1886 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1884 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -4270,7 +4268,7 @@
     break;
 
   case 172:
-#line 1895 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1893 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
@@ -4278,7 +4276,7 @@
     break;
 
   case 173:
-#line 1899 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1897 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
@@ -4287,17 +4285,17 @@
     break;
 
   case 174:
-#line 1907 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1905 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 175:
-#line 1907 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1905 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 176:
-#line 1918 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1916 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4306,7 +4304,7 @@
     break;
 
   case 177:
-#line 1923 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1921 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4315,12 +4313,12 @@
     break;
 
   case 180:
-#line 1936 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1934 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
   case 181:
-#line 1936 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1934 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
@@ -4328,26 +4326,26 @@
     break;
 
   case 182:
-#line 1940 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1938 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
   case 183:
-#line 1940 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1938 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 184:
-#line 1943 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1941 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 185:
-#line 1946 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1944 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     // Emit an error if there are any unresolved types left.
     if (!CurModule.LateResolveTypes.empty()) {
@@ -4363,7 +4361,7 @@
     break;
 
   case 186:
-#line 1958 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1956 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -4391,7 +4389,7 @@
     break;
 
   case 187:
-#line 1982 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1980 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[-2].StrVal), (yyvsp[0].PrimType));
 
@@ -4406,7 +4404,7 @@
     break;
 
   case 188:
-#line 1993 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1991 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     /* "Externally Visible" Linkage */
     if ((yyvsp[0].ConstVal) == 0) 
@@ -4418,14 +4416,14 @@
     break;
 
   case 189:
-#line 2000 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 1998 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 190:
-#line 2003 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2001 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
@@ -4435,14 +4433,14 @@
     break;
 
   case 191:
-#line 2008 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2006 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 192:
-#line 2011 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2009 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -4453,7 +4451,7 @@
     break;
 
   case 193:
-#line 2017 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2015 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
@@ -4461,21 +4459,21 @@
     break;
 
   case 194:
-#line 2021 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2019 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 195:
-#line 2024 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2022 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
   case 196:
-#line 2030 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2028 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
@@ -4491,7 +4489,7 @@
     break;
 
   case 197:
-#line 2043 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2041 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -4499,7 +4497,7 @@
     break;
 
   case 198:
-#line 2047 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2045 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -4507,7 +4505,7 @@
     break;
 
   case 200:
-#line 2054 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2052 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4516,7 +4514,7 @@
     break;
 
   case 201:
-#line 2059 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2057 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4525,14 +4523,14 @@
     break;
 
   case 202:
-#line 2064 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2062 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
   case 203:
-#line 2073 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2071 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -4546,7 +4544,7 @@
     break;
 
   case 204:
-#line 2083 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2081 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -4560,7 +4558,7 @@
     break;
 
   case 205:
-#line 2094 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2092 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[0].ArgList);
     CHECK_FOR_ERROR
@@ -4568,7 +4566,7 @@
     break;
 
   case 206:
-#line 2098 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2096 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     struct ArgListEntry E;
@@ -4581,7 +4579,7 @@
     break;
 
   case 207:
-#line 2107 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2105 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -4594,7 +4592,7 @@
     break;
 
   case 208:
-#line 2116 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2114 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
@@ -4602,7 +4600,7 @@
     break;
 
   case 209:
-#line 2122 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2120 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   UnEscapeLexed((yyvsp[-6].StrVal));
   std::string FunctionName((yyvsp[-6].StrVal));
@@ -4716,7 +4714,7 @@
     break;
 
   case 212:
-#line 2235 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2233 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -4728,7 +4726,7 @@
     break;
 
   case 215:
-#line 2246 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2244 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   CHECK_FOR_ERROR
@@ -4736,7 +4734,7 @@
     break;
 
   case 216:
-#line 2251 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2249 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[-2].Linkage));
     CurFun.CurrentFunction->setVisibility((yyvsp[-1].Visibility));
@@ -4747,7 +4745,7 @@
     break;
 
   case 217:
-#line 2263 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2261 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -4755,7 +4753,7 @@
     break;
 
   case 218:
-#line 2267 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2265 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -4763,7 +4761,7 @@
     break;
 
   case 219:
-#line 2272 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2270 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val));
     CHECK_FOR_ERROR
@@ -4771,7 +4769,7 @@
     break;
 
   case 220:
-#line 2276 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2274 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
     CHECK_FOR_ERROR
@@ -4779,7 +4777,7 @@
     break;
 
   case 221:
-#line 2280 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2278 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal));
     CHECK_FOR_ERROR
@@ -4787,7 +4785,7 @@
     break;
 
   case 222:
-#line 2284 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2282 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
@@ -4795,7 +4793,7 @@
     break;
 
   case 223:
-#line 2288 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2286 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
@@ -4803,7 +4801,7 @@
     break;
 
   case 224:
-#line 2292 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2290 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
@@ -4811,7 +4809,7 @@
     break;
 
   case 225:
-#line 2296 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2294 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
@@ -4819,7 +4817,7 @@
     break;
 
   case 226:
-#line 2300 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2298 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
@@ -4827,7 +4825,7 @@
     break;
 
   case 227:
-#line 2304 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2302 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType();
     int NumElements = (yyvsp[-1].ConstVector)->size(); 
@@ -4856,7 +4854,7 @@
     break;
 
   case 228:
-#line 2329 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2327 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
@@ -4864,7 +4862,7 @@
     break;
 
   case 229:
-#line 2333 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2331 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
     std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
@@ -4878,7 +4876,7 @@
     break;
 
   case 230:
-#line 2347 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2345 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::createLocalID((yyvsp[0].UIntVal));
     CHECK_FOR_ERROR
@@ -4886,7 +4884,7 @@
     break;
 
   case 231:
-#line 2351 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2349 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[0].UIntVal));
     CHECK_FOR_ERROR
@@ -4894,7 +4892,7 @@
     break;
 
   case 232:
-#line 2355 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2353 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createLocalName((yyvsp[0].StrVal));
     CHECK_FOR_ERROR
@@ -4902,7 +4900,7 @@
     break;
 
   case 233:
-#line 2359 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2357 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createGlobalName((yyvsp[0].StrVal));
     CHECK_FOR_ERROR
@@ -4910,7 +4908,7 @@
     break;
 
   case 236:
-#line 2371 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2369 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4921,7 +4919,7 @@
     break;
 
   case 237:
-#line 2380 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2378 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
@@ -4929,7 +4927,7 @@
     break;
 
   case 238:
-#line 2384 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2382 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
@@ -4937,7 +4935,7 @@
     break;
 
   case 239:
-#line 2393 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2391 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
     CHECK_FOR_ERROR
@@ -4949,7 +4947,7 @@
     break;
 
   case 240:
-#line 2402 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2400 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[0].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -4962,7 +4960,7 @@
     break;
 
   case 241:
-#line 2411 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2409 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
@@ -4970,7 +4968,7 @@
     break;
 
   case 242:
-#line 2415 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2413 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName((yyvsp[0].StrVal)));
     CHECK_FOR_ERROR
@@ -4978,7 +4976,7 @@
     break;
 
   case 243:
-#line 2420 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2418 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {              // Return with a result...
     (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
@@ -4986,7 +4984,7 @@
     break;
 
   case 244:
-#line 2424 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2422 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
     (yyval.TermInstVal) = new ReturnInst();
     CHECK_FOR_ERROR
@@ -4994,7 +4992,7 @@
     break;
 
   case 245:
-#line 2428 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2426 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
@@ -5003,7 +5001,7 @@
     break;
 
   case 246:
-#line 2433 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2431 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {  
     assert(cast<IntegerType>((yyvsp[-7].PrimType))->getBitWidth() == 1 && "Not Bool?");
     BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
@@ -5017,7 +5015,7 @@
     break;
 
   case 247:
-#line 2443 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2441 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-7].PrimType), (yyvsp[-6].ValIDVal));
     CHECK_FOR_ERROR
@@ -5040,7 +5038,7 @@
     break;
 
   case 248:
-#line 2462 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2460 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-6].PrimType), (yyvsp[-5].ValIDVal));
     CHECK_FOR_ERROR
@@ -5053,7 +5051,7 @@
     break;
 
   case 249:
-#line 2472 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2470 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -5125,7 +5123,7 @@
     break;
 
   case 250:
-#line 2540 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2538 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
@@ -5133,7 +5131,7 @@
     break;
 
   case 251:
-#line 2544 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2542 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
@@ -5141,7 +5139,7 @@
     break;
 
   case 252:
-#line 2551 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2549 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[-5].JumpTable);
     Constant *V = cast<Constant>(getExistingVal((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -5156,7 +5154,7 @@
     break;
 
   case 253:
-#line 2562 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2560 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getExistingVal((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -5172,7 +5170,7 @@
     break;
 
   case 254:
-#line 2575 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2573 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
     setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal));
@@ -5184,7 +5182,7 @@
     break;
 
   case 255:
-#line 2585 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2583 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-5].TypeVal))->getDescription());
@@ -5199,7 +5197,7 @@
     break;
 
   case 256:
-#line 2596 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2594 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.PHIList) = (yyvsp[-6].PHIList);
     Value* tmpVal = getVal((yyvsp[-6].PHIList)->front().first->getType(), (yyvsp[-3].ValIDVal));
@@ -5211,7 +5209,7 @@
     break;
 
   case 257:
-#line 2606 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2604 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5224,7 +5222,7 @@
     break;
 
   case 258:
-#line 2615 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2613 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5237,17 +5235,17 @@
     break;
 
   case 259:
-#line 2624 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2622 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueRefList) = new ValueRefList(); ;}
     break;
 
   case 260:
-#line 2627 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2625 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
   case 261:
-#line 2628 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2626 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[-2].ValueList);
     (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
@@ -5256,7 +5254,7 @@
     break;
 
   case 262:
-#line 2635 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2633 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5264,7 +5262,7 @@
     break;
 
   case 263:
-#line 2639 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2637 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5272,7 +5270,7 @@
     break;
 
   case 264:
-#line 2644 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2642 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5297,7 +5295,7 @@
     break;
 
   case 265:
-#line 2665 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2663 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5318,7 +5316,7 @@
     break;
 
   case 266:
-#line 2682 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2680 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5336,7 +5334,7 @@
     break;
 
   case 267:
-#line 2696 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2694 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5354,7 +5352,7 @@
     break;
 
   case 268:
-#line 2710 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2708 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -5370,7 +5368,7 @@
     break;
 
   case 269:
-#line 2722 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2720 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-4].ValueVal)->getType() != Type::Int1Ty)
       GEN_ERROR("select condition must be boolean");
@@ -5382,7 +5380,7 @@
     break;
 
   case 270:
-#line 2730 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2728 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -5393,7 +5391,7 @@
     break;
 
   case 271:
-#line 2737 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2735 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -5403,7 +5401,7 @@
     break;
 
   case 272:
-#line 2743 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2741 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -5413,7 +5411,7 @@
     break;
 
   case 273:
-#line 2749 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2747 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -5423,7 +5421,7 @@
     break;
 
   case 274:
-#line 2755 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2753 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[0].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -5442,7 +5440,7 @@
     break;
 
   case 275:
-#line 2771 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2769 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -5509,7 +5507,7 @@
     break;
 
   case 276:
-#line 2834 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2832 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[0].InstVal);
     CHECK_FOR_ERROR
@@ -5517,7 +5515,7 @@
     break;
 
   case 277:
-#line 2839 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2837 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
@@ -5525,7 +5523,7 @@
     break;
 
   case 278:
-#line 2843 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2841 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
@@ -5533,7 +5531,7 @@
     break;
 
   case 279:
-#line 2850 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2848 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5544,7 +5542,7 @@
     break;
 
   case 280:
-#line 2857 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2855 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
@@ -5556,7 +5554,7 @@
     break;
 
   case 281:
-#line 2865 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2863 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5567,7 +5565,7 @@
     break;
 
   case 282:
-#line 2872 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2870 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
@@ -5579,7 +5577,7 @@
     break;
 
   case 283:
-#line 2880 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2878 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[0].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -5590,7 +5588,7 @@
     break;
 
   case 284:
-#line 2888 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2886 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5608,7 +5606,7 @@
     break;
 
   case 285:
-#line 2902 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2900 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5629,7 +5627,7 @@
     break;
 
   case 286:
-#line 2919 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2917 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5652,7 +5650,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 5656 "llvmAsmParser.tab.c"
+#line 5654 "llvmAsmParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -5920,7 +5918,7 @@
 }
 
 
-#line 2936 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2934 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.76 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.77
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.76	Mon Mar 19 20:13:36 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Tue Mar 20 12:19:31 2007
@@ -1302,7 +1302,6 @@
     Attrs.push_back($5);
     for (TypeWithAttrsList::iterator I=$3->begin(), E=$3->end(); I != E; ++I) {
       const Type *Ty = I->Ty->get();
-      delete I->Ty; I->Ty = 0;
       Params.push_back(Ty);
       if (Ty != Type::VoidTy)
         Attrs.push_back(I->Attrs);
@@ -1322,7 +1321,6 @@
     Attrs.push_back($5);
     for (TypeWithAttrsList::iterator I=$3->begin(), E=$3->end(); I != E; ++I) {
       const Type* Ty = I->Ty->get();
-      delete I->Ty; I->Ty = 0;
       Params.push_back(Ty);
       if (Ty != Type::VoidTy)
         Attrs.push_back(I->Attrs);





From reid at x10sys.com  Tue Mar 20 12:27:41 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 12:27:41 -0500
Subject: [llvm-commits] CVS:
	llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx
Message-ID: <200703201727.l2KHRfc1027070@zion.cs.uiuc.edu>



Changes in directory llvm/test/Assembler:

2003-12-30-TypeMapInvalidMemory.llx updated: 1.5 -> 1.6
---
Log message:

Break up huge line so that this file is almost readable.


---
Diffs of the changes:  (+52 -2)

 2003-12-30-TypeMapInvalidMemory.llx |   54 ++++++++++++++++++++++++++++++++++--
 1 files changed, 52 insertions(+), 2 deletions(-)


Index: llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx
diff -u llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx:1.5 llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx:1.6
--- llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx:1.5	Fri Jan 26 02:25:05 2007
+++ llvm/test/Assembler/2003-12-30-TypeMapInvalidMemory.llx	Tue Mar 20 12:27:19 2007
@@ -1,6 +1,56 @@
-; RUN: llvm-as      2>&1 < %s -o /dev/null -f | grep 'Reference to an undef'
+; RUN: llvm-as  2>&1 < %s -o /dev/null -f | grep 'Reference to an undef'
 
+ at d_reduction_0_dparser_gram = global { 
+  i32 (i8*, i8**, i32, i32, { 
+    %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, %struct.D_Scope*, 
+    void (\4)*, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, 
+      void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, 
+      %struct.ParseNode_User }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, 
+        %struct.D_Scope*, void (\9, %struct.d_loc_t*, i8**)*, %struct.Grammar*,
+        %struct.ParseNode_User }**)*, 
+        void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, 
+          void (\8, %struct.d_loc_t*, i8**)*, 
+          %struct.Grammar*, %struct.ParseNode_User }*)*, 
+        %struct.d_loc_t, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32,
+        i32 }*)*, 
+        i32 (i8*, i8**, i32, i32, { %struct.Grammar*, 
+        void (\4, %struct.d_loc_t*, i8**)*, %struct.D_Scope*, void (\4)*, { 
+          i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, 
+          void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, 
+          %struct.ParseNode_User }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, 
+            %struct.D_Scope*, void (\9, %struct.d_loc_t*, i8**)*, 
+            %struct.Grammar*, %struct.ParseNode_User }**)*, 
+            void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, 
+              void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, 
+              %struct.ParseNode_User }*)*, %struct.d_loc_t, i32, i32, i32, i32,
+              i32, i32, i32, i32, i32, i32, i32, i32 }*)** }
 
- at d_reduction_0_dparser_gram = global { i32 (i8*, i8**, i32, i32, { %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, %struct.D_Scope*, void (\4)*, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }*)*, i32 (i8*, i8**, i32, i32, { %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, %struct.D_Scope*, void (\4)*, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, i8!
 **)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }*)** } { i32 (i8*, i8**, i32, i32, { %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, %struct.D_Scope*, void (\4)*, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }*)* null, i32 (i8*, i8**, i32, i32, { %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, %struct!
 .D_Scope*, void (\4)*, { i32, %struct.d_loc_t, i8*, i8*, %stru!
 ct.D_Sco
pe*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\9, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }**)*, void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, %struct.ParseNode_User }*)*, %struct.d_loc_t, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 }*)** null }
+        { i32 (i8*, i8**, i32, i32, { 
+          %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, 
+          %struct.D_Scope*, void (\4)*, { 
+            i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, 
+            void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, 
+            %struct.ParseNode_User 
+          }* (\4, i32, { i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, 
+            void (\9, %struct.d_loc_t*, i8**)*, %struct.Grammar*, 
+            %struct.ParseNode_User }**)*, 
+          void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, 
+            void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, 
+            %struct.ParseNode_User }*)*, 
+          %struct.d_loc_t, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, 
+          i32, i32 }*)* null, 
+        i32 (i8*, i8**, i32, i32, { 
+          %struct.Grammar*, void (\4, %struct.d_loc_t*, i8**)*, 
+          %struct.D_Scope*, void (\4)*, { i32, %struct.d_loc_t, i8*, i8*, 
+            %struct.D_Scope*, void (\8, %struct.d_loc_t*, i8**)*, 
+            %struct.Grammar*, %struct.ParseNode_User }* (\4, i32, { i32, 
+              %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, 
+              void (\9, %struct.d_loc_t*, i8**)*, %struct.Grammar*, 
+              %struct.ParseNode_User }**)*, 
+              void ({ i32, %struct.d_loc_t, i8*, i8*, %struct.D_Scope*, 
+                void (\8, %struct.d_loc_t*, i8**)*, %struct.Grammar*, 
+                %struct.ParseNode_User }*)*, %struct.d_loc_t, i32, i32, i32, 
+                i32, i32, i32, i32, i32, i32, i32, i32, i32 }*)** null 
+        }
 
 implementation





From sabre at nondot.org  Tue Mar 20 12:34:52 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 20 Mar 2007 12:34:52 -0500
Subject: [llvm-commits] CVS: llvm/test/CFrontend/2003-02-12-NonlocalGoto.c
Message-ID: <200703201734.l2KHYq38027324@zion.cs.uiuc.edu>



Changes in directory llvm/test/CFrontend:

2003-02-12-NonlocalGoto.c updated: 1.5 -> 1.6
---
Log message:

llvm-gcc now requires -fnested-functions to enable them in C.


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

 2003-02-12-NonlocalGoto.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/test/CFrontend/2003-02-12-NonlocalGoto.c
diff -u llvm/test/CFrontend/2003-02-12-NonlocalGoto.c:1.5 llvm/test/CFrontend/2003-02-12-NonlocalGoto.c:1.6
--- llvm/test/CFrontend/2003-02-12-NonlocalGoto.c:1.5	Mon Nov 22 13:11:40 2004
+++ llvm/test/CFrontend/2003-02-12-NonlocalGoto.c	Tue Mar 20 12:34:31 2007
@@ -1,4 +1,4 @@
-// RUN: %llvmgcc -S %s -o /dev/null
+// RUN: %llvmgcc -S %s -o /dev/null -fnested-functions
 
 // XFAIL: *
 /* It is unlikely that LLVM will ever support nested functions, but if it does,





From lauro.venancio at gmail.com  Tue Mar 20 12:57:48 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Tue, 20 Mar 2007 12:57:48 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMISelLowering.cpp
	ARMInstrInfo.td ARMInstrThumb.td
Message-ID: <200703201757.l2KHvmTZ027806@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMISelLowering.cpp updated: 1.26 -> 1.27
ARMInstrInfo.td updated: 1.92 -> 1.93
ARMInstrThumb.td updated: 1.17 -> 1.18
---
Log message:

bugfix: When the source register of CALL_NOLINK was LR, the following code was emitted:
    mov lr, pc
    bx lr
So, the function was not called.



---
Diffs of the changes:  (+28 -19)

 ARMISelLowering.cpp |   29 ++++++++++++++++++-----------
 ARMInstrInfo.td     |   10 +++++-----
 ARMInstrThumb.td    |    8 +++++---
 3 files changed, 28 insertions(+), 19 deletions(-)


Index: llvm/lib/Target/ARM/ARMISelLowering.cpp
diff -u llvm/lib/Target/ARM/ARMISelLowering.cpp:1.26 llvm/lib/Target/ARM/ARMISelLowering.cpp:1.27
--- llvm/lib/Target/ARM/ARMISelLowering.cpp:1.26	Mon Mar 19 21:25:53 2007
+++ llvm/lib/Target/ARM/ARMISelLowering.cpp	Tue Mar 20 12:57:23 2007
@@ -544,6 +544,24 @@
       Callee = DAG.getTargetExternalSymbol(Sym, getPointerTy());
   }
 
+  // FIXME: handle tail calls differently.
+  unsigned CallOpc;
+  if (Subtarget->isThumb()) {
+    if (!Subtarget->hasV5TOps() && (!isDirect || isARMFunc))
+      CallOpc = ARMISD::CALL_NOLINK;
+    else
+      CallOpc = isARMFunc ? ARMISD::CALL : ARMISD::tCALL;
+  } else {
+    CallOpc = (isDirect || Subtarget->hasV5TOps())
+      ? ARMISD::CALL : ARMISD::CALL_NOLINK;
+  }
+  if (CallOpc == ARMISD::CALL_NOLINK) {
+    // On CALL_NOLINK we must move PC to LR
+    Chain = DAG.getCopyToReg(Chain, ARM::LR,
+                             DAG.getRegister(ARM::PC, MVT::i32), InFlag);
+    InFlag = Chain.getValue(1);
+  }
+
   std::vector<MVT::ValueType> NodeTys;
   NodeTys.push_back(MVT::Other);   // Returns a chain
   NodeTys.push_back(MVT::Flag);    // Returns a flag for retval copy to use.
@@ -558,17 +576,6 @@
     Ops.push_back(DAG.getRegister(RegsToPass[i].first,
                                   RegsToPass[i].second.getValueType()));
 
-  // FIXME: handle tail calls differently.
-  unsigned CallOpc;
-  if (Subtarget->isThumb()) {
-    if (!Subtarget->hasV5TOps() && (!isDirect || isARMFunc))
-      CallOpc = ARMISD::CALL_NOLINK;
-    else
-      CallOpc = isARMFunc ? ARMISD::CALL : ARMISD::tCALL;
-  } else {
-    CallOpc = (isDirect || Subtarget->hasV5TOps())
-      ? ARMISD::CALL : ARMISD::CALL_NOLINK;
-  }
   if (InFlag.Val)
     Ops.push_back(InFlag);
   Chain = DAG.getNode(CallOpc, NodeTys, &Ops[0], Ops.size());


Index: llvm/lib/Target/ARM/ARMInstrInfo.td
diff -u llvm/lib/Target/ARM/ARMInstrInfo.td:1.92 llvm/lib/Target/ARM/ARMInstrInfo.td:1.93
--- llvm/lib/Target/ARM/ARMInstrInfo.td:1.92	Tue Mar 20 03:11:30 2007
+++ llvm/lib/Target/ARM/ARMInstrInfo.td	Tue Mar 20 12:57:23 2007
@@ -370,8 +370,6 @@
   : I<ops, AddrMode3, Size4Bytes, IndexModeNone, asm, "", pattern>;
 class AI4<dag ops, string asm, list<dag> pattern>
   : I<ops, AddrMode4, Size4Bytes, IndexModeNone, asm, "", pattern>;
-class AIx2<dag ops, string asm, list<dag> pattern>
-  : I<ops, AddrModeNone, Size8Bytes, IndexModeNone, asm, "", pattern>;
 class AI1x2<dag ops, string asm, list<dag> pattern>
   : I<ops, AddrMode1, Size8Bytes, IndexModeNone, asm, "", pattern>;
 
@@ -546,10 +544,12 @@
   def BLX : AI<(ops GPR:$dst, variable_ops),
                "blx $dst",
                [(ARMcall GPR:$dst)]>, Requires<[IsARM, HasV5T]>;
-  // ARMv4T
-  def BX : AIx2<(ops GPR:$dst, variable_ops),
-                "mov lr, pc\n\tbx $dst",
+  let Uses = [LR] in {
+    // ARMv4T
+    def BX : AI<(ops GPR:$dst, variable_ops),
+                "bx $dst",
                 [(ARMcall_nolink GPR:$dst)]>;
+  }
 }
 
 let isBranch = 1, isTerminator = 1, isBarrier = 1 in {


Index: llvm/lib/Target/ARM/ARMInstrThumb.td
diff -u llvm/lib/Target/ARM/ARMInstrThumb.td:1.17 llvm/lib/Target/ARM/ARMInstrThumb.td:1.18
--- llvm/lib/Target/ARM/ARMInstrThumb.td:1.17	Mon Mar 19 02:48:02 2007
+++ llvm/lib/Target/ARM/ARMInstrThumb.td	Tue Mar 20 12:57:23 2007
@@ -189,10 +189,12 @@
   def tBLXr : TI<(ops GPR:$dst, variable_ops),
                   "blx $dst",
                   [(ARMtcall GPR:$dst)]>, Requires<[HasV5T]>;
-  // ARMv4T
-  def tBX : TIx2<(ops GPR:$dst, variable_ops),
-                  "cpy lr, pc\n\tbx $dst",
+  let Uses = [LR] in {
+    // ARMv4T
+    def tBX : TI<(ops GPR:$dst, variable_ops),
+                  "bx $dst",
                   [(ARMcall_nolink GPR:$dst)]>;
+  }
 }
 
 let isBranch = 1, isTerminator = 1, isBarrier = 1 in {





From lauro.venancio at gmail.com  Tue Mar 20 12:57:52 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Tue, 20 Mar 2007 12:57:52 -0500
Subject: [llvm-commits] CVS: llvm/test/CodeGen/ARM/call_nolink.ll
Message-ID: <200703201757.l2KHvqs7027812@zion.cs.uiuc.edu>



Changes in directory llvm/test/CodeGen/ARM:

call_nolink.ll added (r1.1)
---
Log message:

bugfix: When the source register of CALL_NOLINK was LR, the following code was emitted:
    mov lr, pc
    bx lr
So, the function was not called.



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

 call_nolink.ll |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 53 insertions(+)


Index: llvm/test/CodeGen/ARM/call_nolink.ll
diff -c /dev/null llvm/test/CodeGen/ARM/call_nolink.ll:1.1
*** /dev/null	Tue Mar 20 12:57:33 2007
--- llvm/test/CodeGen/ARM/call_nolink.ll	Tue Mar 20 12:57:23 2007
***************
*** 0 ****
--- 1,53 ----
+ ; RUN: llvm-as < %s | llc -march=arm &&
+ ; RUN: llvm-as < %s | llc -march=arm -mtriple=arm-linux-gnueabi | not grep "bx lr"
+ 
+ 	%struct.anon = type { i32 (i32, i32, i32)*, i32, i32, [3 x i32], i8*, i8*, i8* }
+ @r = external global [14 x i32]		; <[14 x i32]*> [#uses=4]
+ @isa = external global [13 x %struct.anon]		; <[13 x %struct.anon]*> [#uses=1]
+ @pgm = external global [2 x { i32, [3 x i32] }]		; <[2 x { i32, [3 x i32] }]*> [#uses=4]
+ @numi = external global i32		; <i32*> [#uses=1]
+ @counter = external global [2 x i32]		; <[2 x i32]*> [#uses=1]
+ 
+ implementation   ; Functions:
+ 
+ define void @main_bb_2E_i_bb205_2E_i_2E_i_bb115_2E_i_2E_i() {
+ newFuncRoot:
+ 	br label %bb115.i.i
+ 
+ bb115.i.i.bb170.i.i_crit_edge.exitStub:		; preds = %bb115.i.i
+ 	ret void
+ 
+ bb115.i.i.bb115.i.i_crit_edge:		; preds = %bb115.i.i
+ 	br label %bb115.i.i
+ 
+ bb115.i.i:		; preds = %bb115.i.i.bb115.i.i_crit_edge, %newFuncRoot
+ 	%i_addr.3210.0.i.i = phi i32 [ %tmp166.i.i, %bb115.i.i.bb115.i.i_crit_edge ], [ 0, %newFuncRoot ]		; <i32> [#uses=7]
+ 	%tmp124.i.i = getelementptr [2 x { i32, [3 x i32] }]* @pgm, i32 0, i32 %i_addr.3210.0.i.i, i32 1, i32 0		; <i32*> [#uses=1]
+ 	%tmp125.i.i = load i32* %tmp124.i.i		; <i32> [#uses=1]
+ 	%tmp126.i.i = getelementptr [14 x i32]* @r, i32 0, i32 %tmp125.i.i		; <i32*> [#uses=1]
+ 	%tmp127.i.i = load i32* %tmp126.i.i		; <i32> [#uses=1]
+ 	%tmp131.i.i = getelementptr [2 x { i32, [3 x i32] }]* @pgm, i32 0, i32 %i_addr.3210.0.i.i, i32 1, i32 1		; <i32*> [#uses=1]
+ 	%tmp132.i.i = load i32* %tmp131.i.i		; <i32> [#uses=1]
+ 	%tmp133.i.i = getelementptr [14 x i32]* @r, i32 0, i32 %tmp132.i.i		; <i32*> [#uses=1]
+ 	%tmp134.i.i = load i32* %tmp133.i.i		; <i32> [#uses=1]
+ 	%tmp138.i.i = getelementptr [2 x { i32, [3 x i32] }]* @pgm, i32 0, i32 %i_addr.3210.0.i.i, i32 1, i32 2		; <i32*> [#uses=1]
+ 	%tmp139.i.i = load i32* %tmp138.i.i		; <i32> [#uses=1]
+ 	%tmp140.i.i = getelementptr [14 x i32]* @r, i32 0, i32 %tmp139.i.i		; <i32*> [#uses=1]
+ 	%tmp141.i.i = load i32* %tmp140.i.i		; <i32> [#uses=1]
+ 	%tmp143.i.i = add i32 %i_addr.3210.0.i.i, 12		; <i32> [#uses=1]
+ 	%tmp146.i.i = getelementptr [2 x { i32, [3 x i32] }]* @pgm, i32 0, i32 %i_addr.3210.0.i.i, i32 0		; <i32*> [#uses=1]
+ 	%tmp147.i.i = load i32* %tmp146.i.i		; <i32> [#uses=1]
+ 	%tmp149.i.i = getelementptr [13 x %struct.anon]* @isa, i32 0, i32 %tmp147.i.i, i32 0		; <i32 (i32, i32, i32)**> [#uses=1]
+ 	%tmp150.i.i = load i32 (i32, i32, i32)** %tmp149.i.i		; <i32 (i32, i32, i32)*> [#uses=1]
+ 	%tmp154.i.i = tail call i32 %tmp150.i.i( i32 %tmp127.i.i, i32 %tmp134.i.i, i32 %tmp141.i.i )		; <i32> [#uses=1]
+ 	%tmp155.i.i = getelementptr [14 x i32]* @r, i32 0, i32 %tmp143.i.i		; <i32*> [#uses=1]
+ 	store i32 %tmp154.i.i, i32* %tmp155.i.i
+ 	%tmp159.i.i = getelementptr [2 x i32]* @counter, i32 0, i32 %i_addr.3210.0.i.i		; <i32*> [#uses=2]
+ 	%tmp160.i.i = load i32* %tmp159.i.i		; <i32> [#uses=1]
+ 	%tmp161.i.i = add i32 %tmp160.i.i, 1		; <i32> [#uses=1]
+ 	store i32 %tmp161.i.i, i32* %tmp159.i.i
+ 	%tmp166.i.i = add i32 %i_addr.3210.0.i.i, 1		; <i32> [#uses=2]
+ 	%tmp168.i.i = load i32* @numi		; <i32> [#uses=1]
+ 	icmp slt i32 %tmp166.i.i, %tmp168.i.i		; <i1>:0 [#uses=1]
+ 	br i1 %0, label %bb115.i.i.bb115.i.i_crit_edge, label %bb115.i.i.bb170.i.i_crit_edge.exitStub
+ }





From evan.cheng at apple.com  Tue Mar 20 14:02:02 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 12:02:02 -0700
Subject: [llvm-commits] CVS:
	llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
In-Reply-To: <200703201647.l2KGl4xf026041@zion.cs.uiuc.edu>
References: <200703201647.l2KGl4xf026041@zion.cs.uiuc.edu>
Message-ID: <A5207898-D54F-4134-9E80-9C38F154009C@apple.com>

Thanks. But please factor out the code that looks for the register  
class into a function so it can be shared between CopyToReg and  
CopyFromReg.

Evan
On Mar 20, 2007, at 9:47 AM, Lauro Ramos Venancio wrote:

>
>
> Changes in directory llvm/lib/CodeGen/SelectionDAG:
>
> ScheduleDAG.cpp updated: 1.122 -> 1.123
> ---
> Log message:
>
> CopyToReg source operand can be a physical register.
>
>
> ---
> Diffs of the changes:  (+19 -3)
>
>  ScheduleDAG.cpp |   22 +++++++++++++++++++---
>  1 files changed, 19 insertions(+), 3 deletions(-)
>
>
> Index: llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
> diff -u llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.122 llvm/ 
> lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.123
> --- llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.122	Sat Feb 17  
> 00:38:37 2007
> +++ llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp	Tue Mar 20  
> 11:46:44 2007
> @@ -475,9 +475,25 @@
>        else
>          InReg = getVR(Node->getOperand(2), VRBaseMap);
>        unsigned DestReg = cast<RegisterSDNode>(Node->getOperand(1))- 
> >getReg();
> -      if (InReg != DestReg)   // Coalesced away the copy?
> -        MRI->copyRegToReg(*BB, BB->end(), DestReg, InReg,
> -                          RegMap->getRegClass(InReg));
> +      if (InReg != DestReg)  {// Coalesced away the copy?
> +        const TargetRegisterClass *TRC = 0;
> +        // Get the target register class
> +        if (MRegisterInfo::isVirtualRegister(InReg)) {
> +          TRC = RegMap->getRegClass(InReg);
> +        } else {
> +          // Pick the register class of the right type that  
> contains this
> +          // physreg.
> +          for (MRegisterInfo::regclass_iterator I = MRI- 
> >regclass_begin(),
> +                 E = MRI->regclass_end(); I != E; ++I)
> +            if ((*I)->hasType(Node->getOperand(2).getValueType()) &&
> +                (*I)->contains(InReg)) {
> +              TRC = *I;
> +              break;
> +            }
> +          assert(TRC && "Couldn't find register class for reg  
> copy!");
> +        }
> +        MRI->copyRegToReg(*BB, BB->end(), DestReg, InReg, TRC);
> +      }
>        break;
>      }
>      case ISD::CopyFromReg: {
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From reid at x10sys.com  Tue Mar 20 14:30:01 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 14:30:01 -0500
Subject: [llvm-commits] CVS: llvm-www/InTheNews.html
Message-ID: <200703201930.l2KJU1DK030286@zion.cs.uiuc.edu>



Changes in directory llvm-www:

InTheNews.html added (r1.1)
---
Log message:

Add a news section.


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

 InTheNews.html |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 46 insertions(+)


Index: llvm-www/InTheNews.html
diff -c /dev/null llvm-www/InTheNews.html:1.1
*** /dev/null	Tue Mar 20 14:29:54 2007
--- llvm-www/InTheNews.html	Tue Mar 20 14:29:44 2007
***************
*** 0 ****
--- 1,46 ----
+ <!--#include virtual="header.incl" -->
+ <div class="www_sectiontitle">LLVM In The News</div>
+ <div class="www_text">
+   <p>Here's a list of news articles that mention LLVM so you can see what others
+   are saying about LLVM.</p>
+   <!----------------------------------------------------------------------- -->
+   <!-- NOTE TO MAINTAINERS: NO Email List Entries here, just News Articles  -->
+   <!----------------------------------------------------------------------- -->
+   <ul>
+     <li><a href="http://arstechnica.com/journals/apple.ars/2007/03/19/apple-putting-llvm-to-good-useArsTechnica">ars technia</a>,
+     March 20, 2007 (Bossa Conference Report)</li>
+     <li><a href="http://www.osnews.com/story.php?news_id=17136">OSnews</a>,
+     February 1, 2007 (Connect the dots: iPhone, OS X, LLVM, ARM, Ruby?)</li>
+     <li><a href="http://www.ipodobserver.com/story/30184">iPodObserver</a>,
+     February 1st, 2007 (An iPhone Performance Secret: LLVM)</li>
+     <li><a href="http://lca2007.linux.org.au/talk/27">Linux.conf.au</a>,
+     January 15th, 2007, (The ARM Backend Of LLVM)</li>
+     <li><a href="http://www.leonard-ritter.com/lunar_goes_llvm">Leonard Ritter Blog</a>
+     January 13th, 2007, (Lunar goes LLVM)</li>
+     <li><a href="http://macslash.org/article.pl?sid=06/08/18/1248220&mode=thread">Mac Slash</a>,
+     August 18, 2006 (Leopard OpenGL: Better Performance With LLVM)</li>
+     <li><a href="http://arstechnica.com/staff/fatbits.ars/2006/8/17/5024">ars technia</a>
+     August 17, 2006 (LLVM in Leopard)</li>
+     <li><a href="http://www.google.com/url?sa=t&ct=res&cd=19&url=http%3A%2F%2Fgcc.gnu.org%2Fml%2Fgcc%2F2003-10%2Fmsg01218.html&ei=czAARqzuKa_giwHtl6DHDA&usg=__UMlQ8OtGF-PBZb1OKgatM0ZF_lM=&sig2=S4qUiyjXs77aUyc4Zho1vA">Chris Lattner</a>,
+     24 October 2003 (LLVM 1.0 Announcement)</li>
+   </ul>
+   <p>Here are some other links about LLVM:</p>
+   <ul>
+     <li><a href="http://en.wikipedia.org/wiki/LLVM">Wikipedia Article</a></li>
+     <li><a href="http://www.answers.com/topic/low-level-virtual-machine">
+       Answers.com</a></li>
+     <li><a href="http://technorati.com/tag/LLVM">Technorati Tag LLVM</a></li>
+   </ul>
+ </div>
+ 
+ <!-- *********************************************************************** -->
+ <hr>
+ <address>
+   <a href="http://jigsaw.w3.org/css-validator/check/referer"><img
+   src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"></a>
+   <a href="http://validator.w3.org/check/referer"><img
+   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
+ <br/>
+   Last modified: $Date: 2007/03/20 19:29:44 $
+ </address>
+ <!--#include virtual="footer.incl" -->





From evan.cheng at apple.com  Tue Mar 20 14:32:28 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 14:32:28 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
Message-ID: <200703201932.l2KJWSKQ030342@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

SelectionDAGISel.cpp updated: 1.389 -> 1.390
---
Log message:

Minor bug.

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

 SelectionDAGISel.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.389 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.390
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.389	Sat Mar 17 03:53:30 2007
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	Tue Mar 20 14:32:11 2007
@@ -4009,7 +4009,8 @@
 
         // Check if it is possible to fold the expression to address mode.
         if (UseTy &&
-            TLI.isLegalAddressExpression(Instruction::Add, BinOp->getOperand(0),
+            TLI.isLegalAddressExpression(BinOp->getOpcode(),
+                                         BinOp->getOperand(0),
                                          BinOp->getOperand(1), UseTy)) {
           DestBBs.insert(UserBB);
           MadeChange = true;





From reid at x10sys.com  Tue Mar 20 14:34:14 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 14:34:14 -0500
Subject: [llvm-commits] CVS: llvm-www/InTheNews.html
Message-ID: <200703201934.l2KJYEis030435@zion.cs.uiuc.edu>



Changes in directory llvm-www:

InTheNews.html updated: 1.1 -> 1.2
---
Log message:

Add further notices to maintainers.


---
Diffs of the changes:  (+5 -2)

 InTheNews.html |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


Index: llvm-www/InTheNews.html
diff -u llvm-www/InTheNews.html:1.1 llvm-www/InTheNews.html:1.2
--- llvm-www/InTheNews.html:1.1	Tue Mar 20 14:29:44 2007
+++ llvm-www/InTheNews.html	Tue Mar 20 14:33:57 2007
@@ -4,7 +4,10 @@
   <p>Here's a list of news articles that mention LLVM so you can see what others
   are saying about LLVM.</p>
   <!----------------------------------------------------------------------- -->
-  <!-- NOTE TO MAINTAINERS: NO Email List Entries here, just News Articles  -->
+  <!-- NOTE TO MAINTAINERS:                                                 -->
+  <!--   1. No Email list entries here, just news articles                  -->
+  <!--   2. Nothing written by an LLVM developer, must be external sourced  -->
+  <!--   3. Please keep it sorted in reverse chronological order            -->
   <!----------------------------------------------------------------------- -->
   <ul>
     <li><a href="http://arstechnica.com/journals/apple.ars/2007/03/19/apple-putting-llvm-to-good-useArsTechnica">ars technia</a>,
@@ -41,6 +44,6 @@
   <a href="http://validator.w3.org/check/referer"><img
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
 <br/>
-  Last modified: $Date: 2007/03/20 19:29:44 $
+  Last modified: $Date: 2007/03/20 19:33:57 $
 </address>
 <!--#include virtual="footer.incl" -->





From reid at x10sys.com  Tue Mar 20 14:35:44 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 14:35:44 -0500
Subject: [llvm-commits] CVS: llvm-www/header.incl
Message-ID: <200703201935.l2KJZig7030515@zion.cs.uiuc.edu>



Changes in directory llvm-www:

header.incl updated: 1.52 -> 1.53
---
Log message:

Remove conference poll link. Add link to InTheNews.html


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

 header.incl |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm-www/header.incl
diff -u llvm-www/header.incl:1.52 llvm-www/header.incl:1.53
--- llvm-www/header.incl:1.52	Wed Feb 21 12:11:42 2007
+++ llvm-www/header.incl	Tue Mar 20 14:35:27 2007
@@ -28,9 +28,9 @@
 <a href="/pubs/">Publications</a><br>
 <a href="/ProjectsWithLLVM/">LLVM&nbsp;Projects</a><br>
 <a href="/OpenProjects.html">Open&nbsp;Projects</a><br>
+<a href="/InTheNews.html">News&nbsp;Articles</a><br>
 <a href="/developers.cgi">LLVM&nbsp;People</a><br>
 <a href="/bugs/">Bug&nbsp;Database</a><br>
-<a href="/poll/">Conference&nbsp;Poll</a><br>
 </div>
 
 <br>





From jeffc at jolt-lang.org  Tue Mar 20 14:45:45 2007
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Tue, 20 Mar 2007 12:45:45 -0700
Subject: [llvm-commits] CVS: llvm-www/InTheNews.html
In-Reply-To: <200703201934.l2KJYEis030435@zion.cs.uiuc.edu>
References: <200703201934.l2KJYEis030435@zion.cs.uiuc.edu>
Message-ID: <460039E9.7020603@jolt-lang.org>

Reid Spencer wrote:
> Changes in directory llvm-www:
>
> InTheNews.html updated: 1.1 -> 1.2
> ---
> Log message:
>
> Add further notices to maintainers.
>
>
> ---
> Diffs of the changes:  (+5 -2)
>
>  InTheNews.html |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
>
>
> Index: llvm-www/InTheNews.html
> diff -u llvm-www/InTheNews.html:1.1 llvm-www/InTheNews.html:1.2
> --- llvm-www/InTheNews.html:1.1	Tue Mar 20 14:29:44 2007
> +++ llvm-www/InTheNews.html	Tue Mar 20 14:33:57 2007
> @@ -4,7 +4,10 @@
>    <p>Here's a list of news articles that mention LLVM so you can see what others
>    are saying about LLVM.</p>
>    <!----------------------------------------------------------------------- -->
> -  <!-- NOTE TO MAINTAINERS: NO Email List Entries here, just News Articles  -->
> +  <!-- NOTE TO MAINTAINERS:                                                 -->
> +  <!--   1. No Email list entries here, just news articles                  -->
> +  <!--   2. Nothing written by an LLVM developer, must be external sourced  -->
> +  <!--   3. Please keep it sorted in reverse chronological order            -->
>    <!----------------------------------------------------------------------- -->
>    <ul>
>      <li><a href="http://arstechnica.com/journals/apple.ars/2007/03/19/apple-putting-llvm-to-good-useArsTechnica">ars technia</a>,
>   
The link is wrong, should end with "apple-putting-llvm-to-good-use", not 
"apple-putting-llvm-to-good-useArsTechnica".
> @@ -41,6 +44,6 @@
>    <a href="http://validator.w3.org/check/referer"><img
>    src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
>  <br/>
> -  Last modified: $Date: 2007/03/20 19:29:44 $
> +  Last modified: $Date: 2007/03/20 19:33:57 $
>  </address>
>  <!--#include virtual="footer.incl" -->
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
>
>
>   



From reid at x10sys.com  Tue Mar 20 14:51:01 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 14:51:01 -0500
Subject: [llvm-commits] CVS: llvm-www/InTheNews.html
Message-ID: <200703201951.l2KJp1cm030837@zion.cs.uiuc.edu>



Changes in directory llvm-www:

InTheNews.html updated: 1.2 -> 1.3
---
Log message:

Update some links, explain the listing more (mostly to force wider column),
reorganize so links are associated with date which comes first.


---
Diffs of the changes:  (+17 -12)

 InTheNews.html |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)


Index: llvm-www/InTheNews.html
diff -u llvm-www/InTheNews.html:1.2 llvm-www/InTheNews.html:1.3
--- llvm-www/InTheNews.html:1.2	Tue Mar 20 14:33:57 2007
+++ llvm-www/InTheNews.html	Tue Mar 20 14:50:44 2007
@@ -2,7 +2,9 @@
 <div class="www_sectiontitle">LLVM In The News</div>
 <div class="www_text">
   <p>Here's a list of news articles that mention LLVM so you can see what others
-  are saying about LLVM.</p>
+  are saying about LLVM. None of these articles have been written by the core 
+  LLVM developers but may have been written by LLVM users. There are no email
+  list entries here, just news articles and it sorted from newest to oldest.</p>
   <!----------------------------------------------------------------------- -->
   <!-- NOTE TO MAINTAINERS:                                                 -->
   <!--   1. No Email list entries here, just news articles                  -->
@@ -10,16 +12,19 @@
   <!--   3. Please keep it sorted in reverse chronological order            -->
   <!----------------------------------------------------------------------- -->
   <ul>
-    <li><a href="http://arstechnica.com/journals/apple.ars/2007/03/19/apple-putting-llvm-to-good-useArsTechnica">ars technia</a>,
-    March 20, 2007 (Bossa Conference Report)</li>
-    <li><a href="http://www.osnews.com/story.php?news_id=17136">OSnews</a>,
-    February 1, 2007 (Connect the dots: iPhone, OS X, LLVM, ARM, Ruby?)</li>
-    <li><a href="http://www.ipodobserver.com/story/30184">iPodObserver</a>,
-    February 1st, 2007 (An iPhone Performance Secret: LLVM)</li>
-    <li><a href="http://lca2007.linux.org.au/talk/27">Linux.conf.au</a>,
-    January 15th, 2007, (The ARM Backend Of LLVM)</li>
-    <li><a href="http://www.leonard-ritter.com/lunar_goes_llvm">Leonard Ritter Blog</a>
-    January 13th, 2007, (Lunar goes LLVM)</li>
+    <li><a href="http://arstechnica.com/journals/apple.ars/2007/03/19/apple-putting-llvm-to-good-use">2007-03-20</a>,
+    ars technia, "<b>Apple putting LLVM to good use</b>" (Bossa Conference), 
+    Erik Kennedy.</li>
+    <li><a href="http://www.osnews.com/story.php?news_id=17136">2007-02-01</a>,
+    OS News, "<b>Connect the dots: iPhone, OS X, LLVM, ARM, Ruby?</b>", Thom 
+    Holwerda.</li>
+    <li><a href="http://www.ipodobserver.com/story/30184">2007-02-01</a>, 
+    iPodObserver, "<b>An iPhone Performance Secret: LLVM</b>", John 
+    Martellaro.</li>
+    <li><a href="http://lca2007.linux.org.au/talk/27">2007-01-15</a>,
+    Linux.conf.au, "<b>The ARM Backend Of LLVM</b>", Ralph Espindola.</li>
+    <li><a href="http://www.leonard-ritter.com/lunar_goes_llvm">2007-01-13</a>,
+    Leonard Ritter Blog, "<b>Lunar goes LLVM</b>", Leonard Ritter.</li>
     <li><a href="http://macslash.org/article.pl?sid=06/08/18/1248220&mode=thread">Mac Slash</a>,
     August 18, 2006 (Leopard OpenGL: Better Performance With LLVM)</li>
     <li><a href="http://arstechnica.com/staff/fatbits.ars/2006/8/17/5024">ars technia</a>
@@ -44,6 +49,6 @@
   <a href="http://validator.w3.org/check/referer"><img
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
 <br/>
-  Last modified: $Date: 2007/03/20 19:33:57 $
+  Last modified: $Date: 2007/03/20 19:50:44 $
 </address>
 <!--#include virtual="footer.incl" -->





From reid at x10sys.com  Tue Mar 20 14:57:41 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 14:57:41 -0500
Subject: [llvm-commits] CVS: llvm-www/InTheNews.html
Message-ID: <200703201957.l2KJvfHP030988@zion.cs.uiuc.edu>



Changes in directory llvm-www:

InTheNews.html updated: 1.3 -> 1.4
---
Log message:

Finish conversion to new format, break by year.


---
Diffs of the changes:  (+18 -9)

 InTheNews.html |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)


Index: llvm-www/InTheNews.html
diff -u llvm-www/InTheNews.html:1.3 llvm-www/InTheNews.html:1.4
--- llvm-www/InTheNews.html:1.3	Tue Mar 20 14:50:44 2007
+++ llvm-www/InTheNews.html	Tue Mar 20 14:57:24 2007
@@ -4,13 +4,15 @@
   <p>Here's a list of news articles that mention LLVM so you can see what others
   are saying about LLVM. None of these articles have been written by the core 
   LLVM developers but may have been written by LLVM users. There are no email
-  list entries here, just news articles and it sorted from newest to oldest.</p>
+  list entries here, just news articles and it is sorted from newest to 
+  oldest.</p>
   <!----------------------------------------------------------------------- -->
   <!-- NOTE TO MAINTAINERS:                                                 -->
   <!--   1. No Email list entries here, just news articles                  -->
   <!--   2. Nothing written by an LLVM developer, must be external sourced  -->
   <!--   3. Please keep it sorted in reverse chronological order            -->
   <!----------------------------------------------------------------------- -->
+  <p><b>2007</b></p>
   <ul>
     <li><a href="http://arstechnica.com/journals/apple.ars/2007/03/19/apple-putting-llvm-to-good-use">2007-03-20</a>,
     ars technia, "<b>Apple putting LLVM to good use</b>" (Bossa Conference), 
@@ -25,19 +27,26 @@
     Linux.conf.au, "<b>The ARM Backend Of LLVM</b>", Ralph Espindola.</li>
     <li><a href="http://www.leonard-ritter.com/lunar_goes_llvm">2007-01-13</a>,
     Leonard Ritter Blog, "<b>Lunar goes LLVM</b>", Leonard Ritter.</li>
-    <li><a href="http://macslash.org/article.pl?sid=06/08/18/1248220&mode=thread">Mac Slash</a>,
-    August 18, 2006 (Leopard OpenGL: Better Performance With LLVM)</li>
-    <li><a href="http://arstechnica.com/staff/fatbits.ars/2006/8/17/5024">ars technia</a>
-    August 17, 2006 (LLVM in Leopard)</li>
-    <li><a href="http://www.google.com/url?sa=t&ct=res&cd=19&url=http%3A%2F%2Fgcc.gnu.org%2Fml%2Fgcc%2F2003-10%2Fmsg01218.html&ei=czAARqzuKa_giwHtl6DHDA&usg=__UMlQ8OtGF-PBZb1OKgatM0ZF_lM=&sig2=S4qUiyjXs77aUyc4Zho1vA">Chris Lattner</a>,
-    24 October 2003 (LLVM 1.0 Announcement)</li>
   </ul>
-  <p>Here are some other links about LLVM:</p>
+  <p><b>2006</b></p>
+  <ul>
+    <li><a
+      href="http://macslash.org/article.pl?sid=06/08/18/1248220&mode=thread">2006-08-18</a>,
+    Mac Slash, "<b>Leopard OpenGL: Better Performance With LLVM</b>", Trollaxor.
+    </li>
+    <li><a href="http://arstechnica.com/staff/fatbits.ars/2006/8/17/5024">2006-08-17</a>,
+    ars technia, "<b>LLVM in Leopard and beyond</b>", John Siracusa.</li>
+  </ul>
+  <p>
+  <p>Here are some other links about LLVM,of general interest.</p>
   <ul>
     <li><a href="http://en.wikipedia.org/wiki/LLVM">Wikipedia Article</a></li>
     <li><a href="http://www.answers.com/topic/low-level-virtual-machine">
       Answers.com</a></li>
     <li><a href="http://technorati.com/tag/LLVM">Technorati Tag LLVM</a></li>
+    <li><a
+      href="http://www.google.com/url?sa=t&ct=res&cd=19&url=http%3A%2F%2Fgcc.gnu.org%2Fml%2Fgcc%2F2003-10%2Fmsg01218.html&ei=czAARqzuKa_giwHtl6DHDA&usg=__UMlQ8OtGF-PBZb1OKgatM0ZF_lM=&sig2=S4qUiyjXs77aUyc4Zho1vA">Chris
+      Lattner's LLVM 1.0 Announcement, 2003-10-24</a>.</li>
   </ul>
 </div>
 
@@ -49,6 +58,6 @@
   <a href="http://validator.w3.org/check/referer"><img
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
 <br/>
-  Last modified: $Date: 2007/03/20 19:50:44 $
+  Last modified: $Date: 2007/03/20 19:57:24 $
 </address>
 <!--#include virtual="footer.incl" -->





From reid at x10sys.com  Tue Mar 20 15:04:13 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 15:04:13 -0500
Subject: [llvm-commits] CVS: llvm-www/header.incl
Message-ID: <200703202004.l2KK4D99031223@zion.cs.uiuc.edu>



Changes in directory llvm-www:

header.incl updated: 1.53 -> 1.54
---
Log message:

Fix HTML 4.01 Strict validation defects.


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

 header.incl |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)


Index: llvm-www/header.incl
diff -u llvm-www/header.incl:1.53 llvm-www/header.incl:1.54
--- llvm-www/header.incl:1.53	Tue Mar 20 14:35:27 2007
+++ llvm-www/header.incl	Tue Mar 20 15:03:56 2007
@@ -19,45 +19,45 @@
 
 <b>Site Map:</b>
 <div class="www_sidebar">
-<a href="/">Overview</a><br>
-<a href="/Features.html">Features</a><br>
-<a href="/docs/">Documentation</a><br>
-<a href="/docs/CommandGuide/">Command Guide</a><br>
-<a href="/docs/#maillist">Support</a><br>
-<a href="/docs/FAQ.html">FAQ</a><br>
-<a href="/pubs/">Publications</a><br>
-<a href="/ProjectsWithLLVM/">LLVM&nbsp;Projects</a><br>
-<a href="/OpenProjects.html">Open&nbsp;Projects</a><br>
-<a href="/InTheNews.html">News&nbsp;Articles</a><br>
-<a href="/developers.cgi">LLVM&nbsp;People</a><br>
-<a href="/bugs/">Bug&nbsp;Database</a><br>
+<a href="/">Overview</a><br/>
+<a href="/Features.html">Features</a><br/>
+<a href="/docs/">Documentation</a><br/>
+<a href="/docs/CommandGuide/">Command Guide</a><br/>
+<a href="/docs/#maillist">Support</a><br/>
+<a href="/docs/FAQ.html">FAQ</a><br/>
+<a href="/pubs/">Publications</a><br/>
+<a href="/ProjectsWithLLVM/">LLVM&nbsp;Projects</a><br/>
+<a href="/OpenProjects.html">Open&nbsp;Projects</a><br/>
+<a href="/InTheNews.html">News&nbsp;Articles</a><br/>
+<a href="/developers.cgi">LLVM&nbsp;People</a><br/>
+<a href="/bugs/">Bug&nbsp;Database</a><br/>
 </div>
 
-<br>
+<br/>
 
 <b>Download!</b>
 <div class="www_sidebar">
 <span style="font-size:smaller">Download now:</span>
-<a href="/releases/"><b>LLVM&nbsp;1.9</b></a><br>
+<a href="/releases/"><b>LLVM&nbsp;1.9</b></a><br/>
 
-<br>
-<span style="font-size:smaller">Try the</span><br>
-<a href="/demo/"><b>online demo</b></a><br>
-<br>
+<br/>
+<span style="font-size:smaller">Try the</span><br/>
+<a href="/demo/"><b>online demo</b></a><br/>
+<br/>
 
-<span style="font-size:smaller">View the open-source</span><br>
+<span style="font-size:smaller">View the open-source</span><br/>
 <a href="/releases/1.9/LICENSE.TXT"><b>license</b></a>
 </div>
 
-<br>
+<br/>
 
 <b>Search&nbsp;this&nbsp;Site</b>
 
 <div class="www_sidebar">
-  <form action="http://www.google.com/search" method=get>
-      <input type="hidden" name="sitesearch" value="llvm.org">
-      <input type=text name=q size=11><br>
-      <input type=submit value="Search!" name="submit">
+  <form action="http://www.google.com/search" method="get">
+      <input type="hidden" name="sitesearch" value="llvm.org"/>
+      <input type=text name=q size=11/><br/>
+      <input type=submit value="Search!" name="submit"/>
     </form>
 </div>
 





From reid at x10sys.com  Tue Mar 20 15:06:36 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 15:06:36 -0500
Subject: [llvm-commits] CVS: llvm-www/header.incl
Message-ID: <200703202006.l2KK6a09031348@zion.cs.uiuc.edu>



Changes in directory llvm-www:

header.incl updated: 1.54 -> 1.55
---
Log message:

Another attempt at HTML 4.01 Strict compliance.


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

 header.incl |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)


Index: llvm-www/header.incl
diff -u llvm-www/header.incl:1.54 llvm-www/header.incl:1.55
--- llvm-www/header.incl:1.54	Tue Mar 20 15:03:56 2007
+++ llvm-www/header.incl	Tue Mar 20 15:06:19 2007
@@ -55,10 +55,12 @@
 
 <div class="www_sidebar">
   <form action="http://www.google.com/search" method="get">
+    <div>
       <input type="hidden" name="sitesearch" value="llvm.org"/>
       <input type=text name=q size=11/><br/>
       <input type=submit value="Search!" name="submit"/>
-    </form>
+    </div>
+  </form>
 </div>
 
 <br>





From reid at x10sys.com  Tue Mar 20 15:09:15 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 15:09:15 -0500
Subject: [llvm-commits] CVS: llvm-www/InTheNews.html
Message-ID: <200703202009.l2KK9FfO031556@zion.cs.uiuc.edu>



Changes in directory llvm-www:

InTheNews.html updated: 1.4 -> 1.5
---
Log message:

Fix general entity reference issues for HTML 4.01 strict compliance.


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

 InTheNews.html |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)


Index: llvm-www/InTheNews.html
diff -u llvm-www/InTheNews.html:1.4 llvm-www/InTheNews.html:1.5
--- llvm-www/InTheNews.html:1.4	Tue Mar 20 14:57:24 2007
+++ llvm-www/InTheNews.html	Tue Mar 20 15:08:57 2007
@@ -31,21 +31,21 @@
   <p><b>2006</b></p>
   <ul>
     <li><a
-      href="http://macslash.org/article.pl?sid=06/08/18/1248220&mode=thread">2006-08-18</a>,
+      href="http://macslash.org/article.pl?sid=06/08/18/1248220&amp;mode=thread">2006-08-18</a>,
     Mac Slash, "<b>Leopard OpenGL: Better Performance With LLVM</b>", Trollaxor.
     </li>
     <li><a href="http://arstechnica.com/staff/fatbits.ars/2006/8/17/5024">2006-08-17</a>,
     ars technia, "<b>LLVM in Leopard and beyond</b>", John Siracusa.</li>
   </ul>
   <p>
-  <p>Here are some other links about LLVM,of general interest.</p>
+  <p>Here are some other links about LLVM, of general interest.</p>
   <ul>
     <li><a href="http://en.wikipedia.org/wiki/LLVM">Wikipedia Article</a></li>
     <li><a href="http://www.answers.com/topic/low-level-virtual-machine">
       Answers.com</a></li>
     <li><a href="http://technorati.com/tag/LLVM">Technorati Tag LLVM</a></li>
     <li><a
-      href="http://www.google.com/url?sa=t&ct=res&cd=19&url=http%3A%2F%2Fgcc.gnu.org%2Fml%2Fgcc%2F2003-10%2Fmsg01218.html&ei=czAARqzuKa_giwHtl6DHDA&usg=__UMlQ8OtGF-PBZb1OKgatM0ZF_lM=&sig2=S4qUiyjXs77aUyc4Zho1vA">Chris
+      href="http://www.google.com/url?sa=t&amp;ct=res&amp;cd=19&amp;url=http%3A%2F%2Fgcc.gnu.org%2Fml%2Fgcc%2F2003-10%2Fmsg01218.html&amp;ei=czAARqzuKa_giwHtl6DHDA&amp;usg=__UMlQ8OtGF-PBZb1OKgatM0ZF_lM=&amp;sig2=S4qUiyjXs77aUyc4Zho1vA">Chris
       Lattner's LLVM 1.0 Announcement, 2003-10-24</a>.</li>
   </ul>
 </div>
@@ -58,6 +58,6 @@
   <a href="http://validator.w3.org/check/referer"><img
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
 <br/>
-  Last modified: $Date: 2007/03/20 19:57:24 $
+  Last modified: $Date: 2007/03/20 20:08:57 $
 </address>
 <!--#include virtual="footer.incl" -->





From lauro.venancio at gmail.com  Tue Mar 20 15:09:21 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Tue, 20 Mar 2007 15:09:21 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
Message-ID: <200703202009.l2KK9L3h031562@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

ScheduleDAG.cpp updated: 1.123 -> 1.124
---
Log message:

Code clean up.


---
Diffs of the changes:  (+20 -23)

 ScheduleDAG.cpp |   43 ++++++++++++++++++++-----------------------
 1 files changed, 20 insertions(+), 23 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.123 llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.124
--- llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.123	Tue Mar 20 11:46:44 2007
+++ llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp	Tue Mar 20 15:09:03 2007
@@ -381,6 +381,20 @@
   
 }
 
+// Returns the Register Class of a physical register
+static const TargetRegisterClass *getPhysicalRegisterRegClass(
+        const MRegisterInfo *MRI,
+        MVT::ValueType VT,
+        unsigned reg) {
+  assert(MRegisterInfo::isPhysicalRegister(reg) &&
+         "reg must be a physical register");
+  // Pick the register class of the right type that contains this physreg.
+  for (MRegisterInfo::regclass_iterator I = MRI->regclass_begin(),
+         E = MRI->regclass_end(); I != E; ++I)
+    if ((*I)->hasType(VT) && (*I)->contains(reg))
+      return *I;
+  assert(false && "Couldn't find the register class");
+}
 
 /// EmitNode - Generate machine code for an node and needed dependencies.
 ///
@@ -478,20 +492,12 @@
       if (InReg != DestReg)  {// Coalesced away the copy?
         const TargetRegisterClass *TRC = 0;
         // Get the target register class
-        if (MRegisterInfo::isVirtualRegister(InReg)) {
+        if (MRegisterInfo::isVirtualRegister(InReg))
           TRC = RegMap->getRegClass(InReg);
-        } else {
-          // Pick the register class of the right type that contains this
-          // physreg.
-          for (MRegisterInfo::regclass_iterator I = MRI->regclass_begin(),
-                 E = MRI->regclass_end(); I != E; ++I)
-            if ((*I)->hasType(Node->getOperand(2).getValueType()) &&
-                (*I)->contains(InReg)) {
-              TRC = *I;
-              break;
-            }
-          assert(TRC && "Couldn't find register class for reg copy!");
-        }
+        else
+          TRC = getPhysicalRegisterRegClass(MRI,
+                                            Node->getOperand(2).getValueType(),
+                                            InReg);
         MRI->copyRegToReg(*BB, BB->end(), DestReg, InReg, TRC);
       }
       break;
@@ -523,17 +529,8 @@
       if (VRBase) {
         TRC = RegMap->getRegClass(VRBase);
       } else {
+        TRC = getPhysicalRegisterRegClass(MRI, Node->getValueType(0), SrcReg);
 
-        // Pick the register class of the right type that contains this physreg.
-        for (MRegisterInfo::regclass_iterator I = MRI->regclass_begin(),
-             E = MRI->regclass_end(); I != E; ++I)
-          if ((*I)->hasType(Node->getValueType(0)) &&
-              (*I)->contains(SrcReg)) {
-            TRC = *I;
-            break;
-          }
-        assert(TRC && "Couldn't find register class for reg copy!");
-      
         // Create the reg, emit the copy.
         VRBase = RegMap->createVirtualRegister(TRC);
       }





From rspencer at reidspencer.com  Tue Mar 20 15:08:59 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Tue, 20 Mar 2007 13:08:59 -0700
Subject: [llvm-commits] CVS: llvm-www/InTheNews.html
In-Reply-To: <460039E9.7020603@jolt-lang.org>
References: <200703201934.l2KJYEis030435@zion.cs.uiuc.edu>
	<460039E9.7020603@jolt-lang.org>
Message-ID: <1174421339.13912.329.camel@bashful.x10sys.com>

On Tue, 2007-03-20 at 12:45 -0700, Jeff Cohen wrote:
> The link is wrong, should end with "apple-putting-llvm-to-good-use", not 
> "apple-putting-llvm-to-good-useArsTechnica".

Now that I'm actually done making change, please see if its to your
liking.

:)

Reid.




From dpatel at apple.com  Tue Mar 20 15:18:34 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 20 Mar 2007 15:18:34 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Dominators.cpp
Message-ID: <200703202018.l2KKIY1i031736@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Dominators.cpp updated: 1.78 -> 1.79
---
Log message:

LoopSimplify::FindPHIToPartitionLoops()
Use ETForest instead of DominatorSet.


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

 Dominators.cpp |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+)


Index: llvm/lib/VMCore/Dominators.cpp
diff -u llvm/lib/VMCore/Dominators.cpp:1.78 llvm/lib/VMCore/Dominators.cpp:1.79
--- llvm/lib/VMCore/Dominators.cpp:1.78	Fri Nov 17 02:03:48 2006
+++ llvm/lib/VMCore/Dominators.cpp	Tue Mar 20 15:18:12 2007
@@ -883,6 +883,25 @@
   DFSInfoValid = true;
 }
 
+// dominates - Return true if A dominates B. THis performs the
+// special checks necessary if A and B are in the same basic block.
+bool ETForestBase::dominates(Instruction *A, Instruction *B) {
+  BasicBlock *BBA = A->getParent(), *BBB = B->getParent();
+  if (BBA != BBB) return dominates(BBA, BBB);
+  
+  // Loop through the basic block until we find A or B.
+  BasicBlock::iterator I = BBA->begin();
+  for (; &*I != A && &*I != B; ++I) /*empty*/;
+  
+  if(!IsPostDominators) {
+    // A dominates B if it is found first in the basic block.
+    return &*I == A;
+  } else {
+    // A post-dominates B if B is found first in the basic block.
+    return &*I == B;
+  }
+}
+
 ETNode *ETForest::getNodeForBlock(BasicBlock *BB) {
   ETNode *&BBNode = Nodes[BB];
   if (BBNode) return BBNode;





From dpatel at apple.com  Tue Mar 20 15:18:34 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 20 Mar 2007 15:18:34 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/LoopSimplify.cpp
Message-ID: <200703202018.l2KKIYqZ031739@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Utils:

LoopSimplify.cpp updated: 1.79 -> 1.80
---
Log message:

LoopSimplify::FindPHIToPartitionLoops()
Use ETForest instead of DominatorSet.


---
Diffs of the changes:  (+6 -4)

 LoopSimplify.cpp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


Index: llvm/lib/Transforms/Utils/LoopSimplify.cpp
diff -u llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.79 llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.80
--- llvm/lib/Transforms/Utils/LoopSimplify.cpp:1.79	Tue Dec 19 16:17:40 2006
+++ llvm/lib/Transforms/Utils/LoopSimplify.cpp	Tue Mar 20 15:18:12 2007
@@ -66,6 +66,7 @@
       AU.addRequired<LoopInfo>();
       AU.addRequired<DominatorSet>();
       AU.addRequired<DominatorTree>();
+      AU.addRequired<ETForest>();
 
       AU.addPreserved<LoopInfo>();
       AU.addPreserved<DominatorSet>();
@@ -417,13 +418,13 @@
 
 /// FindPHIToPartitionLoops - The first part of loop-nestification is to find a
 /// PHI node that tells us how to partition the loops.
-static PHINode *FindPHIToPartitionLoops(Loop *L, DominatorSet &DS,
-                                        AliasAnalysis *AA) {
+static PHINode *FindPHIToPartitionLoops(Loop *L, ETForest *EF, 
+					AliasAnalysis *AA) {
   for (BasicBlock::iterator I = L->getHeader()->begin(); isa<PHINode>(I); ) {
     PHINode *PN = cast<PHINode>(I);
     ++I;
     if (Value *V = PN->hasConstantValue())
-      if (!isa<Instruction>(V) || DS.dominates(cast<Instruction>(V), PN)) {
+      if (!isa<Instruction>(V) || EF->dominates(cast<Instruction>(V), PN)) {
         // This is a degenerate PHI already, don't modify it!
         PN->replaceAllUsesWith(V);
         if (AA) AA->deleteValue(PN);
@@ -497,7 +498,8 @@
 /// created.
 ///
 Loop *LoopSimplify::SeparateNestedLoop(Loop *L) {
-  PHINode *PN = FindPHIToPartitionLoops(L, getAnalysis<DominatorSet>(), AA);
+  ETForest *EF = getAnalysisToUpdate<ETForest>();
+  PHINode *PN = FindPHIToPartitionLoops(L, EF, AA);
   if (PN == 0) return 0;  // No known way to partition.
 
   // Pull out all predecessors that have varying values in the loop.  This





From dpatel at apple.com  Tue Mar 20 15:20:05 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 20 Mar 2007 15:20:05 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/Dominators.h
Message-ID: <200703202020.l2KKK5Mv031786@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Analysis:

Dominators.h updated: 1.63 -> 1.64
---
Log message:


LoopSimplify::FindPHIToPartitionLoops()
Use ETForest instead of DominatorSet.



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

 Dominators.h |    4 ++++
 1 files changed, 4 insertions(+)


Index: llvm/include/llvm/Analysis/Dominators.h
diff -u llvm/include/llvm/Analysis/Dominators.h:1.63 llvm/include/llvm/Analysis/Dominators.h:1.64
--- llvm/include/llvm/Analysis/Dominators.h:1.63	Sat Dec 16 23:15:12 2006
+++ llvm/include/llvm/Analysis/Dominators.h	Tue Mar 20 15:19:48 2007
@@ -516,6 +516,10 @@
     }
   }
 
+  // dominates - Return true if A dominates B. THis performs the
+  // special checks necessary if A and B are in the same basic block.
+  bool dominates(Instruction *A, Instruction *B);
+
   /// properlyDominates - Return true if A dominates B and A != B.
   ///
   bool properlyDominates(BasicBlock *A, BasicBlock *B) {





From reid at x10sys.com  Tue Mar 20 15:22:00 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 15:22:00 -0500
Subject: [llvm-commits] CVS: llvm-www/InTheNews.html
Message-ID: <200703202022.l2KKM0Ko031871@zion.cs.uiuc.edu>



Changes in directory llvm-www:

InTheNews.html updated: 1.5 -> 1.6
---
Log message:

Fix Rafael's name.


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

 InTheNews.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-www/InTheNews.html
diff -u llvm-www/InTheNews.html:1.5 llvm-www/InTheNews.html:1.6
--- llvm-www/InTheNews.html:1.5	Tue Mar 20 15:08:57 2007
+++ llvm-www/InTheNews.html	Tue Mar 20 15:21:43 2007
@@ -24,7 +24,7 @@
     iPodObserver, "<b>An iPhone Performance Secret: LLVM</b>", John 
     Martellaro.</li>
     <li><a href="http://lca2007.linux.org.au/talk/27">2007-01-15</a>,
-    Linux.conf.au, "<b>The ARM Backend Of LLVM</b>", Ralph Espindola.</li>
+    Linux.conf.au, "<b>The ARM Backend Of LLVM</b>", Rafael Espindola.</li>
     <li><a href="http://www.leonard-ritter.com/lunar_goes_llvm">2007-01-13</a>,
     Leonard Ritter Blog, "<b>Lunar goes LLVM</b>", Leonard Ritter.</li>
   </ul>
@@ -58,6 +58,6 @@
   <a href="http://validator.w3.org/check/referer"><img
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
 <br/>
-  Last modified: $Date: 2007/03/20 20:08:57 $
+  Last modified: $Date: 2007/03/20 20:21:43 $
 </address>
 <!--#include virtual="footer.incl" -->





From sabre at nondot.org  Tue Mar 20 15:35:51 2007
From: sabre at nondot.org (Chris Lattner)
Date: Tue, 20 Mar 2007 15:35:51 -0500
Subject: [llvm-commits] CVS: llvm-www/InTheNews.html
Message-ID: <200703202035.l2KKZphJ032310@zion.cs.uiuc.edu>



Changes in directory llvm-www:

InTheNews.html updated: 1.6 -> 1.7
---
Log message:

make disclaimer stronger, fix spelling


---
Diffs of the changes:  (+6 -5)

 InTheNews.html |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)


Index: llvm-www/InTheNews.html
diff -u llvm-www/InTheNews.html:1.6 llvm-www/InTheNews.html:1.7
--- llvm-www/InTheNews.html:1.6	Tue Mar 20 15:21:43 2007
+++ llvm-www/InTheNews.html	Tue Mar 20 15:35:33 2007
@@ -2,8 +2,9 @@
 <div class="www_sectiontitle">LLVM In The News</div>
 <div class="www_text">
   <p>Here's a list of news articles that mention LLVM so you can see what others
-  are saying about LLVM. None of these articles have been written by the core 
-  LLVM developers but may have been written by LLVM users. There are no email
+  are saying about LLVM. These articles have not been written by the core 
+  LLVM developers, and we <b>do not</b> vouch for their accuracy or content. 
+  There are no email
   list entries here, just news articles and it is sorted from newest to 
   oldest.</p>
   <!----------------------------------------------------------------------- -->
@@ -15,7 +16,7 @@
   <p><b>2007</b></p>
   <ul>
     <li><a href="http://arstechnica.com/journals/apple.ars/2007/03/19/apple-putting-llvm-to-good-use">2007-03-20</a>,
-    ars technia, "<b>Apple putting LLVM to good use</b>" (Bossa Conference), 
+    ars technica, "<b>Apple putting LLVM to good use</b>" (Bossa Conference), 
     Erik Kennedy.</li>
     <li><a href="http://www.osnews.com/story.php?news_id=17136">2007-02-01</a>,
     OS News, "<b>Connect the dots: iPhone, OS X, LLVM, ARM, Ruby?</b>", Thom 
@@ -35,7 +36,7 @@
     Mac Slash, "<b>Leopard OpenGL: Better Performance With LLVM</b>", Trollaxor.
     </li>
     <li><a href="http://arstechnica.com/staff/fatbits.ars/2006/8/17/5024">2006-08-17</a>,
-    ars technia, "<b>LLVM in Leopard and beyond</b>", John Siracusa.</li>
+    ars technica, "<b>LLVM in Leopard and beyond</b>", John Siracusa.</li>
   </ul>
   <p>
   <p>Here are some other links about LLVM, of general interest.</p>
@@ -58,6 +59,6 @@
   <a href="http://validator.w3.org/check/referer"><img
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
 <br/>
-  Last modified: $Date: 2007/03/20 20:21:43 $
+  Last modified: $Date: 2007/03/20 20:35:33 $
 </address>
 <!--#include virtual="footer.incl" -->





From jeffc at jolt-lang.org  Tue Mar 20 15:42:53 2007
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Tue, 20 Mar 2007 15:42:53 -0500
Subject: [llvm-commits] CVS: llvm/lib/Support/APInt.cpp
Message-ID: <200703202042.l2KKgrQx032440@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Support:

APInt.cpp updated: 1.73 -> 1.74
---
Log message:

Fix (and simplify) 48-bit byte swap.
Get pos/neg infinity the correct way.


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

 APInt.cpp |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)


Index: llvm/lib/Support/APInt.cpp
diff -u llvm/lib/Support/APInt.cpp:1.73 llvm/lib/Support/APInt.cpp:1.74
--- llvm/lib/Support/APInt.cpp:1.73	Mon Mar 19 16:19:02 2007
+++ llvm/lib/Support/APInt.cpp	Tue Mar 20 15:42:36 2007
@@ -18,6 +18,7 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/MathExtras.h"
 #include <math.h>
+#include <limits>
 #include <cstring>
 #include <cstdlib>
 #ifndef NDEBUG
@@ -762,17 +763,15 @@
 APInt APInt::byteSwap() const {
   assert(BitWidth >= 16 && BitWidth % 16 == 0 && "Cannot byteswap!");
   if (BitWidth == 16)
-    return APInt(BitWidth, ByteSwap_16(VAL));
+    return APInt(BitWidth, ByteSwap_16(uint16_t(VAL)));
   else if (BitWidth == 32)
-    return APInt(BitWidth, ByteSwap_32(VAL));
+    return APInt(BitWidth, ByteSwap_32(uint32_t(VAL)));
   else if (BitWidth == 48) {
-    uint64_t Tmp1 = ((VAL >> 32) << 16) | (VAL & 0xFFFF);
+    uint32_t Tmp1 = uint32_t(VAL >> 16);
     Tmp1 = ByteSwap_32(Tmp1);
-    uint64_t Tmp2 = (VAL >> 16) & 0xFFFF;
+    uint16_t Tmp2 = uint16_t(VAL);
     Tmp2 = ByteSwap_16(Tmp2);
-    return 
-      APInt(BitWidth, 
-            (Tmp1 & 0xff) | ((Tmp1<<16) & 0xffff00000000ULL) | (Tmp2 << 16));
+    return APInt(BitWidth, (uint64_t(Tmp2) << 32) | Tmp1);
   } else if (BitWidth == 64)
     return APInt(BitWidth, ByteSwap_64(VAL));
   else {
@@ -869,9 +868,9 @@
   // Return infinity for exponent overflow
   if (exp > 1023) {
     if (!isSigned || !isNeg)
-      return double(1.0E300 * 1.0E300); // positive infinity
+      return std::numeric_limits<double>::infinity();
     else 
-      return double(-1.0E300 * 1.0E300); // negative infinity
+      return -std::numeric_limits<double>::infinity();
   }
   exp += 1023; // Increment for 1023 bias
 





From jeffc at jolt-lang.org  Tue Mar 20 15:43:41 2007
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Tue, 20 Mar 2007 15:43:41 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
Message-ID: <200703202043.l2KKhfuk032473@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

ScheduleDAG.cpp updated: 1.124 -> 1.125
---
Log message:

Fix some VC++ warnings.

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

 ScheduleDAG.cpp |    1 +
 1 files changed, 1 insertion(+)


Index: llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.124 llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.125
--- llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp:1.124	Tue Mar 20 15:09:03 2007
+++ llvm/lib/CodeGen/SelectionDAG/ScheduleDAG.cpp	Tue Mar 20 15:43:18 2007
@@ -394,6 +394,7 @@
     if ((*I)->hasType(VT) && (*I)->contains(reg))
       return *I;
   assert(false && "Couldn't find the register class");
+  return 0;
 }
 
 /// EmitNode - Generate machine code for an node and needed dependencies.





From jeffc at jolt-lang.org  Tue Mar 20 15:43:41 2007
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Tue, 20 Mar 2007 15:43:41 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
Message-ID: <200703202043.l2KKhfOS032470@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

LoopStrengthReduce.cpp updated: 1.119 -> 1.120
---
Log message:

Fix some VC++ warnings.

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

 LoopStrengthReduce.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
diff -u llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.119 llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.120
--- llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.119	Mon Mar 19 19:47:50 2007
+++ llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp	Tue Mar 20 15:43:18 2007
@@ -44,7 +44,7 @@
 
 namespace {
 
-  class BasedUser;
+  struct BasedUser;
 
   /// IVStrideUse - Keep track of one use of a strided induction variable, where
   /// the stride is stored externally.  The Offset member keeps track of the 





From baldrick at free.fr  Tue Mar 20 16:13:48 2007
From: baldrick at free.fr (Duncan Sands)
Date: Tue, 20 Mar 2007 22:13:48 +0100
Subject: [llvm-commits] llvm-gcc: raise an assert rather than converting 80
	and 96 bit floating point types
Message-ID: <200703202213.48644.baldrick@free.fr>

Converting 80 and 96 bit floating point types to a 64 bit LLVM type breaks
the invariant that gcc types of constant size map to LLVM types of the same
size.  Since it should not actually be possible to get 80 and 96 bit floating
point types in llvm-gcc nowadays, remove the conversion of such types, which
will cause an assert failure if such a type manages to creep in.

Ciao,

Duncan.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: floats.diff
Type: text/x-diff
Size: 603 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070320/7066aa09/attachment.bin 

From dpatel at apple.com  Tue Mar 20 16:25:48 2007
From: dpatel at apple.com (Devang Patel)
Date: Tue, 20 Mar 2007 16:25:48 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Dominators.cpp
Message-ID: <200703202125.l2KLPmER000890@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Dominators.cpp updated: 1.79 -> 1.80
---
Log message:

DominanceFrontier::calculate().
Avoid recursion, Use iterative algorithm.


---
Diffs of the changes:  (+77 -22)

 Dominators.cpp |   99 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 77 insertions(+), 22 deletions(-)


Index: llvm/lib/VMCore/Dominators.cpp
diff -u llvm/lib/VMCore/Dominators.cpp:1.79 llvm/lib/VMCore/Dominators.cpp:1.80
--- llvm/lib/VMCore/Dominators.cpp:1.79	Tue Mar 20 15:18:12 2007
+++ llvm/lib/VMCore/Dominators.cpp	Tue Mar 20 16:25:31 2007
@@ -46,6 +46,19 @@
 static RegisterPass<ImmediateDominators>
 C("idom", "Immediate Dominators Construction", true);
 
+namespace {
+  class  DFCalculateWorkObject  {
+  public:
+    DFCalculateWorkObject(BasicBlock *B, BasicBlock *P, 
+                          const DominatorTree::Node *N,
+                          const DominatorTree::Node *PN)
+      : currentBB(B), parentBB(P), Node(N), parentNode(PN) {}
+    BasicBlock *currentBB;
+    BasicBlock *parentBB;
+    const DominatorTree::Node *Node;
+    const DominatorTree::Node *parentNode;
+  };
+}
 unsigned ImmediateDominators::DFSPass(BasicBlock *V, InfoRec &VInfo,
                                       unsigned N) {
   VInfo.Semi = ++N;
@@ -439,34 +452,76 @@
 const DominanceFrontier::DomSetType &
 DominanceFrontier::calculate(const DominatorTree &DT,
                              const DominatorTree::Node *Node) {
-  // Loop over CFG successors to calculate DFlocal[Node]
   BasicBlock *BB = Node->getBlock();
-  DomSetType &S = Frontiers[BB];       // The new set to fill in...
+  DomSetType *Result = NULL;
 
-  for (succ_iterator SI = succ_begin(BB), SE = succ_end(BB);
-       SI != SE; ++SI) {
-    // Does Node immediately dominate this successor?
-    if (DT[*SI]->getIDom() != Node)
-      S.insert(*SI);
-  }
+  std::vector<DFCalculateWorkObject *> workList;
+  std::set<BasicBlock *> visited;
 
-  // At this point, S is DFlocal.  Now we union in DFup's of our children...
-  // Loop through and visit the nodes that Node immediately dominates (Node's
-  // children in the IDomTree)
-  //
-  for (DominatorTree::Node::const_iterator NI = Node->begin(), NE = Node->end();
-       NI != NE; ++NI) {
-    DominatorTree::Node *IDominee = *NI;
-    const DomSetType &ChildDF = calculate(DT, IDominee);
+  DFCalculateWorkObject *W = new DFCalculateWorkObject(BB, NULL, Node, NULL);
+  workList.push_back(W);
+  do {
+    DFCalculateWorkObject *currentW = workList.back();
+    assert (currentW && "Missing work object.");
+
+    BasicBlock *currentBB = currentW->currentBB;
+    BasicBlock *parentBB = currentW->parentBB;
+    const DominatorTree::Node *currentNode = currentW->Node;
+    const DominatorTree::Node *parentNode = currentW->parentNode;
+    assert (currentBB && "Invalid work object. Missing current Basic Block");
+    assert (currentNode && "Invalid work object. Missing current Node");
+    DomSetType &S = Frontiers[currentBB];
+
+    // Visit each block only once.
+    if (visited.count(currentBB) == 0) {
+      visited.insert(currentBB);
+
+      // Loop over CFG successors to calculate DFlocal[currentNode]
+      for (succ_iterator SI = succ_begin(currentBB), SE = succ_end(currentBB);
+           SI != SE; ++SI) {
+        // Does Node immediately dominate this successor?
+        if (DT[*SI]->getIDom() != currentNode)
+          S.insert(*SI);
+      }
+    }
 
-    DomSetType::const_iterator CDFI = ChildDF.begin(), CDFE = ChildDF.end();
-    for (; CDFI != CDFE; ++CDFI) {
-      if (!Node->properlyDominates(DT[*CDFI]))
-        S.insert(*CDFI);
+    // At this point, S is DFlocal.  Now we union in DFup's of our children...
+    // Loop through and visit the nodes that Node immediately dominates (Node's
+    // children in the IDomTree)
+    bool visitChild = false;
+    for (DominatorTree::Node::const_iterator NI = currentNode->begin(), 
+           NE = currentNode->end(); NI != NE; ++NI) {
+      DominatorTree::Node *IDominee = *NI;
+      BasicBlock *childBB = IDominee->getBlock();
+      if (visited.count(childBB) == 0) {
+        DFCalculateWorkObject *newW = 
+          new DFCalculateWorkObject(childBB, currentBB, IDominee, currentNode);
+        workList.push_back(newW);
+        visitChild = true;
+      }
     }
-  }
 
-  return S;
+    // If all children are visited or there is any child then pop this block
+    // from the workList.
+    if (!visitChild) {
+
+      if (!parentBB) {
+        Result = &S;
+        break;
+      }
+
+      DomSetType::const_iterator CDFI = S.begin(), CDFE = S.end();
+      DomSetType &parentSet = Frontiers[parentBB];
+      for (; CDFI != CDFE; ++CDFI) {
+        if (!parentNode->properlyDominates(DT[*CDFI]))
+          parentSet.insert(*CDFI);
+      }
+      workList.pop_back();
+    }
+
+  } while (!workList.empty());
+
+  return *Result;
 }
 
 void DominanceFrontierBase::print(std::ostream &o, const Module* ) const {





From dalej at apple.com  Tue Mar 20 16:35:27 2007
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 20 Mar 2007 16:35:27 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/BranchFolding.cpp
	RegisterScavenging.cpp
Message-ID: <200703202135.l2KLZRIv001107@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

BranchFolding.cpp updated: 1.44 -> 1.45
RegisterScavenging.cpp updated: 1.12 -> 1.13
---
Log message:

maintain LiveIn when splitting blocks (register scavenging needs it)


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

 BranchFolding.cpp      |   23 ++++++++++++++++++++++-
 RegisterScavenging.cpp |    7 +++++++
 2 files changed, 29 insertions(+), 1 deletion(-)


Index: llvm/lib/CodeGen/BranchFolding.cpp
diff -u llvm/lib/CodeGen/BranchFolding.cpp:1.44 llvm/lib/CodeGen/BranchFolding.cpp:1.45
--- llvm/lib/CodeGen/BranchFolding.cpp:1.44	Thu Feb 22 10:39:03 2007
+++ llvm/lib/CodeGen/BranchFolding.cpp	Tue Mar 20 16:35:06 2007
@@ -21,8 +21,10 @@
 #include "llvm/CodeGen/MachineModuleInfo.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineJumpTableInfo.h"
+#include "llvm/CodeGen/RegisterScavenging.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/ADT/Statistic.h"
@@ -49,7 +51,9 @@
                                  MachineBasicBlock *NewDest);
     MachineBasicBlock *SplitMBBAt(MachineBasicBlock &CurMBB,
                                   MachineBasicBlock::iterator BBI1);
-        
+
+    const MRegisterInfo *RegInfo;
+    RegScavenger *RS;
     // Branch optzn.
     bool OptimizeBranches(MachineFunction &MF);
     void OptimizeBlock(MachineBasicBlock *MBB);
@@ -95,6 +99,9 @@
   TII = MF.getTarget().getInstrInfo();
   if (!TII) return false;
 
+  RegInfo = MF.getTarget().getRegisterInfo();
+  RS = RegInfo->requiresRegisterScavenging(MF) ? new RegScavenger() : NULL;
+
   MMI = getAnalysisToUpdate<MachineModuleInfo>();
   
   bool EverMadeChange = false;
@@ -153,6 +160,7 @@
       }
   }
   
+  delete RS;
   return EverMadeChange;
 }
 
@@ -280,6 +288,19 @@
   
   // Splice the code over.
   NewMBB->splice(NewMBB->end(), &CurMBB, BBI1, CurMBB.end());
+
+  // For targets that use the register scavenger, we must maintain LiveIns.
+  if (RS) {
+    RS->enterBasicBlock(&CurMBB);
+    if (!CurMBB.empty())
+      RS->forward(prior(CurMBB.end()));
+    BitVector RegsLiveAtExit(RegInfo->getNumRegs());
+    RS->getRegsUsed(RegsLiveAtExit, false);
+    for (unsigned int i=0, e=RegInfo->getNumRegs(); i!=e; i++)
+      if (RegsLiveAtExit[i])
+        NewMBB->addLiveIn(i);
+  }
+
   return NewMBB;
 }
 


Index: llvm/lib/CodeGen/RegisterScavenging.cpp
diff -u llvm/lib/CodeGen/RegisterScavenging.cpp:1.12 llvm/lib/CodeGen/RegisterScavenging.cpp:1.13
--- llvm/lib/CodeGen/RegisterScavenging.cpp:1.12	Tue Mar  6 15:58:15 2007
+++ llvm/lib/CodeGen/RegisterScavenging.cpp	Tue Mar 20 16:35:06 2007
@@ -180,6 +180,13 @@
   setUsed(ChangedRegs);
 }
 
+void RegScavenger::getRegsUsed(BitVector &used, bool includeReserved) {
+  if (includeReserved)
+    used = RegStates;
+  else
+    used = RegStates & ~ReservedRegs;
+}
+
 /// CreateRegClassMask - Set the bits that represent the registers in the
 /// TargetRegisterClass.
 static void CreateRegClassMask(const TargetRegisterClass *RC, BitVector &Mask) {





From dalej at apple.com  Tue Mar 20 16:35:27 2007
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 20 Mar 2007 16:35:27 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/RegisterScavenging.h
Message-ID: <200703202135.l2KLZR0x001113@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/CodeGen:

RegisterScavenging.h updated: 1.10 -> 1.11
---
Log message:

maintain LiveIn when splitting blocks (register scavenging needs it)


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

 RegisterScavenging.h |    3 +++
 1 files changed, 3 insertions(+)


Index: llvm/include/llvm/CodeGen/RegisterScavenging.h
diff -u llvm/include/llvm/CodeGen/RegisterScavenging.h:1.10 llvm/include/llvm/CodeGen/RegisterScavenging.h:1.11
--- llvm/include/llvm/CodeGen/RegisterScavenging.h:1.10	Sat Mar 17 22:26:04 2007
+++ llvm/include/llvm/CodeGen/RegisterScavenging.h	Tue Mar 20 16:35:06 2007
@@ -91,6 +91,9 @@
   bool isUsed(unsigned Reg) const   { return !RegStates[Reg]; }
   bool isUnused(unsigned Reg) const { return RegStates[Reg]; }
 
+  /// getRegsUsed - return all registers currently in use in used.
+  void getRegsUsed(BitVector &used, bool includeReserved);
+
   /// setUsed / setUnused - Mark the state of one or a number of registers.
   ///
   void setUsed(unsigned Reg)     { RegStates.reset(Reg); }





From dalej at apple.com  Tue Mar 20 16:55:17 2007
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 20 Mar 2007 16:55:17 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMISelLowering.h
	ARMISelLowering.cpp
Message-ID: <200703202155.l2KLtHDU001782@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMISelLowering.h updated: 1.5 -> 1.6
ARMISelLowering.cpp updated: 1.27 -> 1.28
---
Log message:

do not share old induction variables when this would result in invalid
instructions (that would have to be split later)


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

 ARMISelLowering.cpp |   18 ++++++++++++++++++
 ARMISelLowering.h   |   11 +++++++++++
 2 files changed, 29 insertions(+)


Index: llvm/lib/Target/ARM/ARMISelLowering.h
diff -u llvm/lib/Target/ARM/ARMISelLowering.h:1.5 llvm/lib/Target/ARM/ARMISelLowering.h:1.6
--- llvm/lib/Target/ARM/ARMISelLowering.h:1.5	Mon Mar 19 19:30:56 2007
+++ llvm/lib/Target/ARM/ARMISelLowering.h	Tue Mar 20 16:54:54 2007
@@ -100,6 +100,17 @@
     /// type.
     virtual bool isLegalAddressScale(int64_t S, const Type *Ty) const;
 
+    /// isLegalAddressScaleAndImm - Return true if S works for 
+    /// IsLegalAddressScale and V works for isLegalAddressImmediate _and_ 
+    /// both can be applied simultaneously to the same instruction.
+    virtual bool isLegalAddressScaleAndImm(int64_t S, int64_t V, 
+                                           const Type *Ty) const;
+
+    /// isLegalAddressScaleAndImm - Return true if S works for 
+    /// IsLegalAddressScale and GV works for isLegalAddressImmediate _and_
+    /// both can be applied simultaneously to the same instruction.
+    virtual bool isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV) const;
+
     /// getPreIndexedAddressParts - returns true by value, base pointer and
     /// offset pointer and addressing mode by reference if the node's address
     /// can be legally represented as pre-indexed load / store address.


Index: llvm/lib/Target/ARM/ARMISelLowering.cpp
diff -u llvm/lib/Target/ARM/ARMISelLowering.cpp:1.27 llvm/lib/Target/ARM/ARMISelLowering.cpp:1.28
--- llvm/lib/Target/ARM/ARMISelLowering.cpp:1.27	Tue Mar 20 12:57:23 2007
+++ llvm/lib/Target/ARM/ARMISelLowering.cpp	Tue Mar 20 16:54:54 2007
@@ -1379,6 +1379,24 @@
   }
 }
 
+/// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
+/// and V works for isLegalAddressImmediate _and_ both can be applied
+/// simultaneously to the same instruction.
+bool ARMTargetLowering::isLegalAddressScaleAndImm(int64_t S, int64_t V, 
+                                               const Type* Ty) const {
+  if (V == 0)
+    return isLegalAddressScale(S, Ty);
+  return false;
+}
+
+/// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
+/// and GV works for isLegalAddressImmediate _and_ both can be applied
+/// simultaneously to the same instruction.
+bool ARMTargetLowering::isLegalAddressScaleAndImm(int64_t S, 
+                                               GlobalValue *GV) const {
+  return false;
+}
+
 static bool getIndexedAddressParts(SDNode *Ptr, MVT::ValueType VT,
                                    bool isSEXTLoad, SDOperand &Base,
                                    SDOperand &Offset, bool &isInc,





From dalej at apple.com  Tue Mar 20 16:55:17 2007
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 20 Mar 2007 16:55:17 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
Message-ID: <200703202155.l2KLtHI9001787@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

TargetLowering.cpp updated: 1.97 -> 1.98
---
Log message:

do not share old induction variables when this would result in invalid
instructions (that would have to be split later)


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

 TargetLowering.cpp |   16 ++++++++++++++++
 1 files changed, 16 insertions(+)


Index: llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp:1.97 llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp:1.98
--- llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp:1.97	Fri Mar 16 03:42:32 2007
+++ llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp	Tue Mar 20 16:54:54 2007
@@ -1958,6 +1958,22 @@
   return false;
 }
 
+/// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
+/// and V works for isLegalAddressImmediate _and_ both can be applied
+/// simultaneously to the same instruction.
+bool TargetLowering::isLegalAddressScaleAndImm(int64_t S, int64_t V, 
+                                               const Type* Ty) const {
+  return false;
+}
+
+/// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
+/// and GV works for isLegalAddressImmediate _and_ both can be applied
+/// simultaneously to the same instruction.
+bool TargetLowering::isLegalAddressScaleAndImm(int64_t S, 
+                                               GlobalValue *GV) const {
+
+  return false;
+}
 
 // Magic for divide replacement
 





From dalej at apple.com  Tue Mar 20 16:55:20 2007
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 20 Mar 2007 16:55:20 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetLowering.h
Message-ID: <200703202155.l2KLtKoY001793@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetLowering.h updated: 1.113 -> 1.114
---
Log message:

do not share old induction variables when this would result in invalid
instructions (that would have to be split later)


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

 TargetLowering.h |   10 ++++++++++
 1 files changed, 10 insertions(+)


Index: llvm/include/llvm/Target/TargetLowering.h
diff -u llvm/include/llvm/Target/TargetLowering.h:1.113 llvm/include/llvm/Target/TargetLowering.h:1.114
--- llvm/include/llvm/Target/TargetLowering.h:1.113	Fri Mar 16 03:42:32 2007
+++ llvm/include/llvm/Target/TargetLowering.h	Tue Mar 20 16:54:54 2007
@@ -875,6 +875,16 @@
   /// scale of the target addressing mode for load / store of the given type.
   virtual bool isLegalAddressScale(int64_t S, const Type *Ty) const;
 
+  /// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
+  /// and V works for isLegalAddressImmediate _and_ both can be applied
+  /// simultaneously to the same instruction.
+  virtual bool isLegalAddressScaleAndImm(int64_t S, int64_t V, 
+                                                    const Type* Ty) const;
+  /// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
+  /// and GV works for isLegalAddressImmediate _and_ both can be applied
+  /// simultaneously to the same instruction.
+  virtual bool isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV) const;
+
   //===--------------------------------------------------------------------===//
   // Div utility functions
   //





From dalej at apple.com  Tue Mar 20 16:55:20 2007
From: dalej at apple.com (Dale Johannesen)
Date: Tue, 20 Mar 2007 16:55:20 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
Message-ID: <200703202155.l2KLtKEv001798@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

LoopStrengthReduce.cpp updated: 1.120 -> 1.121
---
Log message:

do not share old induction variables when this would result in invalid
instructions (that would have to be split later)


---
Diffs of the changes:  (+26 -18)

 LoopStrengthReduce.cpp |   44 ++++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 18 deletions(-)


Index: llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp
diff -u llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.120 llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.121
--- llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp:1.120	Tue Mar 20 15:43:18 2007
+++ llvm/lib/Transforms/Scalar/LoopStrengthReduce.cpp	Tue Mar 20 16:54:54 2007
@@ -883,9 +883,16 @@
 ///
 bool LoopStrengthReduce::ValidStride(int64_t Scale, 
                                const std::vector<BasedUser>& UsersToProcess) {
-  for (unsigned i=0, e = UsersToProcess.size(); i!=e; ++i)
-    if (!TLI->isLegalAddressScale(Scale, UsersToProcess[i].Inst->getType()))
+  int64_t Imm;
+  for (unsigned i=0, e = UsersToProcess.size(); i!=e; ++i) {
+    if (SCEVConstant *SC = dyn_cast<SCEVConstant>(UsersToProcess[i].Imm))
+      Imm = SC->getValue()->getSExtValue();
+    else
+      Imm = 0;
+    if (!TLI->isLegalAddressScaleAndImm(Scale, Imm, 
+                                  UsersToProcess[i].Inst->getType()))
       return false;
+  }
   return true;
 }
 
@@ -968,22 +975,6 @@
   SCEVHandle CommonExprs =
     RemoveCommonExpressionsFromUseBases(UsersToProcess);
   
-  // Check if it is possible to reuse a IV with stride that is factor of this
-  // stride. And the multiple is a number that can be encoded in the scale
-  // field of the target addressing mode.
-  PHINode *NewPHI = NULL;
-  Value   *IncV   = NULL;
-  IVExpr   ReuseIV;
-  unsigned RewriteFactor = CheckForIVReuse(Stride, ReuseIV,
-                                           CommonExprs->getType(),
-                                           UsersToProcess);
-  if (RewriteFactor != 0) {
-    DOUT << "BASED ON IV of STRIDE " << *ReuseIV.Stride
-         << " and BASE " << *ReuseIV.Base << " :\n";
-    NewPHI = ReuseIV.PHI;
-    IncV   = ReuseIV.IncV;
-  }
-
   // Next, figure out what we can represent in the immediate fields of
   // instructions.  If we can represent anything there, move it to the imm
   // fields of the BasedUsers.  We do this so that it increases the commonality
@@ -1011,6 +1002,23 @@
     }
   }
 
+  // Check if it is possible to reuse a IV with stride that is factor of this
+  // stride. And the multiple is a number that can be encoded in the scale
+  // field of the target addressing mode.  And we will have a valid
+  // instruction after this substition, including the immediate field, if any.
+  PHINode *NewPHI = NULL;
+  Value   *IncV   = NULL;
+  IVExpr   ReuseIV;
+  unsigned RewriteFactor = CheckForIVReuse(Stride, ReuseIV,
+                                           CommonExprs->getType(),
+                                           UsersToProcess);
+  if (RewriteFactor != 0) {
+    DOUT << "BASED ON IV of STRIDE " << *ReuseIV.Stride
+         << " and BASE " << *ReuseIV.Base << " :\n";
+    NewPHI = ReuseIV.PHI;
+    IncV   = ReuseIV.IncV;
+  }
+
   // Now that we know what we need to do, insert the PHI node itself.
   //
   DOUT << "INSERTING IV of STRIDE " << *Stride << " and BASE "





From reid at x10sys.com  Tue Mar 20 17:01:37 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 17:01:37 -0500
Subject: [llvm-commits] CVS: llvm-www/InTheNews.html
Message-ID: <200703202201.l2KM1b9k002117@zion.cs.uiuc.edu>



Changes in directory llvm-www:

InTheNews.html updated: 1.7 -> 1.8
---
Log message:

Several more articles.


---
Diffs of the changes:  (+30 -6)

 InTheNews.html |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)


Index: llvm-www/InTheNews.html
diff -u llvm-www/InTheNews.html:1.7 llvm-www/InTheNews.html:1.8
--- llvm-www/InTheNews.html:1.7	Tue Mar 20 15:35:33 2007
+++ llvm-www/InTheNews.html	Tue Mar 20 17:01:19 2007
@@ -4,9 +4,8 @@
   <p>Here's a list of news articles that mention LLVM so you can see what others
   are saying about LLVM. These articles have not been written by the core 
   LLVM developers, and we <b>do not</b> vouch for their accuracy or content. 
-  There are no email
-  list entries here, just news articles and it is sorted from newest to 
-  oldest.</p>
+  There are no email list entries here, just news articles and it is sorted 
+  from newest to oldest.</p>
   <!----------------------------------------------------------------------- -->
   <!-- NOTE TO MAINTAINERS:                                                 -->
   <!--   1. No Email list entries here, just news articles                  -->
@@ -24,6 +23,13 @@
     <li><a href="http://www.ipodobserver.com/story/30184">2007-02-01</a>, 
     iPodObserver, "<b>An iPhone Performance Secret: LLVM</b>", John 
     Martellaro.</li>
+    <li><a href="http://www.dailytechrag.com/story/what-s-powering-the-iphone/2007-01-31">2007-01-31</a>
+    daily techRAG, "<b>What's powering the iPhone?</b>", Unknown</li>
+    <li><a href="http://community.freepascal.org:10000/bboards/message?message_id=242806&forum_id=24105">2007-01-23</a>, 
+    free pascal community, "<b>What About LLVM?</b>", Nicola Lugato</li>
+    <li><a href="http://www.automotivedesignline.com/news/197000935;jsessionid=TU3SEN4OSVORYQSNDLQCKH0CJUNN2JVN">2007-01-22</a>,
+    Automotive Design Line, "<b>Hardware generation method anticipates design 
+      reuse</b>" (LLVM used in AH IR compiler flow), K.C. Krishnadas.</li>
     <li><a href="http://lca2007.linux.org.au/talk/27">2007-01-15</a>,
     Linux.conf.au, "<b>The ARM Backend Of LLVM</b>", Rafael Espindola.</li>
     <li><a href="http://www.leonard-ritter.com/lunar_goes_llvm">2007-01-13</a>,
@@ -31,19 +37,37 @@
   </ul>
   <p><b>2006</b></p>
   <ul>
-    <li><a
-      href="http://macslash.org/article.pl?sid=06/08/18/1248220&amp;mode=thread">2006-08-18</a>,
+    <li<a href="http://www.osnews.com/story.php/15530/LLVM-at-Apple-the-OpenGL-Stack">2006-08-18</a>,
+    OSNews, "<b>LLVM at Apple: the OpenGL Stack</b>", Hakime.</li>
+    <li><a href="http://macslash.org/article.pl?sid=06/08/18/1248220&amp;mode=thread">2006-08-18</a>,
     Mac Slash, "<b>Leopard OpenGL: Better Performance With LLVM</b>", Trollaxor.
     </li>
     <li><a href="http://arstechnica.com/staff/fatbits.ars/2006/8/17/5024">2006-08-17</a>,
     ars technica, "<b>LLVM in Leopard and beyond</b>", John Siracusa.</li>
   </ul>
+  <p><b>2005</b></p>
+  <ul>
+    <li><a
+      href="http://www.osnews.com/story.php/12715/Apple-Invests-in-LLVM-Suggests-Merge-with-GCC">2005-11-19</a>
+    OSNews, "<b>Apple Invests in LLVM, Suggests Merge with GCC</b>", 
+    resistor</li>
+    <li><a href="http://www.debian.org/News/weekly/2005/15/">2005-04-12</a>,
+    Debian Weekly News, "<b>LLVM included in New or Noteworthy Packages</b>",
+    Martin 'Joey' Schulze</li>
+  </ul>
+  <p><b>2004</b></p>
+  <ul>
+    <li><a href="http://lambda-the-ultimate.org/node/141">2004-07-29</a>,
+    Lambda the Ultimate, "<b>Udell at OSCON: IronPython news</b>", Ehud
+    Lamm.</li>
+  </ul>
   <p>
   <p>Here are some other links about LLVM, of general interest.</p>
   <ul>
     <li><a href="http://en.wikipedia.org/wiki/LLVM">Wikipedia Article</a></li>
     <li><a href="http://www.answers.com/topic/low-level-virtual-machine">
       Answers.com</a></li>
+    <li><a href="http://freshmeat.net/projects/llvm/">LLVM's FreshMeat Page</li>
     <li><a href="http://technorati.com/tag/LLVM">Technorati Tag LLVM</a></li>
     <li><a
       href="http://www.google.com/url?sa=t&amp;ct=res&amp;cd=19&amp;url=http%3A%2F%2Fgcc.gnu.org%2Fml%2Fgcc%2F2003-10%2Fmsg01218.html&amp;ei=czAARqzuKa_giwHtl6DHDA&amp;usg=__UMlQ8OtGF-PBZb1OKgatM0ZF_lM=&amp;sig2=S4qUiyjXs77aUyc4Zho1vA">Chris
@@ -59,6 +83,6 @@
   <a href="http://validator.w3.org/check/referer"><img
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
 <br/>
-  Last modified: $Date: 2007/03/20 20:35:33 $
+  Last modified: $Date: 2007/03/20 22:01:19 $
 </address>
 <!--#include virtual="footer.incl" -->





From reid at x10sys.com  Tue Mar 20 17:04:18 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 17:04:18 -0500
Subject: [llvm-commits] CVS: llvm-www/InTheNews.html
Message-ID: <200703202204.l2KM4I1b002233@zion.cs.uiuc.edu>



Changes in directory llvm-www:

InTheNews.html updated: 1.8 -> 1.9
---
Log message:

Drop answers.com as it just aggregates the Wikipedia article. 
Add Google BlogSearch query.


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

 InTheNews.html |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)


Index: llvm-www/InTheNews.html
diff -u llvm-www/InTheNews.html:1.8 llvm-www/InTheNews.html:1.9
--- llvm-www/InTheNews.html:1.8	Tue Mar 20 17:01:19 2007
+++ llvm-www/InTheNews.html	Tue Mar 20 17:04:01 2007
@@ -65,13 +65,14 @@
   <p>Here are some other links about LLVM, of general interest.</p>
   <ul>
     <li><a href="http://en.wikipedia.org/wiki/LLVM">Wikipedia Article</a></li>
-    <li><a href="http://www.answers.com/topic/low-level-virtual-machine">
-      Answers.com</a></li>
-    <li><a href="http://freshmeat.net/projects/llvm/">LLVM's FreshMeat Page</li>
+    <li><a href="http://freshmeat.net/projects/llvm/">LLVM's FreshMeat Page</a>
+    </li>
+    <li><a href="http://blogsearch.google.com/blogsearch?q=LLVM">Google
+      BlogSearch For LLVM</a></li>
     <li><a href="http://technorati.com/tag/LLVM">Technorati Tag LLVM</a></li>
     <li><a
-      href="http://www.google.com/url?sa=t&amp;ct=res&amp;cd=19&amp;url=http%3A%2F%2Fgcc.gnu.org%2Fml%2Fgcc%2F2003-10%2Fmsg01218.html&amp;ei=czAARqzuKa_giwHtl6DHDA&amp;usg=__UMlQ8OtGF-PBZb1OKgatM0ZF_lM=&amp;sig2=S4qUiyjXs77aUyc4Zho1vA">Chris
-      Lattner's LLVM 1.0 Announcement, 2003-10-24</a>.</li>
+      href="http://www.google.com/url?sa=t&amp;ct=res&amp;cd=19&amp;url=http%3A%2F%2Fgcc.gnu.org%2Fml%2Fgcc%2F2003-10%2Fmsg01218.html&amp;ei=czAARqzuKa_giwHtl6DHDA&amp;usg=__UMlQ8OtGF-PBZb1OKgatM0ZF_lM=&amp;sig2=S4qUiyjXs77aUyc4Zho1vA">
+      Chris Lattner's LLVM 1.0 Announcement, 2003-10-24</a>.</li>
   </ul>
 </div>
 
@@ -83,6 +84,6 @@
   <a href="http://validator.w3.org/check/referer"><img
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
 <br/>
-  Last modified: $Date: 2007/03/20 22:01:19 $
+  Last modified: $Date: 2007/03/20 22:04:01 $
 </address>
 <!--#include virtual="footer.incl" -->





From reid at x10sys.com  Tue Mar 20 17:08:08 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 17:08:08 -0500
Subject: [llvm-commits] CVS: llvm-www/InTheNews.html
Message-ID: <200703202208.l2KM88r8002352@zion.cs.uiuc.edu>



Changes in directory llvm-www:

InTheNews.html updated: 1.9 -> 1.10
---
Log message:

Fix a tag.


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

 InTheNews.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-www/InTheNews.html
diff -u llvm-www/InTheNews.html:1.9 llvm-www/InTheNews.html:1.10
--- llvm-www/InTheNews.html:1.9	Tue Mar 20 17:04:01 2007
+++ llvm-www/InTheNews.html	Tue Mar 20 17:07:51 2007
@@ -37,7 +37,7 @@
   </ul>
   <p><b>2006</b></p>
   <ul>
-    <li<a href="http://www.osnews.com/story.php/15530/LLVM-at-Apple-the-OpenGL-Stack">2006-08-18</a>,
+    <li><a href="http://www.osnews.com/story.php/15530/LLVM-at-Apple-the-OpenGL-Stack">2006-08-18</a>,
     OSNews, "<b>LLVM at Apple: the OpenGL Stack</b>", Hakime.</li>
     <li><a href="http://macslash.org/article.pl?sid=06/08/18/1248220&amp;mode=thread">2006-08-18</a>,
     Mac Slash, "<b>Leopard OpenGL: Better Performance With LLVM</b>", Trollaxor.
@@ -84,6 +84,6 @@
   <a href="http://validator.w3.org/check/referer"><img
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
 <br/>
-  Last modified: $Date: 2007/03/20 22:04:01 $
+  Last modified: $Date: 2007/03/20 22:07:51 $
 </address>
 <!--#include virtual="footer.incl" -->





From reid at x10sys.com  Tue Mar 20 17:09:33 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 17:09:33 -0500
Subject: [llvm-commits] CVS: llvm-www/InTheNews.html
Message-ID: <200703202209.l2KM9XiI002434@zion.cs.uiuc.edu>



Changes in directory llvm-www:

InTheNews.html updated: 1.10 -> 1.11
---
Log message:

Fix bad general entity reference.


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

 InTheNews.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-www/InTheNews.html
diff -u llvm-www/InTheNews.html:1.10 llvm-www/InTheNews.html:1.11
--- llvm-www/InTheNews.html:1.10	Tue Mar 20 17:07:51 2007
+++ llvm-www/InTheNews.html	Tue Mar 20 17:09:15 2007
@@ -25,7 +25,7 @@
     Martellaro.</li>
     <li><a href="http://www.dailytechrag.com/story/what-s-powering-the-iphone/2007-01-31">2007-01-31</a>
     daily techRAG, "<b>What's powering the iPhone?</b>", Unknown</li>
-    <li><a href="http://community.freepascal.org:10000/bboards/message?message_id=242806&forum_id=24105">2007-01-23</a>, 
+    <li><a href="http://community.freepascal.org:10000/bboards/message?message_id=242806&amp;forum_id=24105">2007-01-23</a>, 
     free pascal community, "<b>What About LLVM?</b>", Nicola Lugato</li>
     <li><a href="http://www.automotivedesignline.com/news/197000935;jsessionid=TU3SEN4OSVORYQSNDLQCKH0CJUNN2JVN">2007-01-22</a>,
     Automotive Design Line, "<b>Hardware generation method anticipates design 
@@ -84,6 +84,6 @@
   <a href="http://validator.w3.org/check/referer"><img
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
 <br/>
-  Last modified: $Date: 2007/03/20 22:07:51 $
+  Last modified: $Date: 2007/03/20 22:09:15 $
 </address>
 <!--#include virtual="footer.incl" -->





From evan.cheng at apple.com  Tue Mar 20 17:22:55 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 17:22:55 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/README.txt
Message-ID: <200703202222.l2KMMtiv002667@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

README.txt added (r1.1)
---
Log message:

Potential spiller improvement.

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

 README.txt |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+)


Index: llvm/lib/CodeGen/README.txt
diff -c /dev/null llvm/lib/CodeGen/README.txt:1.1
*** /dev/null	Tue Mar 20 17:22:48 2007
--- llvm/lib/CodeGen/README.txt	Tue Mar 20 17:22:38 2007
***************
*** 0 ****
--- 1,27 ----
+ Common register allocation / spilling problem:
+ 
+ 	mul lr, r4, lr
+ 	str lr, [sp, #+52]
+ 	ldr lr, [r1, #+32]
+ 	sxth r3, r3
+ 	ldr r4, [sp, #+52]
+ 	mla r4, r3, lr, r4
+ 
+ can be:
+ 
+ 	mul lr, r4, lr
+         mov r4, lr
+ 	str lr, [sp, #+52]
+ 	ldr lr, [r1, #+32]
+ 	sxth r3, r3
+ 	mla r4, r3, lr, r4
+ 
+ and then "merge" mul and mov:
+ 
+ 	mul r4, r4, lr
+ 	str lr, [sp, #+52]
+ 	ldr lr, [r1, #+32]
+ 	sxth r3, r3
+ 	mla r4, r3, lr, r4
+ 
+ It also increase the likelyhood the store may become dead.





From evan.cheng at apple.com  Tue Mar 20 17:32:56 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 17:32:56 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/README.txt
Message-ID: <200703202232.l2KMWu9D002938@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

README.txt updated: 1.20 -> 1.21
---
Log message:

Updated.

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

 README.txt |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)


Index: llvm/lib/Target/ARM/README.txt
diff -u llvm/lib/Target/ARM/README.txt:1.20 llvm/lib/Target/ARM/README.txt:1.21
--- llvm/lib/Target/ARM/README.txt:1.20	Fri Mar  9 13:46:06 2007
+++ llvm/lib/Target/ARM/README.txt	Tue Mar 20 17:32:39 2007
@@ -470,4 +470,9 @@
 
 //===---------------------------------------------------------------------===//
 
-Teach LSR about ARM addressing modes.
+More LSR enhancements possible:
+
+1. Teach LSR about pre- and post- indexed ops to allow iv increment be merged
+   in a load / store.
+2. Allow iv reuse even when a type conversion is required. For example, i8
+   and i32 load / store addressing modes are identical.





From evan.cheng at apple.com  Tue Mar 20 19:17:14 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 19:17:14 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86InstrFPStack.td
	X86InstrInfo.td X86InstrSSE.td
Message-ID: <200703210017.l2L0HEgD004682@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86InstrFPStack.td updated: 1.8 -> 1.9
X86InstrInfo.td updated: 1.299 -> 1.300
X86InstrSSE.td updated: 1.178 -> 1.179
---
Log message:

Mark re-materializable instructions.

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

 X86InstrFPStack.td |    2 ++
 X86InstrInfo.td    |    2 ++
 X86InstrSSE.td     |    2 ++
 3 files changed, 6 insertions(+)


Index: llvm/lib/Target/X86/X86InstrFPStack.td
diff -u llvm/lib/Target/X86/X86InstrFPStack.td:1.8 llvm/lib/Target/X86/X86InstrFPStack.td:1.9
--- llvm/lib/Target/X86/X86InstrFPStack.td:1.8	Fri Oct 13 16:14:26 2006
+++ llvm/lib/Target/X86/X86InstrFPStack.td	Tue Mar 20 19:16:56 2007
@@ -413,10 +413,12 @@
 def FXCH    : FPI<0xC8, AddRegFrm, (ops RST:$op), "fxch $op">, D9;
 
 // Floating point constant loads.
+let isReMaterializable = 1 in {
 def FpLD0 : FpI<(ops RFP:$dst), ZeroArgFP,
                 [(set RFP:$dst, fp64imm0)]>;
 def FpLD1 : FpI<(ops RFP:$dst), ZeroArgFP,
                 [(set RFP:$dst, fp64imm1)]>;
+}
 
 def FLD0 : FPI<0xEE, RawFrm, (ops), "fldz">, D9;
 def FLD1 : FPI<0xE8, RawFrm, (ops), "fld1">, D9;


Index: llvm/lib/Target/X86/X86InstrInfo.td
diff -u llvm/lib/Target/X86/X86InstrInfo.td:1.299 llvm/lib/Target/X86/X86InstrInfo.td:1.300
--- llvm/lib/Target/X86/X86InstrInfo.td:1.299	Fri Jan 26 08:34:52 2007
+++ llvm/lib/Target/X86/X86InstrInfo.td	Tue Mar 20 19:16:56 2007
@@ -601,6 +601,7 @@
                 "mov{w} {$src, $dst|$dst, $src}", []>, OpSize;
 def MOV32rr : I<0x89, MRMDestReg, (ops GR32:$dst, GR32:$src),
                 "mov{l} {$src, $dst|$dst, $src}", []>;
+let isReMaterializable = 1 in {
 def MOV8ri  : Ii8 <0xB0, AddRegFrm, (ops GR8 :$dst, i8imm :$src),
                    "mov{b} {$src, $dst|$dst, $src}",
                    [(set GR8:$dst, imm:$src)]>;
@@ -610,6 +611,7 @@
 def MOV32ri : Ii32<0xB8, AddRegFrm, (ops GR32:$dst, i32imm:$src),
                    "mov{l} {$src, $dst|$dst, $src}",
                    [(set GR32:$dst, imm:$src)]>;
+}
 def MOV8mi  : Ii8 <0xC6, MRM0m, (ops i8mem :$dst, i8imm :$src),
                    "mov{b} {$src, $dst|$dst, $src}",
                    [(store (i8 imm:$src), addr:$dst)]>;


Index: llvm/lib/Target/X86/X86InstrSSE.td
diff -u llvm/lib/Target/X86/X86InstrSSE.td:1.178 llvm/lib/Target/X86/X86InstrSSE.td:1.179
--- llvm/lib/Target/X86/X86InstrSSE.td:1.178	Sun Mar  4 00:13:52 2007
+++ llvm/lib/Target/X86/X86InstrSSE.td	Tue Mar 20 19:16:56 2007
@@ -1666,6 +1666,7 @@
 
 // Alias instructions that map zero vector to pxor / xorp* for sse.
 // FIXME: remove when we can teach regalloc that xor reg, reg is ok.
+let isReMaterializable = 1 in {
 def V_SET0 : PSI<0x57, MRMInitReg, (ops VR128:$dst),
                  "xorps $dst, $dst",
                  [(set VR128:$dst, (v4f32 immAllZerosV))]>;
@@ -1673,6 +1674,7 @@
 def V_SETALLONES : PDI<0x76, MRMInitReg, (ops VR128:$dst),
                        "pcmpeqd $dst, $dst",
                        [(set VR128:$dst, (v2f64 immAllOnesV))]>;
+}
 
 // FR32 / FR64 to 128-bit vector conversion.
 def MOVSS2PSrr : SSI<0x10, MRMSrcReg, (ops VR128:$dst, FR32:$src),





From evan.cheng at apple.com  Tue Mar 20 19:19:49 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Tue, 20 Mar 2007 19:19:49 -0500
Subject: [llvm-commits] CVS: llvm-test/Makefile.programs
Message-ID: <200703210019.l2L0Jnng004736@zion.cs.uiuc.edu>



Changes in directory llvm-test:

Makefile.programs updated: 1.262 -> 1.263
---
Log message:

Test re-materialization on x86.

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

 Makefile.programs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)


Index: llvm-test/Makefile.programs
diff -u llvm-test/Makefile.programs:1.262 llvm-test/Makefile.programs:1.263
--- llvm-test/Makefile.programs:1.262	Mon Mar 19 00:11:53 2007
+++ llvm-test/Makefile.programs	Tue Mar 20 19:19:32 2007
@@ -223,7 +223,8 @@
 LLCBETAOPTION := -sched=simple 
 endif
 ifeq ($(ARCH),x86)
-LLCBETAOPTION := -enable-tail-merge
+LLCBETAOPTION := -enable-rematerialization
+# -enable-tail-merge
 #-regalloc=local -fast
 endif
 ifeq ($(ARCH),Sparc)





From reid at x10sys.com  Tue Mar 20 22:21:36 2007
From: reid at x10sys.com (Reid Spencer)
Date: Tue, 20 Mar 2007 22:21:36 -0500
Subject: [llvm-commits] CVS: llvm-www/InTheNews.html
Message-ID: <200703210321.l2L3LaH8009676@zion.cs.uiuc.edu>



Changes in directory llvm-www:

InTheNews.html updated: 1.11 -> 1.12
---
Log message:

Add Debian and Ubuntu package information.


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

 InTheNews.html |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletion(-)


Index: llvm-www/InTheNews.html
diff -u llvm-www/InTheNews.html:1.11 llvm-www/InTheNews.html:1.12
--- llvm-www/InTheNews.html:1.11	Tue Mar 20 17:09:15 2007
+++ llvm-www/InTheNews.html	Tue Mar 20 22:21:18 2007
@@ -69,6 +69,11 @@
     </li>
     <li><a href="http://blogsearch.google.com/blogsearch?q=LLVM">Google
       BlogSearch For LLVM</a></li>
+    <li><a href="http://packages.qa.debian.org/l/llvm.html">Debian Testing 
+      Info</a>
+    <li><a href="http://packages.ubuntu.com/dapper/devel/llvm">Ubuntu Package
+      Info</a></li>
+    </li>
     <li><a href="http://technorati.com/tag/LLVM">Technorati Tag LLVM</a></li>
     <li><a
       href="http://www.google.com/url?sa=t&amp;ct=res&amp;cd=19&amp;url=http%3A%2F%2Fgcc.gnu.org%2Fml%2Fgcc%2F2003-10%2Fmsg01218.html&amp;ei=czAARqzuKa_giwHtl6DHDA&amp;usg=__UMlQ8OtGF-PBZb1OKgatM0ZF_lM=&amp;sig2=S4qUiyjXs77aUyc4Zho1vA">
@@ -84,6 +89,6 @@
   <a href="http://validator.w3.org/check/referer"><img
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!"></a>
 <br/>
-  Last modified: $Date: 2007/03/20 22:09:15 $
+  Last modified: $Date: 2007/03/21 03:21:18 $
 </address>
 <!--#include virtual="footer.incl" -->





From zhousheng00 at gmail.com  Tue Mar 20 23:34:54 2007
From: zhousheng00 at gmail.com (Zhou Sheng)
Date: Tue, 20 Mar 2007 23:34:54 -0500
Subject: [llvm-commits] CVS: llvm/lib/Support/APInt.cpp
Message-ID: <200703210434.l2L4YsDt013293@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Support:

APInt.cpp updated: 1.74 -> 1.75
---
Log message:

Fix a bug in getAllOnesValue() which broke
some test cases for bitwidth > 64.


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

 APInt.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Support/APInt.cpp
diff -u llvm/lib/Support/APInt.cpp:1.74 llvm/lib/Support/APInt.cpp:1.75
--- llvm/lib/Support/APInt.cpp:1.74	Tue Mar 20 15:42:36 2007
+++ llvm/lib/Support/APInt.cpp	Tue Mar 20 23:34:37 2007
@@ -605,7 +605,7 @@
   }
 
   // Set all the bits in all the words.
-  for (uint32_t i = 0; i < getNumWords() - 1; ++i)
+  for (uint32_t i = 0; i < getNumWords(); ++i)
     pVal[i] = -1ULL;
   // Clear the unused ones
   return clearUnusedBits();





From nicolas.geoffray at lip6.fr  Wed Mar 21 11:44:43 2007
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Wed, 21 Mar 2007 11:44:43 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
Message-ID: <200703211644.l2LGihxC032093@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/PowerPC:

PPCRegisterInfo.cpp updated: 1.117 -> 1.118
---
Log message:

Protect R31's frame offset from being used by callee-saved registers, when R31
is the frame pointer.



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

 PPCRegisterInfo.cpp |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+)


Index: llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp
diff -u llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp:1.117 llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp:1.118
--- llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp:1.117	Tue Mar 20 03:08:30 2007
+++ llvm/lib/Target/PowerPC/PPCRegisterInfo.cpp	Wed Mar 21 11:44:14 2007
@@ -891,6 +891,26 @@
   unsigned LR = getRARegister();
   FI->setUsesLR(MF.isPhysRegUsed(LR));
   MF.changePhyRegUsed(LR, false);
+
+
+  //  Save R31 if necessary
+  int FPSI = FI->getFramePointerSaveIndex();
+  bool IsPPC64 = Subtarget.isPPC64();
+  bool IsELF_ABI = Subtarget.isELF_ABI();
+  const MachineFrameInfo *MFI = MF.getFrameInfo();
+ 
+  // If the frame pointer save index hasn't been defined yet.
+  if (!FPSI &&  (NoFramePointerElim || MFI->hasVarSizedObjects()) 
+                                                  && IsELF_ABI) {
+    // Find out what the fix offset of the frame pointer save area.
+    int FPOffset = PPCFrameInfo::getFramePointerSaveOffset(IsPPC64, 
+                                                              !IsELF_ABI);
+    // Allocate the frame index for frame pointer save area.
+    FPSI = MF.getFrameInfo()->CreateFixedObject(IsPPC64? 8 : 4, FPOffset);
+    // Save the result.
+    FI->setFramePointerSaveIndex(FPSI);                      
+  }
+
 }
 
 void PPCRegisterInfo::emitPrologue(MachineFunction &MF) const {





From reid at x10sys.com  Wed Mar 21 12:14:53 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 12:14:53 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvm-upgrade/UpgradeParser.y
	UpgradeLexer.l UpgradeInternals.h
Message-ID: <200703211714.l2LHErsP000337@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvm-upgrade:

UpgradeParser.y updated: 1.71 -> 1.72
UpgradeLexer.l updated: 1.19 -> 1.20
UpgradeInternals.h updated: 1.11 -> 1.12
---
Log message:

For PR1256: http://llvm.org/PR1256 :
Make Signedness information pervasive throughout all types and values. 
There is no easy way to get around this. Because the GEP instruction can
index through an arbitrarily complex value structure, it is necessary to
keep track of signedness information throughout that structure. This change
makes Signedness a full class, capable of representing Signedness in 
arbitrarily shaped types. The class is then used throughout llvm-upgrade to
track signedness and differentiate between globals, locals, and functions
based on their signedness.

For PR1243: http://llvm.org/PR1243 :
This patch also removes bogus warnings about renaming internal globals. It
now only emits such warnings when renaming non-internal globals because
they may affect linkage.


---
Diffs of the changes:  (+708 -251)

 UpgradeInternals.h |  161 ++++++++++-
 UpgradeLexer.l     |   43 +--
 UpgradeParser.y    |  755 +++++++++++++++++++++++++++++++++++++----------------
 3 files changed, 708 insertions(+), 251 deletions(-)


Index: llvm/tools/llvm-upgrade/UpgradeParser.y
diff -u llvm/tools/llvm-upgrade/UpgradeParser.y:1.71 llvm/tools/llvm-upgrade/UpgradeParser.y:1.72
--- llvm/tools/llvm-upgrade/UpgradeParser.y:1.71	Wed Mar 14 22:25:34 2007
+++ llvm/tools/llvm-upgrade/UpgradeParser.y	Wed Mar 21 12:14:36 2007
@@ -67,7 +67,7 @@
 //
 typedef std::vector<Value *> ValueList;           // Numbered defs
 
-typedef std::pair<std::string,const Type*> RenameMapKey;
+typedef std::pair<std::string,TypeInfo> RenameMapKey;
 typedef std::map<RenameMapKey,std::string> RenameMapType;
 
 static void 
@@ -78,7 +78,10 @@
   Module *CurrentModule;
   std::map<const Type *, ValueList> Values; // Module level numbered definitions
   std::map<const Type *,ValueList> LateResolveValues;
-  std::vector<PATypeHolder>    Types;
+  std::vector<PATypeHolder> Types;
+  std::vector<Signedness> TypeSigns;
+  std::map<std::string,Signedness> NamedTypeSigns;
+  std::map<std::string,Signedness> NamedValueSigns;
   std::map<ValID, PATypeHolder> LateResolveTypes;
   static Module::Endianness Endian;
   static Module::PointerSize PointerSize;
@@ -135,6 +138,9 @@
 
     Values.clear();         // Clear out function local definitions
     Types.clear();
+    TypeSigns.clear();
+    NamedTypeSigns.clear();
+    NamedValueSigns.clear();
     CurrentModule = 0;
   }
 
@@ -208,6 +214,24 @@
 
 static bool inFunctionScope() { return CurFun.CurrentFunction != 0; }
 
+/// This function is just a utility to make a Key value for the rename map.
+/// The Key is a combination of the name, type, Signedness of the original 
+/// value (global/function). This just constructs the key and ensures that
+/// named Signedness values are resolved to the actual Signedness.
+/// @brief Make a key for the RenameMaps
+static RenameMapKey makeRenameMapKey(const std::string &Name, const Type* Ty, 
+                                     const Signedness &Sign) {
+  TypeInfo TI; 
+  TI.T = Ty; 
+  if (Sign.isNamed())
+    // Don't allow Named Signedness nodes because they won't match. The actual
+    // Signedness must be looked up in the NamedTypeSigns map.
+    TI.S.copy(CurModule.NamedTypeSigns[Sign.getName()]);
+  else
+    TI.S.copy(Sign);
+  return std::make_pair(Name, TI);
+}
+
 
 //===----------------------------------------------------------------------===//
 //               Code to handle definitions of all the types
@@ -233,7 +257,6 @@
     break;
   case ValID::NameVal:                 // Is it a named definition?
     if (const Type *N = CurModule.CurrentModule->getTypeByName(D.Name)) {
-      D.destroy();  // Free old strdup'd memory...
       return N;
     }
     break;
@@ -248,7 +271,6 @@
   //
   if (DoNotImprovise) return 0;  // Do we just want a null to be returned?
 
-
   if (inFunctionScope()) {
     if (D.Type == ValID::NameVal) {
       error("Reference to an undefined type: '" + D.getName() + "'");
@@ -266,13 +288,94 @@
   Type *Typ = OpaqueType::get();
   CurModule.LateResolveTypes.insert(std::make_pair(D, Typ));
   return Typ;
- }
+}
+
+/// This is like the getType method except that instead of looking up the type
+/// for a given ID, it looks up that type's sign.
+/// @brief Get the signedness of a referenced type
+static Signedness getTypeSign(const ValID &D) {
+  switch (D.Type) {
+  case ValID::NumberVal:               // Is it a numbered definition?
+    // Module constants occupy the lowest numbered slots...
+    if ((unsigned)D.Num < CurModule.TypeSigns.size()) {
+      return CurModule.TypeSigns[(unsigned)D.Num];
+    }
+    break;
+  case ValID::NameVal: {               // Is it a named definition?
+    std::map<std::string,Signedness>::const_iterator I = 
+      CurModule.NamedTypeSigns.find(D.Name);
+    if (I != CurModule.NamedTypeSigns.end())
+      return I->second;
+    // Perhaps its a named forward .. just cache the name
+    Signedness S;
+    S.makeNamed(D.Name);
+    return S;
+  }
+  default: 
+    break;
+  }
+  // If we don't find it, its signless
+  Signedness S;
+  S.makeSignless();
+  return S;
+}
+
+/// This function is analagous to getElementType in LLVM. It provides the same
+/// function except that it looks up the Signedness instead of the type. This is
+/// used when processing GEP instructions that need to extract the type of an
+/// indexed struct/array/ptr member. 
+/// @brief Look up an element's sign.
+static Signedness getElementSign(const ValueInfo& VI, 
+                                 const std::vector<Value*> &Indices) {
+  const Type *Ptr = VI.V->getType();
+  assert(isa<PointerType>(Ptr) && "Need pointer type");
+
+  unsigned CurIdx = 0;
+  Signedness S(VI.S);
+  while (const CompositeType *CT = dyn_cast<CompositeType>(Ptr)) {
+    if (CurIdx == Indices.size())
+      break;
+
+    Value *Index = Indices[CurIdx++];
+    assert(!isa<PointerType>(CT) || CurIdx == 1 && "Invalid type");
+    Ptr = CT->getTypeAtIndex(Index);
+    if (const Type* Ty = Ptr->getForwardedType())
+      Ptr = Ty;
+    assert(S.isComposite() && "Bad Signedness type");
+    if (isa<StructType>(CT)) {
+      S = S.get(cast<ConstantInt>(Index)->getZExtValue());
+    } else {
+      S = S.get(0UL);
+    }
+    if (S.isNamed())
+      S = CurModule.NamedTypeSigns[S.getName()];
+  }
+  Signedness Result;
+  Result.makeComposite(S);
+  return Result;
+}
+
+/// This function just translates a ConstantInfo into a ValueInfo and calls
+/// getElementSign(ValueInfo,...). Its just a convenience.
+/// @brief ConstantInfo version of getElementSign.
+static Signedness getElementSign(const ConstInfo& CI, 
+                                 const std::vector<Constant*> &Indices) {
+  ValueInfo VI;
+  VI.V = CI.C;
+  VI.S.copy(CI.S);
+  std::vector<Value*> Idx;
+  for (unsigned i = 0; i < Indices.size(); ++i)
+    Idx.push_back(Indices[i]);
+  Signedness result = getElementSign(VI, Idx);
+  VI.destroy();
+  return result;
+}
 
 /// This function determines if two function types differ only in their use of
 /// the sret parameter attribute in the first argument. If they are identical 
 /// in all other respects, it returns true. Otherwise, it returns false.
-bool FuncTysDifferOnlyBySRet(const FunctionType *F1, 
-                                   const FunctionType *F2) {
+static bool FuncTysDifferOnlyBySRet(const FunctionType *F1, 
+                                    const FunctionType *F2) {
   if (F1->getReturnType() != F2->getReturnType() ||
       F1->getNumParams() != F2->getNumParams() ||
       F1->getParamAttrs(0) != F2->getParamAttrs(0))
@@ -287,10 +390,27 @@
   return true;
 }
 
+/// This function determines if the type of V and Ty differ only by the SRet
+/// parameter attribute. This is a more generalized case of
+/// FuncTysDIfferOnlyBySRet since it doesn't require FunctionType arguments.
+static bool TypesDifferOnlyBySRet(Value *V, const Type* Ty) {
+  if (V->getType() == Ty)
+    return true;
+  const PointerType *PF1 = dyn_cast<PointerType>(Ty);
+  const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
+  if (PF1 && PF2) {
+    const FunctionType* FT1 = dyn_cast<FunctionType>(PF1->getElementType());
+    const FunctionType* FT2 = dyn_cast<FunctionType>(PF2->getElementType());
+    if (FT1 && FT2)
+      return FuncTysDifferOnlyBySRet(FT1, FT2);
+  }
+  return false;
+}
+
 // The upgrade of csretcc to sret param attribute may have caused a function 
 // to not be found because the param attribute changed the type of the called 
 // function. This helper function, used in getExistingValue, detects that
-// situation and returns V if it occurs and 0 otherwise. 
+// situation and bitcasts the function to the correct type.
 static Value* handleSRetFuncTypeMerge(Value *V, const Type* Ty) {
   // Handle degenerate cases
   if (!V)
@@ -298,23 +418,21 @@
   if (V->getType() == Ty)
     return V;
 
-  Value* Result = 0;
   const PointerType *PF1 = dyn_cast<PointerType>(Ty);
   const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
   if (PF1 && PF2) {
-    const FunctionType *FT1 =
-      dyn_cast<FunctionType>(PF1->getElementType());
-    const FunctionType *FT2 =
-      dyn_cast<FunctionType>(PF2->getElementType());
+    const FunctionType *FT1 = dyn_cast<FunctionType>(PF1->getElementType());
+    const FunctionType *FT2 = dyn_cast<FunctionType>(PF2->getElementType());
     if (FT1 && FT2 && FuncTysDifferOnlyBySRet(FT1, FT2))
       if (FT2->paramHasAttr(1, FunctionType::StructRetAttribute))
-        Result = V;
+        return V;
       else if (Constant *C = dyn_cast<Constant>(V))
-        Result = ConstantExpr::getBitCast(C, PF1);
+        return ConstantExpr::getBitCast(C, PF1);
       else
-        Result = new BitCastInst(V, PF1, "upgrd.cast", CurBB);
+        return new BitCastInst(V, PF1, "upgrd.cast", CurBB);
+      
   }
-  return Result;
+  return 0;
 }
 
 // getExistingValue - Look up the value specified by the provided type and
@@ -350,9 +468,8 @@
 
   case ValID::NameVal: {                // Is it a named definition?
     // Get the name out of the ID
-    std::string Name(D.Name);
-    Value* V = 0;
-    RenameMapKey Key = std::make_pair(Name, Ty);
+    RenameMapKey Key = makeRenameMapKey(D.Name, Ty, D.S);
+    Value *V = 0;
     if (inFunctionScope()) {
       // See if the name was renamed
       RenameMapType::const_iterator I = CurFun.RenameMap.find(Key);
@@ -360,10 +477,12 @@
       if (I != CurFun.RenameMap.end())
         LookupName = I->second;
       else
-        LookupName = Name;
+        LookupName = D.Name;
       ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable();
       V = SymTab.lookup(LookupName);
-      V = handleSRetFuncTypeMerge(V, Ty);
+      if (V && V->getType() != Ty)
+        V = handleSRetFuncTypeMerge(V, Ty);
+      assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type");
     }
     if (!V) {
       RenameMapType::const_iterator I = CurModule.RenameMap.find(Key);
@@ -371,9 +490,11 @@
       if (I != CurModule.RenameMap.end())
         LookupName = I->second;
       else
-        LookupName = Name;
+        LookupName = D.Name;
       V = CurModule.CurrentModule->getValueSymbolTable().lookup(LookupName);
-      V = handleSRetFuncTypeMerge(V, Ty);
+      if (V && V->getType() != Ty)
+        V = handleSRetFuncTypeMerge(V, Ty);
+      assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type");
     }
     if (!V) 
       return 0;
@@ -506,14 +627,13 @@
     break;
   case ValID::NameVal:                  // Is it a named definition?
     Name = ID.Name;
-    if (Value *N = CurFun.CurrentFunction->
-                   getValueSymbolTable().lookup(Name)) {
+    if (Value *N = CurFun.CurrentFunction->getValueSymbolTable().lookup(Name)) {
       if (N->getType() != Type::LabelTy) {
         // Register names didn't use to conflict with basic block names
         // because of type planes. Now they all have to be unique. So, we just
         // rename the register and treat this name as if no basic block
         // had been found.
-        RenameMapKey Key = std::make_pair(N->getName(),N->getType());
+        RenameMapKey Key = makeRenameMapKey(ID.Name, N->getType(), ID.S);
         N->setName(makeNameUnique(N->getName()));
         CurModule.RenameMap[Key] = N->getName();
         BB = 0;
@@ -624,19 +744,33 @@
   LateResolvers.clear();
 }
 
-// ResolveTypeTo - A brand new type was just declared.  This means that (if
-// name is not null) things referencing Name can be resolved.  Otherwise, things
-// refering to the number can be resolved.  Do this now.
-//
-static void ResolveTypeTo(char *Name, const Type *ToTy) {
+/// This function is used for type resolution and upref handling. When a type
+/// becomes concrete, this function is called to adjust the signedness for the
+/// concrete type.
+static void ResolveTypeSign(const Type* oldTy, const Signedness &Sign) {
+  std::string TyName = CurModule.CurrentModule->getTypeName(oldTy);
+  if (!TyName.empty())
+    CurModule.NamedTypeSigns[TyName] = Sign;
+}
+
+/// ResolveTypeTo - A brand new type was just declared.  This means that (if
+/// name is not null) things referencing Name can be resolved.  Otherwise, 
+/// things refering to the number can be resolved.  Do this now.
+static void ResolveTypeTo(char *Name, const Type *ToTy, const Signedness& Sign){
   ValID D;
-  if (Name) D = ValID::create(Name);
-  else      D = ValID::create((int)CurModule.Types.size());
+  if (Name)
+    D = ValID::create(Name);
+  else      
+    D = ValID::create((int)CurModule.Types.size());
+  D.S.copy(Sign);
+
+  CurModule.NamedTypeSigns[Name] = Sign;
 
   std::map<ValID, PATypeHolder>::iterator I =
     CurModule.LateResolveTypes.find(D);
   if (I != CurModule.LateResolveTypes.end()) {
-    ((DerivedType*)I->second.get())->refineAbstractTypeTo(ToTy);
+    const Type *OldTy = I->second.get();
+    ((DerivedType*)OldTy)->refineAbstractTypeTo(ToTy);
     CurModule.LateResolveTypes.erase(I);
   }
 }
@@ -696,12 +830,12 @@
 // null potentially, in which case this is a noop.  The string passed in is
 // assumed to be a malloc'd string buffer, and is free'd by this function.
 //
-static void setValueName(Value *V, char *NameStr) {
+static void setValueName(const ValueInfo &V, char *NameStr) {
   if (NameStr) {
     std::string Name(NameStr);      // Copy string
     free(NameStr);                  // Free old string
 
-    if (V->getType() == Type::VoidTy) {
+    if (V.V->getType() == Type::VoidTy) {
       error("Can't assign name '" + Name + "' to value with void type");
       return;
     }
@@ -714,13 +848,13 @@
     if (Existing) {
       // An existing value of the same name was found. This might have happened
       // because of the integer type planes collapsing in LLVM 2.0. 
-      if (Existing->getType() == V->getType() &&
+      if (Existing->getType() == V.V->getType() &&
           !TypeHasInteger(Existing->getType())) {
         // If the type does not contain any integers in them then this can't be
         // a type plane collapsing issue. It truly is a redefinition and we 
         // should error out as the assembly is invalid.
         error("Redefinition of value named '" + Name + "' of type '" +
-              V->getType()->getDescription() + "'");
+              V.V->getType()->getDescription() + "'");
         return;
       } 
       // In LLVM 2.0 we don't allow names to be re-used for any values in a 
@@ -734,13 +868,13 @@
       // We're changing the name but it will probably be used by other 
       // instructions as operands later on. Consequently we have to retain
       // a mapping of the renaming that we're doing.
-      RenameMapKey Key = std::make_pair(Name,V->getType());
+      RenameMapKey Key = makeRenameMapKey(Name, V.V->getType(), V.S);
       CurFun.RenameMap[Key] = NewName;
       Name = NewName;
     }
 
     // Set the name.
-    V->setName(Name);
+    V.V->setName(Name);
   }
 }
 
@@ -749,7 +883,8 @@
 static GlobalVariable *
 ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage,
                     bool isConstantGlobal, const Type *Ty,
-                    Constant *Initializer) {
+                    Constant *Initializer,
+                    const Signedness &Sign) {
   if (isa<FunctionType>(Ty))
     error("Cannot declare global vars of function type");
 
@@ -769,6 +904,7 @@
   } else {
     ID = ValID::create((int)CurModule.Values[PTy].size());
   }
+  ID.S.makeComposite(Sign);
 
   if (GlobalValue *FWGV = CurModule.GetForwardRefForGlobal(PTy, ID)) {
     // Move the global to the end of the list, from whereever it was
@@ -794,13 +930,7 @@
       // There is alread a global of the same name which means there is a
       // conflict. Let's see what we can do about it.
       std::string NewName(makeNameUnique(Name));
-      if (Linkage == GlobalValue::InternalLinkage) {
-        // The linkage type is internal so just warn about the rename without
-        // invoking "scarey language" about linkage failures. GVars with
-        // InternalLinkage can be renamed at will.
-        warning("Global variable '" + Name + "' was renamed to '"+ 
-                NewName + "'");
-      } else {
+      if (Linkage != GlobalValue::InternalLinkage) {
         // The linkage of this gval is external so we can't reliably rename 
         // it because it could potentially create a linking problem.  
         // However, we can't leave the name conflict in the output either or 
@@ -811,7 +941,7 @@
       }
 
       // Put the renaming in the global rename map
-      RenameMapKey Key = std::make_pair(Name,PointerType::get(Ty));
+      RenameMapKey Key = makeRenameMapKey(Name, PointerType::get(Ty), ID.S);
       CurModule.RenameMap[Key] = NewName;
 
       // Rename it
@@ -824,6 +954,8 @@
     new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name,
                        CurModule.CurrentModule);
   InsertValue(GV, CurModule.Values);
+  // Remember the sign of this global.
+  CurModule.NamedValueSigns[Name] = ID.S;
   return GV;
 }
 
@@ -834,21 +966,26 @@
 // This function returns true if the type has already been defined, but is
 // allowed to be redefined in the specified context.  If the name is a new name
 // for the type plane, it is inserted and false is returned.
-static bool setTypeName(const Type *T, char *NameStr) {
+static bool setTypeName(const PATypeInfo& TI, char *NameStr) {
   assert(!inFunctionScope() && "Can't give types function-local names");
   if (NameStr == 0) return false;
  
   std::string Name(NameStr);      // Copy string
   free(NameStr);                  // Free old string
 
+  const Type* Ty = TI.PAT->get();
+
   // We don't allow assigning names to void type
-  if (T == Type::VoidTy) {
+  if (Ty == Type::VoidTy) {
     error("Can't assign name '" + Name + "' to the void type");
     return false;
   }
 
   // Set the type name, checking for conflicts as we do so.
-  bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name, T);
+  bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name, Ty);
+
+  // Save the sign information for later use 
+  CurModule.NamedTypeSigns[Name] = TI.S;
 
   if (AlreadyExists) {   // Inserting a name that is already defined???
     const Type *Existing = CurModule.CurrentModule->getTypeByName(Name);
@@ -858,7 +995,7 @@
     // opaque type.  In this case, Existing will be an opaque type.
     if (const OpaqueType *OpTy = dyn_cast<OpaqueType>(Existing)) {
       // We ARE replacing an opaque type!
-      const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(T);
+      const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(Ty);
       return true;
     }
 
@@ -866,11 +1003,11 @@
     // the redefinition is identical to the original. This will be so if
     // Existing and T point to the same Type object. In this one case we
     // allow the equivalent redefinition.
-    if (Existing == T) return true;  // Yes, it's equal.
+    if (Existing == Ty) return true;  // Yes, it's equal.
 
     // Any other kind of (non-equivalent) redefinition is an error.
     error("Redefinition of type named '" + Name + "' in the '" +
-          T->getDescription() + "' type plane");
+          Ty->getDescription() + "' type plane");
   }
 
   return false;
@@ -902,7 +1039,7 @@
     OpaqueType *UpRefTy;
 
     UpRefRecord(unsigned NL, OpaqueType *URTy)
-      : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) {}
+      : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) { }
   };
 }
 
@@ -916,7 +1053,7 @@
 /// count reaches zero, the upreferenced type is the type that is passed in:
 /// thus we can complete the cycle.
 ///
-static PATypeHolder HandleUpRefs(const Type *ty) {
+static PATypeHolder HandleUpRefs(const Type *ty, const Signedness& Sign) {
   // If Ty isn't abstract, or if there are no up-references in it, then there is
   // nothing to resolve here.
   if (!ty->isAbstract() || UpRefs.empty()) return ty;
@@ -932,10 +1069,11 @@
   // this variable.
   OpaqueType *TypeToResolve = 0;
 
-  for (unsigned i = 0; i != UpRefs.size(); ++i) {
+  unsigned i = 0;
+  for (; i != UpRefs.size(); ++i) {
     UR_OUT("  UR#" << i << " - TypeContains(" << Ty->getDescription() << ", "
-           << UpRefs[i].second->getDescription() << ") = "
-           << (TypeContains(Ty, UpRefs[i].second) ? "true" : "false") << "\n");
+           << UpRefs[i].UpRefTy->getDescription() << ") = "
+           << (TypeContains(Ty, UpRefs[i].UpRefTy) ? "true" : "false") << "\n");
     if (TypeContains(Ty, UpRefs[i].LastContainedTy)) {
       // Decrement level of upreference
       unsigned Level = --UpRefs[i].NestingLevel;
@@ -946,8 +1084,9 @@
           TypeToResolve = UpRefs[i].UpRefTy;
         } else {
           UR_OUT("  * Resolving upreference for "
-                 << UpRefs[i].second->getDescription() << "\n";
-                 std::string OldName = UpRefs[i].UpRefTy->getDescription());
+                 << UpRefs[i].UpRefTy->getDescription() << "\n";
+          std::string OldName = UpRefs[i].UpRefTy->getDescription());
+          ResolveTypeSign(UpRefs[i].UpRefTy, Sign);
           UpRefs[i].UpRefTy->refineAbstractTypeTo(TypeToResolve);
           UR_OUT("  * Type '" << OldName << "' refined upreference to: "
                  << (const void*)Ty << ", " << Ty->getDescription() << "\n");
@@ -960,14 +1099,113 @@
 
   if (TypeToResolve) {
     UR_OUT("  * Resolving upreference for "
-           << UpRefs[i].second->getDescription() << "\n";
+           << UpRefs[i].UpRefTy->getDescription() << "\n";
            std::string OldName = TypeToResolve->getDescription());
+    ResolveTypeSign(TypeToResolve, Sign);
     TypeToResolve->refineAbstractTypeTo(Ty);
   }
 
   return Ty;
 }
 
+bool Signedness::operator<(const Signedness &that) const {
+  if (isNamed()) {
+    if (that.isNamed()) 
+      return *(this->name) < *(that.name);
+    else
+      return CurModule.NamedTypeSigns[*name] < that;
+  } else if (that.isNamed()) {
+    return *this < CurModule.NamedTypeSigns[*that.name];
+  }
+
+  if (isComposite() && that.isComposite()) {
+    if (sv->size() == that.sv->size()) {
+      SignVector::const_iterator thisI = sv->begin(), thisE = sv->end();
+      SignVector::const_iterator thatI = that.sv->begin(), 
+                                 thatE = that.sv->end();
+      for (; thisI != thisE; ++thisI, ++thatI) {
+        if (*thisI < *thatI)
+          return true;
+        else if (!(*thisI == *thatI))
+          return false;
+      }
+      return false;
+    }
+    return sv->size() < that.sv->size();
+  }  
+  return kind < that.kind;
+}
+
+bool Signedness::operator==(const Signedness &that) const {
+  if (isNamed())
+    if (that.isNamed())
+      return *(this->name) == *(that.name);
+    else 
+      return CurModule.NamedTypeSigns[*(this->name)] == that;
+  else if (that.isNamed())
+    return *this == CurModule.NamedTypeSigns[*(that.name)];
+  if (isComposite() && that.isComposite()) {
+    if (sv->size() == that.sv->size()) {
+      SignVector::const_iterator thisI = sv->begin(), thisE = sv->end();
+      SignVector::const_iterator thatI = that.sv->begin(), 
+                                 thatE = that.sv->end();
+      for (; thisI != thisE; ++thisI, ++thatI) {
+        if (!(*thisI == *thatI))
+          return false;
+      }
+      return true;
+    }
+    return false;
+  }
+  return kind == that.kind;
+}
+
+void Signedness::copy(const Signedness &that) {
+  if (that.isNamed()) {
+    kind = Named;
+    name = new std::string(*that.name);
+  } else if (that.isComposite()) {
+    kind = Composite;
+    sv = new SignVector();
+    *sv = *that.sv;
+  } else {
+    kind = that.kind;
+    sv = 0;
+  }
+}
+
+void Signedness::destroy() {
+  if (isNamed()) {
+    delete name;
+  } else if (isComposite()) {
+    delete sv;
+  } 
+}
+
+void Signedness::dump() const {
+  if (isComposite()) {
+    if (sv->size() == 1) {
+      (*sv)[0].dump();
+      std::cerr << "*";
+    } else {
+      std::cerr << "{ " ;
+      for (unsigned i = 0; i < sv->size(); ++i) {
+        if (i != 0)
+          std::cerr << ", ";
+        (*sv)[i].dump();
+      }
+      std::cerr << "} " ;
+    }
+  } else if (isNamed()) {
+    std::cerr << *name;
+  } else if (isSigned()) {
+    std::cerr << "S";
+  } else if (isUnsigned()) {
+    std::cerr << "U";
+  } else
+    std::cerr << ".";
+}
+
 static inline Instruction::TermOps 
 getTermOp(TermOps op) {
   switch (op) {
@@ -982,7 +1220,7 @@
 }
 
 static inline Instruction::BinaryOps 
-getBinaryOp(BinaryOps op, const Type *Ty, Signedness Sign) {
+getBinaryOp(BinaryOps op, const Type *Ty, const Signedness& Sign) {
   switch (op) {
     default     : assert(0 && "Invalid OldBinaryOps");
     case SetEQ  : 
@@ -1003,7 +1241,7 @@
         isFP = PTy->getElementType()->isFloatingPoint();
       if (isFP)
         return Instruction::FDiv;
-      else if (Sign == Signed)
+      else if (Sign.isSigned())
         return Instruction::SDiv;
       return Instruction::UDiv;
     }
@@ -1020,7 +1258,7 @@
       // Select correct opcode
       if (isFP)
         return Instruction::FRem;
-      else if (Sign == Signed)
+      else if (Sign.isSigned())
         return Instruction::SRem;
       return Instruction::URem;
     }
@@ -1031,7 +1269,7 @@
     case AShrOp : return Instruction::AShr;
     case ShlOp  : return Instruction::Shl;
     case ShrOp  : 
-      if (Sign == Signed)
+      if (Sign.isSigned())
         return Instruction::AShr;
       return Instruction::LShr;
     case AndOp  : return Instruction::And;
@@ -1042,8 +1280,8 @@
 
 static inline Instruction::OtherOps 
 getCompareOp(BinaryOps op, unsigned short &predicate, const Type* &Ty,
-             Signedness Sign) {
-  bool isSigned = Sign == Signed;
+             const Signedness &Sign) {
+  bool isSigned = Sign.isSigned();
   bool isFP = Ty->isFloatingPoint();
   switch (op) {
     default     : assert(0 && "Invalid OldSetCC");
@@ -1123,7 +1361,7 @@
 }
 
 static inline Instruction::OtherOps 
-getOtherOp(OtherOps op, Signedness Sign) {
+getOtherOp(OtherOps op, const Signedness &Sign) {
   switch (op) {
     default               : assert(0 && "Invalid OldOtherOps");
     case PHIOp            : return Instruction::PHI;
@@ -1141,8 +1379,8 @@
 }
 
 static inline Value*
-getCast(CastOps op, Value *Src, Signedness SrcSign, const Type *DstTy, 
-        Signedness DstSign, bool ForceInstruction = false) {
+getCast(CastOps op, Value *Src, const Signedness &SrcSign, const Type *DstTy, 
+        const Signedness &DstSign, bool ForceInstruction = false) {
   Instruction::CastOps Opcode;
   const Type* SrcTy = Src->getType();
   if (op == CastOp) {
@@ -1179,7 +1417,8 @@
     }
     // Determine the opcode to use by calling CastInst::getCastOpcode
     Opcode = 
-      CastInst::getCastOpcode(Src, SrcSign == Signed, DstTy, DstSign == Signed);
+      CastInst::getCastOpcode(Src, SrcSign.isSigned(), DstTy, 
+                              DstSign.isSigned());
 
   } else switch (op) {
     default: assert(0 && "Invalid cast token");
@@ -1271,7 +1510,7 @@
       // all indices for SequentialType elements. We must retain the same 
       // semantic (zext) for unsigned types.
       if (const IntegerType *Ity = dyn_cast<IntegerType>(Index->getType()))
-        if (Ity->getBitWidth() < 64 && (*Indices)[i].S == Unsigned) {
+        if (Ity->getBitWidth() < 64 && (*Indices)[i].S.isUnsigned()) {
           if (CIndices)
             Index = ConstantExpr::getCast(Instruction::ZExt, 
               cast<Constant>(Index), Type::Int64Ty);
@@ -1456,7 +1695,7 @@
   llvm::Function                         *FunctionVal;
   std::pair<llvm::PATypeInfo, char*>     *ArgVal;
   llvm::BasicBlock                       *BasicBlockVal;
-  llvm::TerminatorInst                   *TermInstVal;
+  llvm::TermInstInfo                     TermInstVal;
   llvm::InstrInfo                        InstVal;
   llvm::ConstInfo                        ConstVal;
   llvm::ValueInfo                        ValueVal;
@@ -1769,7 +2008,7 @@
   : Types
   | VOID { 
     $$.PAT = new PATypeHolder($1.T); 
-    $$.S = Signless;
+    $$.S.makeSignless();
   }
   ;
 
@@ -1777,7 +2016,7 @@
   : UpRTypes 
   | VOID { 
     $$.PAT = new PATypeHolder($1.T); 
-    $$.S = Signless;
+    $$.S.makeSignless();
   }
   ;
 
@@ -1798,16 +2037,16 @@
 UpRTypes 
   : PrimType { 
     $$.PAT = new PATypeHolder($1.T);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
   }
   | OPAQUE {
     $$.PAT = new PATypeHolder(OpaqueType::get());
-    $$.S = Signless;
+    $$.S.makeSignless();
   }
   | SymbolicValueRef {            // Named types are also simple types...
+    $$.S.copy(getTypeSign($1));
     const Type* tmp = getType($1);
     $$.PAT = new PATypeHolder(tmp);
-    $$.S = Signless; // FIXME: what if its signed?
   }
   | '\\' EUINT64VAL {                   // Type UpReference
     if ($2 > (uint64_t)~0U) 
@@ -1815,14 +2054,16 @@
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
     UpRefs.push_back(UpRefRecord((unsigned)$2, OT));  // Add to vector...
     $$.PAT = new PATypeHolder(OT);
-    $$.S = Signless;
+    $$.S.makeSignless();
     UR_OUT("New Upreference!\n");
   }
   | UpRTypesV '(' ArgTypeListI ')' {           // Function derived type?
+    $$.S.makeComposite($1.S);
     std::vector<const Type*> Params;
     for (std::list<llvm::PATypeInfo>::iterator I = $3->begin(),
            E = $3->end(); I != E; ++I) {
       Params.push_back(I->PAT->get());
+      $$.S.add(I->S);
     }
     FunctionType::ParamAttrsList ParamAttrs;
     bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
@@ -1830,63 +2071,67 @@
 
     $$.PAT = new PATypeHolder(
       HandleUpRefs(FunctionType::get($1.PAT->get(), Params, isVarArg, 
-                   ParamAttrs)));
-    $$.S = $1.S;
-    delete $1.PAT;    // Delete the return type handle
+                   ParamAttrs), $$.S));
+    delete $1.PAT;  // Delete the return type handle
     delete $3;      // Delete the argument list
   }
   | '[' EUINT64VAL 'x' UpRTypes ']' {          // Sized array type?
+    $$.S.makeComposite($4.S);
     $$.PAT = new PATypeHolder(HandleUpRefs(ArrayType::get($4.PAT->get(), 
-                                                        (unsigned)$2)));
-    $$.S = $4.S;
+                                           (unsigned)$2), $$.S));
     delete $4.PAT;
   }
   | '<' EUINT64VAL 'x' UpRTypes '>' {          // Vector type?
-     const llvm::Type* ElemTy = $4.PAT->get();
-     if ((unsigned)$2 != $2)
-        error("Unsigned result not equal to signed result");
-     if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
-        error("Elements of a VectorType must be integer or floating point");
-     if (!isPowerOf2_32($2))
-       error("VectorType length should be a power of 2");
-     $$.PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy, 
-                                          (unsigned)$2)));
-     $$.S = $4.S;
-     delete $4.PAT;
+    const llvm::Type* ElemTy = $4.PAT->get();
+    if ((unsigned)$2 != $2)
+       error("Unsigned result not equal to signed result");
+    if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
+       error("Elements of a VectorType must be integer or floating point");
+    if (!isPowerOf2_32($2))
+      error("VectorType length should be a power of 2");
+    $$.S.makeComposite($4.S);
+    $$.PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy, 
+                                         (unsigned)$2), $$.S));
+    delete $4.PAT;
   }
   | '{' TypeListI '}' {                        // Structure type?
     std::vector<const Type*> Elements;
+    $$.S.makeComposite();
     for (std::list<llvm::PATypeInfo>::iterator I = $2->begin(),
-           E = $2->end(); I != E; ++I)
+           E = $2->end(); I != E; ++I) {
       Elements.push_back(I->PAT->get());
-    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
-    $$.S = Signless;
+      $$.S.add(I->S);
+    }
+    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements), $$.S));
     delete $2;
   }
   | '{' '}' {                                  // Empty structure type?
     $$.PAT = new PATypeHolder(StructType::get(std::vector<const Type*>()));
-    $$.S = Signless;
+    $$.S.makeComposite();
   }
   | '<' '{' TypeListI '}' '>' {                // Packed Structure type?
+    $$.S.makeComposite();
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeInfo>::iterator I = $3->begin(),
            E = $3->end(); I != E; ++I) {
       Elements.push_back(I->PAT->get());
+      $$.S.add(I->S);
       delete I->PAT;
     }
-    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true)));
-    $$.S = Signless;
+    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true), 
+                                           $$.S));
     delete $3;
   }
   | '<' '{' '}' '>' {                          // Empty packed structure type?
     $$.PAT = new PATypeHolder(StructType::get(std::vector<const Type*>(),true));
-    $$.S = Signless;
+    $$.S.makeComposite();
   }
   | UpRTypes '*' {                             // Pointer type?
     if ($1.PAT->get() == Type::LabelTy)
       error("Cannot form a pointer to a basic block");
-    $$.PAT = new PATypeHolder(HandleUpRefs(PointerType::get($1.PAT->get())));
-    $$.S = $1.S;
+    $$.S.makeComposite($1.S);
+    $$.PAT = new PATypeHolder(HandleUpRefs(PointerType::get($1.PAT->get()),
+                                           $$.S));
     delete $1.PAT;
   }
   ;
@@ -1910,14 +2155,14 @@
   | TypeListI ',' DOTDOTDOT {
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
-    VoidTI.S = Signless;
+    VoidTI.S.makeSignless();
     ($$=$1)->push_back(VoidTI);
   }
   | DOTDOTDOT {
     $$ = new std::list<PATypeInfo>();
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
-    VoidTI.S = Signless;
+    VoidTI.S.makeSignless();
     $$->push_back(VoidTI);
   }
   | /*empty*/ {
@@ -1958,7 +2203,7 @@
       Elems.push_back(C);
     }
     $$.C = ConstantArray::get(ATy, Elems);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT; 
     delete $3;
   }
@@ -1972,7 +2217,7 @@
       error("Type mismatch: constant sized array initialized with 0"
             " arguments, but has size of " + itostr(NumElements) +"");
     $$.C = ConstantArray::get(ATy, std::vector<Constant*>());
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | Types 'c' STRINGCONSTANT {
@@ -1995,7 +2240,7 @@
       Vals.push_back(ConstantInt::get(ETy, *C));
     free($3);
     $$.C = ConstantArray::get(ATy, Vals);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | Types '<' ConstVector '>' { // Nonempty unsized arr
@@ -2022,7 +2267,7 @@
       Elems.push_back(C);
     }
     $$.C = ConstantVector::get(PTy, Elems);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
     delete $3;
   }
@@ -2044,7 +2289,7 @@
       Fields.push_back(C);
     }
     $$.C = ConstantStruct::get(STy, Fields);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
     delete $3;
   }
@@ -2056,7 +2301,7 @@
     if (STy->getNumContainedTypes() != 0)
       error("Illegal number of initializers for structure type");
     $$.C = ConstantStruct::get(STy, std::vector<Constant*>());
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | Types '<' '{' ConstVector '}' '>' {
@@ -2077,7 +2322,7 @@
       Fields.push_back(C);
     }
     $$.C = ConstantStruct::get(STy, Fields);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT; 
     delete $4;
   }
@@ -2089,7 +2334,7 @@
     if (STy->getNumContainedTypes() != 0)
       error("Illegal number of initializers for packed structure type");
     $$.C = ConstantStruct::get(STy, std::vector<Constant*>());
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | Types NULL_TOK {
@@ -2098,12 +2343,12 @@
       error("Cannot make null pointer constant with type: '" + 
             $1.PAT->get()->getDescription() + "'");
     $$.C = ConstantPointerNull::get(PTy);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | Types UNDEF {
     $$.C = UndefValue::get($1.PAT->get());
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | Types SymbolicValueRef {
@@ -2121,6 +2366,7 @@
     //
     Function *SavedCurFn = CurFun.CurrentFunction;
     CurFun.CurrentFunction = 0;
+    $2.S.copy($1.S);
     Value *V = getExistingValue(Ty, $2);
     CurFun.CurrentFunction = SavedCurFn;
 
@@ -2161,14 +2407,14 @@
       }
     }
     $$.C = cast<GlobalValue>(V);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;            // Free the type handle
   }
   | Types ConstExpr {
     if ($1.PAT->get() != $2.C->getType())
       error("Mismatched types for constant expression");
     $$ = $2;
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | Types ZEROINITIALIZER {
@@ -2176,7 +2422,7 @@
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
       error("Cannot create a null initialized value of this type");
     $$.C = Constant::getNullValue(Ty);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | SIntType EINT64VAL {      // integral constants
@@ -2184,28 +2430,28 @@
     if (!ConstantInt::isValueValidForType(Ty, $2))
       error("Constant value doesn't fit in type");
     $$.C = ConstantInt::get(Ty, $2);
-    $$.S = Signed;
+    $$.S.makeSigned();
   }
   | UIntType EUINT64VAL {            // integral constants
     const Type *Ty = $1.T;
     if (!ConstantInt::isValueValidForType(Ty, $2))
       error("Constant value doesn't fit in type");
     $$.C = ConstantInt::get(Ty, $2);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
   }
   | BOOL TRUETOK {                      // Boolean constants
     $$.C = ConstantInt::get(Type::Int1Ty, true);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
   }
   | BOOL FALSETOK {                     // Boolean constants
     $$.C = ConstantInt::get(Type::Int1Ty, false);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
   }
   | FPType FPVAL {                   // Float & Double constants
     if (!ConstantFP::isValueValidForType($1.T, $2))
       error("Floating point constant invalid for type");
     $$.C = ConstantFP::get($1.T, $2);
-    $$.S = Signless;
+    $$.S.makeSignless();
   }
   ;
 
@@ -2213,8 +2459,8 @@
   : CastOps '(' ConstVal TO Types ')' {
     const Type* SrcTy = $3.C->getType();
     const Type* DstTy = $5.PAT->get();
-    Signedness SrcSign = $3.S;
-    Signedness DstSign = $5.S;
+    Signedness SrcSign($3.S);
+    Signedness DstSign($5.S);
     if (!SrcTy->isFirstClassType())
       error("cast constant expression from a non-primitive type: '" +
             SrcTy->getDescription() + "'");
@@ -2222,7 +2468,7 @@
       error("cast constant expression to a non-primitive type: '" +
             DstTy->getDescription() + "'");
     $$.C = cast<Constant>(getCast($1, $3.C, SrcSign, DstTy, DstSign));
-    $$.S = DstSign;
+    $$.S.copy(DstSign);
     delete $5.PAT;
   }
   | GETELEMENTPTR '(' ConstVal IndexList ')' {
@@ -2236,7 +2482,7 @@
 
     delete $4;
     $$.C = ConstantExpr::getGetElementPtr($3.C, &CIndices[0], CIndices.size());
-    $$.S = Signless;
+    $$.S.copy(getElementSign($3, CIndices));
   }
   | SELECT '(' ConstVal ',' ConstVal ',' ConstVal ')' {
     if (!$3.C->getType()->isInteger() ||
@@ -2245,7 +2491,7 @@
     if ($5.C->getType() != $7.C->getType())
       error("Select operand types must match");
     $$.C = ConstantExpr::getSelect($3.C, $5.C, $7.C);
-    $$.S = Unsigned;
+    $$.S.copy($5.S);
   }
   | ArithmeticOps '(' ConstVal ',' ConstVal ')' {
     const Type *Ty = $3.C->getType();
@@ -2273,7 +2519,7 @@
              ConstantExpr::getCast(Instruction::PtrToInt, $5.C, IntPtrTy));
       $$.C = ConstantExpr::getCast(Instruction::IntToPtr, $$.C, Ty);
     }
-    $$.S = $3.S; 
+    $$.S.copy($3.S); 
   }
   | LogicalOps '(' ConstVal ',' ConstVal ')' {
     const Type* Ty = $3.C->getType();
@@ -2286,7 +2532,7 @@
     }
     Instruction::BinaryOps Opcode = getBinaryOp($1, Ty, $3.S);
     $$.C = ConstantExpr::get(Opcode, $3.C, $5.C);
-    $$.S = $3.S;
+    $$.S.copy($3.S);
   }
   | SetCondOps '(' ConstVal ',' ConstVal ')' {
     const Type* Ty = $3.C->getType();
@@ -2295,19 +2541,19 @@
     unsigned short pred;
     Instruction::OtherOps Opcode = getCompareOp($1, pred, Ty, $3.S);
     $$.C = ConstantExpr::getCompare(Opcode, $3.C, $5.C);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
   }
   | ICMP IPredicates '(' ConstVal ',' ConstVal ')' {
     if ($4.C->getType() != $6.C->getType()) 
       error("icmp operand types must match");
     $$.C = ConstantExpr::getCompare($2, $4.C, $6.C);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
   }
   | FCMP FPredicates '(' ConstVal ',' ConstVal ')' {
     if ($4.C->getType() != $6.C->getType()) 
       error("fcmp operand types must match");
     $$.C = ConstantExpr::getCompare($2, $4.C, $6.C);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
   }
   | ShiftOps '(' ConstVal ',' ConstVal ')' {
     if (!$5.C->getType()->isInteger() ||
@@ -2318,25 +2564,25 @@
       error("Shift constant expression requires integer operand");
     Constant *ShiftAmt = ConstantExpr::getZExt($5.C, Ty);
     $$.C = ConstantExpr::get(getBinaryOp($1, Ty, $3.S), $3.C, ShiftAmt);
-    $$.S = $3.S;
+    $$.S.copy($3.S);
   }
   | EXTRACTELEMENT '(' ConstVal ',' ConstVal ')' {
     if (!ExtractElementInst::isValidOperands($3.C, $5.C))
       error("Invalid extractelement operands");
     $$.C = ConstantExpr::getExtractElement($3.C, $5.C);
-    $$.S = $3.S;
+    $$.S.copy($3.S.get(0));
   }
   | INSERTELEMENT '(' ConstVal ',' ConstVal ',' ConstVal ')' {
     if (!InsertElementInst::isValidOperands($3.C, $5.C, $7.C))
       error("Invalid insertelement operands");
     $$.C = ConstantExpr::getInsertElement($3.C, $5.C, $7.C);
-    $$.S = $3.S;
+    $$.S.copy($3.S);
   }
   | SHUFFLEVECTOR '(' ConstVal ',' ConstVal ',' ConstVal ')' {
     if (!ShuffleVectorInst::isValidOperands($3.C, $5.C, $7.C))
       error("Invalid shufflevector operands");
     $$.C = ConstantExpr::getShuffleVector($3.C, $5.C, $7.C);
-    $$.S = $3.S;
+    $$.S.copy($3.S);
   }
   ;
 
@@ -2405,13 +2651,13 @@
     // If types are not resolved eagerly, then the two types will not be
     // determined to be the same type!
     //
-    const Type* Ty = $4.PAT->get();
-    ResolveTypeTo($2, Ty);
+    ResolveTypeTo($2, $4.PAT->get(), $4.S);
 
-    if (!setTypeName(Ty, $2) && !$2) {
-      // If this is a named type that is not a redefinition, add it to the slot
-      // table.
-      CurModule.Types.push_back(Ty);
+    if (!setTypeName($4, $2) && !$2) {
+      // If this is a numbered type that is not a redefinition, add it to the 
+      // slot table.
+      CurModule.Types.push_back($4.PAT->get());
+      CurModule.TypeSigns.push_back($4.S);
     }
     delete $4.PAT;
   }
@@ -2422,20 +2668,22 @@
   | ConstPool OptAssign OptLinkage GlobalType ConstVal {
     if ($5.C == 0) 
       error("Global value initializer is not a constant");
-    CurGV = ParseGlobalVariable($2, $3, $4, $5.C->getType(), $5.C);
+    CurGV = ParseGlobalVariable($2, $3, $4, $5.C->getType(), $5.C, $5.S);
   } GlobalVarAttributes {
     CurGV = 0;
   }
   | ConstPool OptAssign EXTERNAL GlobalType Types {
     const Type *Ty = $5.PAT->get();
-    CurGV = ParseGlobalVariable($2, GlobalValue::ExternalLinkage, $4, Ty, 0);
+    CurGV = ParseGlobalVariable($2, GlobalValue::ExternalLinkage, $4, Ty, 0,
+                                $5.S);
     delete $5.PAT;
   } GlobalVarAttributes {
     CurGV = 0;
   }
   | ConstPool OptAssign DLLIMPORT GlobalType Types {
     const Type *Ty = $5.PAT->get();
-    CurGV = ParseGlobalVariable($2, GlobalValue::DLLImportLinkage, $4, Ty, 0);
+    CurGV = ParseGlobalVariable($2, GlobalValue::DLLImportLinkage, $4, Ty, 0,
+                                $5.S);
     delete $5.PAT;
   } GlobalVarAttributes {
     CurGV = 0;
@@ -2443,7 +2691,8 @@
   | ConstPool OptAssign EXTERN_WEAK GlobalType Types {
     const Type *Ty = $5.PAT->get();
     CurGV = 
-      ParseGlobalVariable($2, GlobalValue::ExternalWeakLinkage, $4, Ty, 0);
+      ParseGlobalVariable($2, GlobalValue::ExternalWeakLinkage, $4, Ty, 0, 
+                          $5.S);
     delete $5.PAT;
   } GlobalVarAttributes {
     CurGV = 0;
@@ -2553,14 +2802,14 @@
     $$ = $1;
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
-    VoidTI.S = Signless;
+    VoidTI.S.makeSignless();
     $$->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
   }
   | DOTDOTDOT {
     $$ = new std::vector<std::pair<PATypeInfo,char*> >();
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
-    VoidTI.S = Signless;
+    VoidTI.S.makeSignless();
     $$->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
   }
   | /* empty */ { $$ = 0; }
@@ -2577,6 +2826,8 @@
     if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
       error("LLVM functions cannot return aggregate types");
 
+    Signedness FTySign;
+    FTySign.makeComposite($2.S);
     std::vector<const Type*> ParamTyList;
 
     // In LLVM 2.0 the signatures of three varargs intrinsics changed to take
@@ -2592,6 +2843,7 @@
            I = $5->begin(), E = $5->end(); I != E; ++I) {
         const Type *Ty = I->first.PAT->get();
         ParamTyList.push_back(Ty);
+        FTySign.add(I->first.S);
       }
     }
 
@@ -2618,6 +2870,7 @@
     } else {
       ID = ValID::create((int)CurModule.Values[PFT].size());
     }
+    ID.S.makeComposite(FTySign);
 
     Function *Fn = 0;
     Module* M = CurModule.CurrentModule;
@@ -2644,14 +2897,16 @@
           std::string NewName(makeNameUnique(FunctionName));
           if (Conflict->hasInternalLinkage()) {
             Conflict->setName(NewName);
-            RenameMapKey Key = std::make_pair(FunctionName,Conflict->getType());
+            RenameMapKey Key = 
+              makeRenameMapKey(FunctionName, Conflict->getType(), ID.S);
             CurModule.RenameMap[Key] = NewName;
             Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
             InsertValue(Fn, CurModule.Values);
           } else {
             Fn = new Function(FT, CurFun.Linkage, NewName, M);
             InsertValue(Fn, CurModule.Values);
-            RenameMapKey Key = std::make_pair(FunctionName,PFT);
+            RenameMapKey Key = 
+              makeRenameMapKey(FunctionName, PFT, ID.S);
             CurModule.RenameMap[Key] = NewName;
           }
         } else {
@@ -2673,9 +2928,11 @@
         // type plane. After PR411 was fixed, this is no loner the case. 
         // To resolve this we must rename one of the two. 
         if (Conflict->hasInternalLinkage()) {
-          // We can safely renamed the Conflict.
+          // We can safely rename the Conflict.
+          RenameMapKey Key = 
+            makeRenameMapKey(Conflict->getName(), Conflict->getType(), 
+              CurModule.NamedValueSigns[Conflict->getName()]);
           Conflict->setName(makeNameUnique(Conflict->getName()));
-          RenameMapKey Key = std::make_pair(FunctionName,Conflict->getType());
           CurModule.RenameMap[Key] = Conflict->getName();
           Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
           InsertValue(Fn, CurModule.Values);
@@ -2684,7 +2941,7 @@
           std::string NewName = makeNameUnique(FunctionName);
           Fn = new Function(FT, CurFun.Linkage, NewName, M);
           InsertValue(Fn, CurModule.Values);
-          RenameMapKey Key = std::make_pair(FunctionName,PFT);
+          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
           CurModule.RenameMap[Key] = NewName;
         } else {
           // We can't quietly rename either of these things, but we must
@@ -2695,7 +2952,7 @@
                   "' may cause linkage errors");
           Fn = new Function(FT, CurFun.Linkage, NewName, M);
           InsertValue(Fn, CurModule.Values);
-          RenameMapKey Key = std::make_pair(FunctionName,PFT);
+          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
           CurModule.RenameMap[Key] = NewName;
         }
       } else {
@@ -2734,7 +2991,8 @@
       std::vector<std::pair<PATypeInfo,char*> >::iterator E = $5->end();
       for ( ; I != E && ArgIt != ArgEnd; ++I, ++ArgIt) {
         delete I->first.PAT;                      // Delete the typeholder...
-        setValueName(ArgIt, I->second);           // Insert arg into symtab...
+        ValueInfo VI; VI.V = ArgIt; VI.S.copy(I->first.S); 
+        setValueName(VI, I->second);           // Insert arg into symtab...
         InsertValue(ArgIt);
       }
       delete $5;                     // We're now done with the argument list
@@ -2791,11 +3049,17 @@
 
 ConstValueRef 
     // A reference to a direct constant
-  : ESINT64VAL {    $$ = ValID::create($1); }
+  : ESINT64VAL { $$ = ValID::create($1); }
   | EUINT64VAL { $$ = ValID::create($1); }
   | FPVAL { $$ = ValID::create($1); } 
-  | TRUETOK { $$ = ValID::create(ConstantInt::get(Type::Int1Ty, true)); } 
-  | FALSETOK { $$ = ValID::create(ConstantInt::get(Type::Int1Ty, false)); }
+  | TRUETOK { 
+    $$ = ValID::create(ConstantInt::get(Type::Int1Ty, true));
+    $$.S.makeUnsigned();
+  }
+  | FALSETOK { 
+    $$ = ValID::create(ConstantInt::get(Type::Int1Ty, false)); 
+    $$.S.makeUnsigned();
+  }
   | NULL_TOK { $$ = ValID::createNull(); }
   | UNDEF { $$ = ValID::createUndef(); }
   | ZEROINITIALIZER { $$ = ValID::createZeroInit(); }
@@ -2803,8 +3067,8 @@
     const Type *ETy = (*$2)[0].C->getType();
     int NumElements = $2->size(); 
     VectorType* pt = VectorType::get(ETy, NumElements);
-    PATypeHolder* PTy = new PATypeHolder(
-      HandleUpRefs(VectorType::get(ETy, NumElements)));
+    $$.S.makeComposite((*$2)[0].S);
+    PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt, $$.S));
     
     // Verify all elements are correct type!
     std::vector<Constant*> Elems;
@@ -2822,6 +3086,7 @@
   }
   | ConstExpr {
     $$ = ValID::create($1.C);
+    $$.S.copy($1.S);
   }
   | ASM_TOK OptSideEffect STRINGCONSTANT ',' STRINGCONSTANT {
     char *End = UnEscapeLexed($3, true);
@@ -2834,12 +3099,11 @@
   }
   ;
 
-// SymbolicValueRef - Reference to one of two ways of symbolically refering to
-// another value.
+// SymbolicValueRef - Reference to one of two ways of symbolically refering to // another value.
 //
 SymbolicValueRef 
-  : INTVAL {  $$ = ValID::create($1); }
-  | Name   {  $$ = ValID::create($1); }
+  : INTVAL {  $$ = ValID::create($1); $$.S.makeSignless(); }
+  | Name   {  $$ = ValID::create($1); $$.S.makeSignless(); }
   ;
 
 // ValueRef - A reference to a definition... either constant or symbolic
@@ -2854,8 +3118,9 @@
 ResolvedVal 
   : Types ValueRef { 
     const Type *Ty = $1.PAT->get();
-    $$.S = $1.S;
+    $2.S.copy($1.S);
     $$.V = getVal(Ty, $2); 
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   ;
@@ -2874,9 +3139,10 @@
 //
 BasicBlock 
   : InstructionList OptAssign BBTerminatorInst  {
-    setValueName($3, $2);
-    InsertValue($3);
-    $1->getInstList().push_back($3);
+    ValueInfo VI; VI.V = $3.TI; VI.S.copy($3.S);
+    setValueName(VI, $2);
+    InsertValue($3.TI);
+    $1->getInstList().push_back($3.TI);
     InsertValue($1);
     $$ = $1;
   }
@@ -2889,7 +3155,7 @@
     $$ = $1;
   }
   | /* empty */ {
-    $$ = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
+    $$ = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++),true);
     // Make sure to move the basic block to the correct location in the
     // function, instead of leaving it inserted wherever it was first
     // referenced.
@@ -2912,26 +3178,36 @@
 
 BBTerminatorInst 
   : RET ResolvedVal {              // Return with a result...
-    $$ = new ReturnInst($2.V);
+    $$.TI = new ReturnInst($2.V);
+    $$.S.makeSignless();
   }
   | RET VOID {                                       // Return with no result...
-    $$ = new ReturnInst();
+    $$.TI = new ReturnInst();
+    $$.S.makeSignless();
   }
   | BR LABEL ValueRef {                         // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal($3);
-    $$ = new BranchInst(tmpBB);
+    $$.TI = new BranchInst(tmpBB);
+    $$.S.makeSignless();
   }                                                  // Conditional Branch...
   | BR BOOL ValueRef ',' LABEL ValueRef ',' LABEL ValueRef {  
+    $6.S.makeSignless();
+    $9.S.makeSignless();
     BasicBlock* tmpBBA = getBBVal($6);
     BasicBlock* tmpBBB = getBBVal($9);
+    $3.S.makeUnsigned();
     Value* tmpVal = getVal(Type::Int1Ty, $3);
-    $$ = new BranchInst(tmpBBA, tmpBBB, tmpVal);
+    $$.TI = new BranchInst(tmpBBA, tmpBBB, tmpVal);
+    $$.S.makeSignless();
   }
   | SWITCH IntType ValueRef ',' LABEL ValueRef '[' JumpTable ']' {
+    $3.S.copy($2.S);
     Value* tmpVal = getVal($2.T, $3);
+    $6.S.makeSignless();
     BasicBlock* tmpBB = getBBVal($6);
     SwitchInst *S = new SwitchInst(tmpVal, tmpBB, $8->size());
-    $$ = S;
+    $$.TI = S;
+    $$.S.makeSignless();
     std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = $8->begin(),
       E = $8->end();
     for (; I != E; ++I) {
@@ -2943,24 +3219,31 @@
     delete $8;
   }
   | SWITCH IntType ValueRef ',' LABEL ValueRef '[' ']' {
+    $3.S.copy($2.S);
     Value* tmpVal = getVal($2.T, $3);
+    $6.S.makeSignless();
     BasicBlock* tmpBB = getBBVal($6);
     SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
-    $$ = S;
+    $$.TI = S;
+    $$.S.makeSignless();
   }
   | INVOKE OptCallingConv TypesV ValueRef '(' ValueRefListE ')'
     TO LABEL ValueRef Unwind LABEL ValueRef {
     const PointerType *PFTy;
     const FunctionType *Ty;
+    Signedness FTySign;
 
     if (!(PFTy = dyn_cast<PointerType>($3.PAT->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
+      FTySign.makeComposite($3.S);
       if ($6) {
         for (std::vector<ValueInfo>::iterator I = $6->begin(), E = $6->end();
-             I != E; ++I)
+             I != E; ++I) {
           ParamTypes.push_back((*I).V->getType());
+          FTySign.add(I->S);
+        }
       }
       FunctionType::ParamAttrsList ParamAttrs;
       if ($2 == OldCallingConv::CSRet) {
@@ -2971,14 +3254,19 @@
       if (isVarArg) ParamTypes.pop_back();
       Ty = FunctionType::get($3.PAT->get(), ParamTypes, isVarArg, ParamAttrs);
       PFTy = PointerType::get(Ty);
+      $$.S.copy($3.S);
+    } else {
+      FTySign = $3.S;
+      $$.S.copy($3.S.get(0)); // 0th element of FuncTy sign is result ty
     }
+    $4.S.makeComposite(FTySign);
     Value *V = getVal(PFTy, $4);   // Get the function we're calling...
     BasicBlock *Normal = getBBVal($10);
     BasicBlock *Except = getBBVal($13);
 
     // Create the call node...
     if (!$6) {                                   // Has no arguments?
-      $$ = new InvokeInst(V, Normal, Except, 0, 0);
+      $$.TI = new InvokeInst(V, Normal, Except, 0, 0);
     } else {                                     // Has arguments?
       // Loop through FunctionType's arguments and ensure they are specified
       // correctly!
@@ -2998,38 +3286,44 @@
       if (I != E || (ArgI != ArgE && !Ty->isVarArg()))
         error("Invalid number of parameters detected");
 
-      $$ = new InvokeInst(V, Normal, Except, &Args[0], Args.size());
+      $$.TI = new InvokeInst(V, Normal, Except, &Args[0], Args.size());
     }
-    cast<InvokeInst>($$)->setCallingConv(upgradeCallingConv($2));
+    cast<InvokeInst>($$.TI)->setCallingConv(upgradeCallingConv($2));
     delete $3.PAT;
     delete $6;
   }
   | Unwind {
-    $$ = new UnwindInst();
+    $$.TI = new UnwindInst();
+    $$.S.makeSignless();
   }
   | UNREACHABLE {
-    $$ = new UnreachableInst();
+    $$.TI = new UnreachableInst();
+    $$.S.makeSignless();
   }
   ;
 
 JumpTable 
   : JumpTable IntType ConstValueRef ',' LABEL ValueRef {
     $$ = $1;
+    $3.S.copy($2.S);
     Constant *V = cast<Constant>(getExistingValue($2.T, $3));
     
     if (V == 0)
       error("May only switch on a constant pool value");
 
+    $6.S.makeSignless();
     BasicBlock* tmpBB = getBBVal($6);
     $$->push_back(std::make_pair(V, tmpBB));
   }
   | IntType ConstValueRef ',' LABEL ValueRef {
     $$ = new std::vector<std::pair<Constant*, BasicBlock*> >();
+    $2.S.copy($1.S);
     Constant *V = cast<Constant>(getExistingValue($1.T, $2));
 
     if (V == 0)
       error("May only switch on a constant pool value");
 
+    $5.S.makeSignless();
     BasicBlock* tmpBB = getBBVal($5);
     $$->push_back(std::make_pair(V, tmpBB)); 
   }
@@ -3057,9 +3351,10 @@
           omit = true;
     if (omit) {
       $$.I = 0;
-      $$.S = Signless;
+      $$.S.makeSignless();
     } else {
-      setValueName($2.I, $1);
+      ValueInfo VI; VI.V = $2.I; VI.S.copy($2.S);
+      setValueName(VI, $1);
       InsertValue($2.I);
       $$ = $2;
     }
@@ -3067,15 +3362,19 @@
 
 PHIList : Types '[' ValueRef ',' ValueRef ']' {    // Used for PHI nodes
     $$.P = new std::list<std::pair<Value*, BasicBlock*> >();
-    $$.S = $1.S;
+    $$.S.copy($1.S);
+    $3.S.copy($1.S);
     Value* tmpVal = getVal($1.PAT->get(), $3);
+    $5.S.makeSignless();
     BasicBlock* tmpBB = getBBVal($5);
     $$.P->push_back(std::make_pair(tmpVal, tmpBB));
     delete $1.PAT;
   }
   | PHIList ',' '[' ValueRef ',' ValueRef ']' {
     $$ = $1;
+    $4.S.copy($1.S);
     Value* tmpVal = getVal($1.P->front().first->getType(), $4);
+    $6.S.makeSignless();
     BasicBlock* tmpBB = getBBVal($6);
     $1.P->push_back(std::make_pair(tmpVal, tmpBB));
   }
@@ -3107,6 +3406,8 @@
 
 InstVal 
   : ArithmeticOps Types ValueRef ',' ValueRef {
+    $3.S.copy($2.S);
+    $5.S.copy($2.S);
     const Type* Ty = $2.PAT->get();
     if (!Ty->isInteger() && !Ty->isFloatingPoint() && !isa<VectorType>(Ty))
       error("Arithmetic operator requires integer, FP, or packed operands");
@@ -3120,10 +3421,12 @@
     $$.I = BinaryOperator::create(Opcode, val1, val2);
     if ($$.I == 0)
       error("binary operator returned null");
-    $$.S = $2.S;
+    $$.S.copy($2.S);
     delete $2.PAT;
   }
   | LogicalOps Types ValueRef ',' ValueRef {
+    $3.S.copy($2.S);
+    $5.S.copy($2.S);
     const Type *Ty = $2.PAT->get();
     if (!Ty->isInteger()) {
       if (!isa<VectorType>(Ty) ||
@@ -3136,10 +3439,12 @@
     $$.I = BinaryOperator::create(Opcode, tmpVal1, tmpVal2);
     if ($$.I == 0)
       error("binary operator returned null");
-    $$.S = $2.S;
+    $$.S.copy($2.S);
     delete $2.PAT;
   }
   | SetCondOps Types ValueRef ',' ValueRef {
+    $3.S.copy($2.S);
+    $5.S.copy($2.S);
     const Type* Ty = $2.PAT->get();
     if(isa<VectorType>(Ty))
       error("VectorTypes currently not supported in setcc instructions");
@@ -3150,10 +3455,12 @@
     $$.I = CmpInst::create(Opcode, pred, tmpVal1, tmpVal2);
     if ($$.I == 0)
       error("binary operator returned null");
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
     delete $2.PAT;
   }
   | ICMP IPredicates Types ValueRef ',' ValueRef {
+    $4.S.copy($3.S);
+    $6.S.copy($3.S);
     const Type *Ty = $3.PAT->get();
     if (isa<VectorType>(Ty)) 
       error("VectorTypes currently not supported in icmp instructions");
@@ -3162,10 +3469,12 @@
     Value* tmpVal1 = getVal(Ty, $4);
     Value* tmpVal2 = getVal(Ty, $6);
     $$.I = new ICmpInst($2, tmpVal1, tmpVal2);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
     delete $3.PAT;
   }
   | FCMP FPredicates Types ValueRef ',' ValueRef {
+    $4.S.copy($3.S);
+    $6.S.copy($3.S);
     const Type *Ty = $3.PAT->get();
     if (isa<VectorType>(Ty))
       error("VectorTypes currently not supported in fcmp instructions");
@@ -3174,7 +3483,7 @@
     Value* tmpVal1 = getVal(Ty, $4);
     Value* tmpVal2 = getVal(Ty, $6);
     $$.I = new FCmpInst($2, tmpVal1, tmpVal2);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
     delete $3.PAT;
   }
   | NOT ResolvedVal {
@@ -3186,7 +3495,7 @@
     $$.I = BinaryOperator::create(Instruction::Xor, $2.V, Ones);
     if ($$.I == 0)
       error("Could not create a xor instruction");
-    $$.S = $2.S;
+    $$.S.copy($2.S);
   }
   | ShiftOps ResolvedVal ',' ResolvedVal {
     if (!$4.V->getType()->isInteger() ||
@@ -3204,7 +3513,7 @@
     else
       ShiftAmt = $4.V;
     $$.I = BinaryOperator::create(getBinaryOp($1, Ty, $2.S), $2.V, ShiftAmt);
-    $$.S = $2.S;
+    $$.S.copy($2.S);
   }
   | CastOps ResolvedVal TO Types {
     const Type *DstTy = $4.PAT->get();
@@ -3212,7 +3521,7 @@
       error("cast instruction to a non-primitive type: '" +
             DstTy->getDescription() + "'");
     $$.I = cast<Instruction>(getCast($1, $2.V, $2.S, DstTy, $4.S, true));
-    $$.S = $4.S;
+    $$.S.copy($4.S);
     delete $4.PAT;
   }
   | SELECT ResolvedVal ',' ResolvedVal ',' ResolvedVal {
@@ -3222,13 +3531,13 @@
     if ($4.V->getType() != $6.V->getType())
       error("select value types should match");
     $$.I = new SelectInst($2.V, $4.V, $6.V);
-    $$.S = $2.S;
+    $$.S.copy($4.S);
   }
   | VAARG ResolvedVal ',' Types {
     const Type *Ty = $4.PAT->get();
     NewVarArgs = true;
     $$.I = new VAArgInst($2.V, Ty);
-    $$.S = $4.S;
+    $$.S.copy($4.S);
     delete $4.PAT;
   }
   | VAARG_old ResolvedVal ',' Types {
@@ -3249,7 +3558,7 @@
     CurBB->getInstList().push_back(bar);
     CurBB->getInstList().push_back(new StoreInst(bar, foo));
     $$.I = new VAArgInst(foo, DstTy);
-    $$.S = $4.S;
+    $$.S.copy($4.S);
     delete $4.PAT;
   }
   | VANEXT_old ResolvedVal ',' Types {
@@ -3273,26 +3582,26 @@
     Instruction* tmp = new VAArgInst(foo, DstTy);
     CurBB->getInstList().push_back(tmp);
     $$.I = new LoadInst(foo);
-    $$.S = $4.S;
+    $$.S.copy($4.S);
     delete $4.PAT;
   }
   | EXTRACTELEMENT ResolvedVal ',' ResolvedVal {
     if (!ExtractElementInst::isValidOperands($2.V, $4.V))
       error("Invalid extractelement operands");
     $$.I = new ExtractElementInst($2.V, $4.V);
-    $$.S = $2.S;
+    $$.S.copy($2.S.get(0));
   }
   | INSERTELEMENT ResolvedVal ',' ResolvedVal ',' ResolvedVal {
     if (!InsertElementInst::isValidOperands($2.V, $4.V, $6.V))
       error("Invalid insertelement operands");
     $$.I = new InsertElementInst($2.V, $4.V, $6.V);
-    $$.S = $2.S;
+    $$.S.copy($2.S);
   }
   | SHUFFLEVECTOR ResolvedVal ',' ResolvedVal ',' ResolvedVal {
     if (!ShuffleVectorInst::isValidOperands($2.V, $4.V, $6.V))
       error("Invalid shufflevector operands");
     $$.I = new ShuffleVectorInst($2.V, $4.V, $6.V);
-    $$.S = $2.S;
+    $$.S.copy($2.S);
   }
   | PHI_TOK PHIList {
     const Type *Ty = $2.P->front().first->getType();
@@ -3307,22 +3616,25 @@
       $2.P->pop_front();
     }
     $$.I = PHI;
-    $$.S = $2.S;
+    $$.S.copy($2.S);
     delete $2.P;  // Free the list...
   }
   | OptTailCall OptCallingConv TypesV ValueRef '(' ValueRefListE ')'  {
-
     // Handle the short call syntax
     const PointerType *PFTy;
     const FunctionType *FTy;
+    Signedness FTySign;
     if (!(PFTy = dyn_cast<PointerType>($3.PAT->get())) ||
         !(FTy = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
+      FTySign.makeComposite($3.S);
       if ($6) {
         for (std::vector<ValueInfo>::iterator I = $6->begin(), E = $6->end();
-             I != E; ++I)
+             I != E; ++I) {
           ParamTypes.push_back((*I).V->getType());
+          FTySign.add(I->S);
+        }
       }
 
       FunctionType::ParamAttrsList ParamAttrs;
@@ -3339,7 +3651,12 @@
 
       FTy = FunctionType::get(RetTy, ParamTypes, isVarArg, ParamAttrs);
       PFTy = PointerType::get(FTy);
+      $$.S.copy($3.S);
+    } else {
+      FTySign = $3.S;
+      $$.S.copy($3.S.get(0)); // 0th element of FuncTy signedness is result sign
     }
+    $4.S.makeComposite(FTySign);
 
     // First upgrade any intrinsic calls.
     std::vector<Value*> Args;
@@ -3351,7 +3668,6 @@
     // If we got an upgraded intrinsic
     if (Inst) {
       $$.I = Inst;
-      $$.S = Signless;
     } else {
       // Get the function we're calling
       Value *V = getVal(PFTy, $4);
@@ -3383,7 +3699,6 @@
       CI->setTailCall($1);
       CI->setCallingConv(upgradeCallingConv($2));
       $$.I = CI;
-      $$.S = $3.S;
     }
     delete $3.PAT;
     delete $6;
@@ -3408,25 +3723,27 @@
 MemoryInst 
   : MALLOC Types OptCAlign {
     const Type *Ty = $2.PAT->get();
-    $$.S = $2.S;
+    $$.S.makeComposite($2.S);
     $$.I = new MallocInst(Ty, 0, $3);
     delete $2.PAT;
   }
   | MALLOC Types ',' UINT ValueRef OptCAlign {
     const Type *Ty = $2.PAT->get();
-    $$.S = $2.S;
+    $5.S.makeUnsigned();
+    $$.S.makeComposite($2.S);
     $$.I = new MallocInst(Ty, getVal($4.T, $5), $6);
     delete $2.PAT;
   }
   | ALLOCA Types OptCAlign {
     const Type *Ty = $2.PAT->get();
-    $$.S = $2.S;
+    $$.S.makeComposite($2.S);
     $$.I = new AllocaInst(Ty, 0, $3);
     delete $2.PAT;
   }
   | ALLOCA Types ',' UINT ValueRef OptCAlign {
     const Type *Ty = $2.PAT->get();
-    $$.S = $2.S;
+    $5.S.makeUnsigned();
+    $$.S.makeComposite($4.S);
     $$.I = new AllocaInst(Ty, getVal($4.T, $5), $6);
     delete $2.PAT;
   }
@@ -3435,11 +3752,11 @@
     if (!isa<PointerType>(PTy))
       error("Trying to free nonpointer type '" + PTy->getDescription() + "'");
     $$.I = new FreeInst($2.V);
-    $$.S = Signless;
+    $$.S.makeSignless();
   }
   | OptVolatile LOAD Types ValueRef {
     const Type* Ty = $3.PAT->get();
-    $$.S = $3.S;
+    $4.S.copy($3.S);
     if (!isa<PointerType>(Ty))
       error("Can't load from nonpointer type: " + Ty->getDescription());
     if (!cast<PointerType>(Ty)->getElementType()->isFirstClassType())
@@ -3447,9 +3764,11 @@
                      Ty->getDescription());
     Value* tmpVal = getVal(Ty, $4);
     $$.I = new LoadInst(tmpVal, "", $1);
+    $$.S.copy($3.S.get(0));
     delete $3.PAT;
   }
   | OptVolatile STORE ResolvedVal ',' Types ValueRef {
+    $6.S.copy($5.S);
     const PointerType *PTy = dyn_cast<PointerType>($5.PAT->get());
     if (!PTy)
       error("Can't store to a nonpointer type: " + 
@@ -3471,10 +3790,11 @@
       }
     }
     $$.I = new StoreInst(StoreVal, tmpVal, $1);
-    $$.S = Signless;
+    $$.S.makeSignless();
     delete $5.PAT;
   }
   | GETELEMENTPTR Types ValueRef IndexList {
+    $3.S.copy($2.S);
     const Type* Ty = $2.PAT->get();
     if (!isa<PointerType>(Ty))
       error("getelementptr insn requires pointer operand");
@@ -3484,7 +3804,8 @@
 
     Value* tmpVal = getVal(Ty, $3);
     $$.I = new GetElementPtrInst(tmpVal, &VIndices[0], VIndices.size());
-    $$.S = Signless;
+    ValueInfo VI; VI.V = tmpVal; VI.S.copy($2.S);
+    $$.S.copy(getElementSign(VI, VIndices));
     delete $2.PAT;
     delete $4;
   };


Index: llvm/tools/llvm-upgrade/UpgradeLexer.l
diff -u llvm/tools/llvm-upgrade/UpgradeLexer.l:1.19 llvm/tools/llvm-upgrade/UpgradeLexer.l:1.20
--- llvm/tools/llvm-upgrade/UpgradeLexer.l:1.19	Wed Feb  7 18:19:40 2007
+++ llvm/tools/llvm-upgrade/UpgradeLexer.l	Wed Mar 21 12:14:36 2007
@@ -51,7 +51,12 @@
 
 #define RET_TY(sym,NewTY,sign) \
   Upgradelval.PrimType.T = NewTY; \
-  Upgradelval.PrimType.S = sign; \
+  switch (sign) { \
+    case 0: Upgradelval.PrimType.S.makeSignless(); break; \
+    case 1: Upgradelval.PrimType.S.makeUnsigned(); break; \
+    case 2: Upgradelval.PrimType.S.makeSigned(); break; \
+    default: assert(0 && "Invalid sign kind"); break; \
+  }\
   return sym
 
 namespace llvm {
@@ -238,24 +243,24 @@
 x86_stdcallcc   { return X86_STDCALLCC_TOK; }
 x86_fastcallcc  { return X86_FASTCALLCC_TOK; }
 
-sbyte           { RET_TY(SBYTE,  Type::Int8Ty,  Signed);  }
-ubyte           { RET_TY(UBYTE,  Type::Int8Ty,  Unsigned); }
-i8              { RET_TY(UBYTE,  Type::Int8Ty,  Unsigned); }
-short           { RET_TY(SHORT,  Type::Int16Ty, Signed);  }
-ushort          { RET_TY(USHORT, Type::Int16Ty, Unsigned); }
-i16             { RET_TY(USHORT, Type::Int16Ty, Unsigned); }
-int             { RET_TY(INT,    Type::Int32Ty, Signed);  }
-uint            { RET_TY(UINT,   Type::Int32Ty, Unsigned); }
-i32             { RET_TY(UINT,   Type::Int32Ty, Unsigned); }
-long            { RET_TY(LONG,   Type::Int64Ty, Signed);  }
-ulong           { RET_TY(ULONG,  Type::Int64Ty, Unsigned); }
-i64             { RET_TY(ULONG,  Type::Int64Ty, Unsigned); }
-void            { RET_TY(VOID,   Type::VoidTy,  Signless  ); }
-bool            { RET_TY(BOOL,   Type::Int1Ty,  Unsigned  ); }
-i1              { RET_TY(BOOL,   Type::Int1Ty,  Unsigned  ); }
-float           { RET_TY(FLOAT,  Type::FloatTy, Signless ); }
-double          { RET_TY(DOUBLE, Type::DoubleTy,Signless); }
-label           { RET_TY(LABEL,  Type::LabelTy, Signless ); }
+sbyte           { RET_TY(SBYTE,  Type::Int8Ty,  2); }
+ubyte           { RET_TY(UBYTE,  Type::Int8Ty,  1); }
+i8              { RET_TY(UBYTE,  Type::Int8Ty,  1); }
+short           { RET_TY(SHORT,  Type::Int16Ty, 2); }
+ushort          { RET_TY(USHORT, Type::Int16Ty, 1); }
+i16             { RET_TY(USHORT, Type::Int16Ty, 1); }
+int             { RET_TY(INT,    Type::Int32Ty, 2); }
+uint            { RET_TY(UINT,   Type::Int32Ty, 1); }
+i32             { RET_TY(UINT,   Type::Int32Ty, 1); }
+long            { RET_TY(LONG,   Type::Int64Ty, 2); }
+ulong           { RET_TY(ULONG,  Type::Int64Ty, 1); }
+i64             { RET_TY(ULONG,  Type::Int64Ty, 1); }
+void            { RET_TY(VOID,   Type::VoidTy,  0); }
+bool            { RET_TY(BOOL,   Type::Int1Ty,  1); }
+i1              { RET_TY(BOOL,   Type::Int1Ty,  1); }
+float           { RET_TY(FLOAT,  Type::FloatTy, 0); }
+double          { RET_TY(DOUBLE, Type::DoubleTy,0); }
+label           { RET_TY(LABEL,  Type::LabelTy, 0); }
 type            { return TYPE;   }
 opaque          { return OPAQUE; }
 


Index: llvm/tools/llvm-upgrade/UpgradeInternals.h
diff -u llvm/tools/llvm-upgrade/UpgradeInternals.h:1.11 llvm/tools/llvm-upgrade/UpgradeInternals.h:1.12
--- llvm/tools/llvm-upgrade/UpgradeInternals.h:1.11	Wed Mar 14 22:25:34 2007
+++ llvm/tools/llvm-upgrade/UpgradeInternals.h	Wed Mar 21 12:14:36 2007
@@ -21,6 +21,7 @@
 #include "llvm/Instructions.h"
 #include "llvm/ADT/StringExtras.h"
 #include <list>
+#include <iostream>
 
 
 // Global variables exported from the lexer.
@@ -32,12 +33,10 @@
 
 namespace llvm {
 
-
 class Module;
 Module* UpgradeAssembly(const std::string &infile, std::istream& in, 
                         bool debug, bool addAttrs);
 
-
 extern std::istream* LexInput;
 
 // UnEscapeLexed - Run through the specified buffer and change \xx codes to the
@@ -59,6 +58,88 @@
     : AsmString(as), Constraints(c), HasSideEffects(HSE) {}
 };
 
+/// This class keeps track of the signedness of a type or value. It allows the
+/// signedness of a composite type to be captured in a relatively simple form.
+/// This is needed in order to retain the signedness of pre LLVM 2.0 types so
+/// they can be upgraded properly. Signedness of composite types must be
+/// captured in order to accurately get the signedness of a value through a
+/// GEP instruction. 
+/// @brief Class to track signedness of types and values.
+struct Signedness {
+  /// The basic kinds of signedness values.
+  enum Kind { 
+    Signless, ///< The type doesn't have any sign.
+    Unsigned, ///< The type is an unsigned integer.
+    Signed,   ///< The type is a signed integer.
+    Named,    ///< The type is a named type (probably forward ref or up ref).
+    Composite ///< The type is composite (struct, array, pointer). 
+  };
+
+private:
+  /// @brief Keeps track of Signedness for composite types
+  typedef std::vector<Signedness> SignVector;
+  Kind kind; ///< The kind of signedness node
+  union {
+    SignVector *sv;    ///< The vector of Signedness for composite types
+    std::string *name; ///< The name of the type for named types.
+  };
+public:
+  /// The Signedness class is used as a member of a union so it cannot have
+  /// a constructor or assignment operator. This function suffices.
+  /// @brief Copy one signedness value to another
+  void copy(const Signedness &that);
+  /// The Signedness class is used as a member of a union so it cannot have
+  /// a destructor.
+  /// @brief Release memory, if any allocated.
+  void destroy();
+
+  /// @brief Make a Signless node.
+  void makeSignless() { kind = Signless; sv = 0; }
+  /// @brief Make a Signed node.
+  void makeSigned()   { kind = Signed; sv = 0; }
+  /// @brief Make an Unsigned node.
+  void makeUnsigned() { kind = Unsigned; sv = 0; }
+  /// @brief Make a Named node.
+  void makeNamed(const std::string& nm){ 
+    kind = Named; name = new std::string(nm); 
+  }
+  /// @brief Make an empty Composite node.
+  void makeComposite() { kind = Composite; sv = new SignVector(); }
+  /// @brief Make an Composite node, with the first element given.
+  void makeComposite(const Signedness &S) { 
+    kind = Composite; 
+    sv = new SignVector(); 
+    sv->push_back(S);
+  }
+  /// @brief Add an element to a Composite node.
+  void add(const Signedness &S) {
+    assert(isComposite() && "Must be composite to use add");
+    sv->push_back(S);
+  }
+  bool operator<(const Signedness &that) const;
+  bool operator==(const Signedness &that) const;
+  bool isSigned() const { return kind == Signed; }
+  bool isUnsigned() const { return kind == Unsigned; }
+  bool isSignless() const { return kind == Signless; }
+  bool isNamed() const { return kind == Named; }
+  bool isComposite() const { return kind == Composite; }
+  /// This is used by GetElementPtr to extract the sign of an element.
+  /// @brief Get a specific element from a Composite node.
+  Signedness get(uint64_t idx) const {
+    assert(isComposite() && "Invalid Signedness type for get()");
+    assert(sv && idx < sv->size() && "Invalid index");
+    return (*sv)[idx];
+  }
+  /// @brief Get the name from a Named node.
+  const std::string& getName() const {
+    assert(isNamed() && "Can't get name from non-name Sign");
+    return *name;
+  }
+#ifndef NDEBUG
+  void dump() const;
+#endif
+};
+
 
 // ValID - Represents a reference of a definition of some sort.  This may either
 // be a numeric reference or a symbolic (%var) reference.  This is just a
@@ -82,41 +163,58 @@
     Constant *ConstantValue; // Fully resolved constant for ConstantVal case.
     InlineAsmDescriptor *IAD;
   };
+  Signedness S;
 
   static ValID create(int Num) {
-    ValID D; D.Type = NumberVal; D.Num = Num; return D;
+    ValID D; D.Type = NumberVal; D.Num = Num; D.S.makeSignless();
+    return D;
   }
 
   static ValID create(char *Name) {
-    ValID D; D.Type = NameVal; D.Name = Name; return D;
+    ValID D; D.Type = NameVal; D.Name = Name; D.S.makeSignless();
+    return D;
   }
 
   static ValID create(int64_t Val) {
-    ValID D; D.Type = ConstSIntVal; D.ConstPool64 = Val; return D;
+    ValID D; D.Type = ConstSIntVal; D.ConstPool64 = Val; 
+    D.S.makeSigned();
+    return D;
   }
 
   static ValID create(uint64_t Val) {
-    ValID D; D.Type = ConstUIntVal; D.UConstPool64 = Val; return D;
+    ValID D; D.Type = ConstUIntVal; D.UConstPool64 = Val; 
+    D.S.makeUnsigned();
+    return D;
   }
 
   static ValID create(double Val) {
-    ValID D; D.Type = ConstFPVal; D.ConstPoolFP = Val; return D;
+    ValID D; D.Type = ConstFPVal; D.ConstPoolFP = Val;
+    D.S.makeSignless();
+    return D;
   }
 
   static ValID createNull() {
-    ValID D; D.Type = ConstNullVal; return D;
+    ValID D; D.Type = ConstNullVal;
+    D.S.makeSignless();
+    return D;
   }
 
   static ValID createUndef() {
-    ValID D; D.Type = ConstUndefVal; return D;
+    ValID D; D.Type = ConstUndefVal;
+    D.S.makeSignless();
+    return D;
   }
 
   static ValID createZeroInit() {
-    ValID D; D.Type = ConstZeroVal; return D;
+    ValID D; D.Type = ConstZeroVal;
+    D.S.makeSignless();
+    return D;
   }
   
   static ValID create(Constant *Val) {
-    ValID D; D.Type = ConstantVal; D.ConstantValue = Val; return D;
+    ValID D; D.Type = ConstantVal; D.ConstantValue = Val;
+    D.S.makeSignless();
+    return D;
   }
   
   static ValID createInlineAsm(const std::string &AsmString,
@@ -125,6 +223,7 @@
     ValID D;
     D.Type = InlineAsmVal;
     D.IAD = new InlineAsmDescriptor(AsmString, Constraints, HasSideEffects);
+    D.S.makeSignless();
     return D;
   }
 
@@ -221,10 +320,6 @@
   };
 }
 
-/// An enumeration for defining the Signedness of a type or value. Signless
-/// means the signedness is not relevant to the type or value.
-enum Signedness { Signless, Unsigned, Signed };
-
 /// These structures are used as the semantic values returned from various
 /// productions in the grammar. They simply bundle an LLVM IR object with
 /// its Signedness value. These help track signedness through the various
@@ -232,31 +327,67 @@
 struct TypeInfo {
   const llvm::Type *T;
   Signedness S;
+  bool operator<(const TypeInfo& that) const {
+    if (this == &that)
+      return false;
+    if (T < that.T)
+      return true;
+    if (T == that.T) {
+      bool result = S < that.S;
+//#define TYPEINFO_DEBUG
+#ifdef TYPEINFO_DEBUG
+      std::cerr << (result?"true  ":"false ") << T->getDescription() << " (";
+      S.dump();
+      std::cerr << ") < " << that.T->getDescription() << " (";
+      that.S.dump();
+      std::cerr << ")\n";
+#endif
+      return result;
+    }
+    return false;
+  }
+  bool operator==(const TypeInfo& that) const {
+    if (this == &that)
+      return true;
+    return T == that.T && S == that.S;
+  }
+  void destroy() { S.destroy(); }
 };
 
 struct PATypeInfo {
   llvm::PATypeHolder* PAT;
   Signedness S;
+  void destroy() { S.destroy(); delete PAT; }
 };
 
 struct ConstInfo {
   llvm::Constant* C;
   Signedness S;
+  void destroy() { S.destroy(); }
 };
 
 struct ValueInfo {
   llvm::Value* V;
   Signedness S;
+  void destroy() { S.destroy(); }
 };
 
 struct InstrInfo {
   llvm::Instruction *I;
   Signedness S;
+  void destroy() { S.destroy(); }
+};
+
+struct TermInstInfo {
+  llvm::TerminatorInst *TI;
+  Signedness S;
+  void destroy() { S.destroy(); }
 };
 
 struct PHIListInfo {
   std::list<std::pair<llvm::Value*, llvm::BasicBlock*> > *P;
   Signedness S;
+  void destroy() { S.destroy(); delete P; }
 };
 
 } // End llvm namespace





From reid at x10sys.com  Wed Mar 21 12:16:08 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 12:16:08 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
	UpgradeLexer.l.cvs UpgradeParser.cpp.cvs UpgradeParser.h.cvs
	UpgradeParser.y.cvs
Message-ID: <200703211716.l2LHG8iN000389@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvm-upgrade:

UpgradeLexer.cpp.cvs updated: 1.22 -> 1.23
UpgradeLexer.l.cvs updated: 1.19 -> 1.20
UpgradeParser.cpp.cvs updated: 1.66 -> 1.67
UpgradeParser.h.cvs updated: 1.50 -> 1.51
UpgradeParser.y.cvs updated: 1.65 -> 1.66
---
Log message:

Regenerate.


---
Diffs of the changes:  (+1558 -905)

 UpgradeLexer.cpp.cvs  |  379 +++++++-------
 UpgradeLexer.l.cvs    |   43 -
 UpgradeParser.cpp.cvs | 1282 +++++++++++++++++++++++++++++++-------------------
 UpgradeParser.h.cvs   |    4 
 UpgradeParser.y.cvs   |  755 ++++++++++++++++++++---------
 5 files changed, 1558 insertions(+), 905 deletions(-)


Index: llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
diff -u llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs:1.22 llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs:1.23
--- llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs:1.22	Wed Mar 14 22:26:42 2007
+++ llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs	Wed Mar 21 12:15:50 2007
@@ -20,7 +20,7 @@
 /* A lexical scanner generated by flex*/
 
 /* Scanner skeleton version:
- * $Header: /var/cvs/llvm/llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs,v 1.22 2007/03/15 03:26:42 reid Exp $
+ * $Header: /var/cvs/llvm/llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs,v 1.23 2007/03/21 17:15:50 reid Exp $
  */
 
 #define FLEX_SCANNER
@@ -976,7 +976,12 @@
 
 #define RET_TY(sym,NewTY,sign) \
   Upgradelval.PrimType.T = NewTY; \
-  Upgradelval.PrimType.S = sign; \
+  switch (sign) { \
+    case 0: Upgradelval.PrimType.S.makeSignless(); break; \
+    case 1: Upgradelval.PrimType.S.makeUnsigned(); break; \
+    case 2: Upgradelval.PrimType.S.makeSigned(); break; \
+    default: assert(0 && "Invalid sign kind"); break; \
+  }\
   return sym
 
 namespace llvm {
@@ -1085,7 +1090,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1089 "UpgradeLexer.cpp"
+#line 1094 "UpgradeLexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1236,10 +1241,10 @@
 	register char *yy_cp = NULL, *yy_bp = NULL;
 	register int yy_act;
 
-#line 189 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 194 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 
 
-#line 1243 "UpgradeLexer.cpp"
+#line 1248 "UpgradeLexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1332,742 +1337,742 @@
 	{ /* beginning of action switch */
 case 1:
 YY_RULE_SETUP
-#line 191 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 196 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { /* Ignore comments for now */ }
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 193 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 198 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return BEGINTOK; }
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 194 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 199 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return ENDTOK; }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 195 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 200 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return TRUETOK;  }
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 196 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 201 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return FALSETOK; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 197 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 202 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return DECLARE; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 198 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return GLOBAL; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 199 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 204 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return CONSTANT; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 200 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 205 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return INTERNAL; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 201 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 206 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return LINKONCE; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 202 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 207 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return WEAK; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 208 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return APPENDING; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 204 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 209 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return DLLIMPORT; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 205 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 210 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return DLLEXPORT; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 206 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 211 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return EXTERN_WEAK; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 207 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 212 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return EXTERNAL; }    /* Deprecated, turn into external */
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 208 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 213 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return EXTERNAL; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 209 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 214 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return IMPLEMENTATION; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 210 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 215 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return ZEROINITIALIZER; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 211 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 216 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return DOTDOTDOT; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 212 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 217 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return UNDEF; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 213 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 218 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return NULL_TOK; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 214 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 219 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return TO; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 215 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 220 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return EXCEPT; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 216 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 221 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return NOT; }  /* Deprecated, turned into XOR */
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 217 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 222 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return TAIL; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 218 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return TARGET; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 219 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 224 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return TRIPLE; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 220 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 225 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return DEPLIBS; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 221 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 226 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return ENDIAN; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 222 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 227 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return POINTERSIZE; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return DATALAYOUT; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 224 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 229 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return LITTLE; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 225 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 230 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return BIG; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 226 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return VOLATILE; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 227 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 232 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return ALIGN;  }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 233 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return SECTION; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 229 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 234 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return MODULE; }
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 230 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 235 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return ASM_TOK; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 236 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return SIDEEFFECT; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 233 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 238 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return CC_TOK; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 234 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 239 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return CCC_TOK; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 235 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 240 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return CSRETCC_TOK; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 236 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 241 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return FASTCC_TOK; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 237 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 242 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return COLDCC_TOK; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 238 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 243 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return X86_STDCALLCC_TOK; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 239 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 244 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return X86_FASTCALLCC_TOK; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 241 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(SBYTE,  Type::Int8Ty,  Signed);  }
+#line 246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(SBYTE,  Type::Int8Ty,  2); }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 242 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(UBYTE,  Type::Int8Ty,  Unsigned); }
+#line 247 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(UBYTE,  Type::Int8Ty,  1); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 243 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(UBYTE,  Type::Int8Ty,  Unsigned); }
+#line 248 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(UBYTE,  Type::Int8Ty,  1); }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 244 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(SHORT,  Type::Int16Ty, Signed);  }
+#line 249 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(SHORT,  Type::Int16Ty, 2); }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 245 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(USHORT, Type::Int16Ty, Unsigned); }
+#line 250 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(USHORT, Type::Int16Ty, 1); }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(USHORT, Type::Int16Ty, Unsigned); }
+#line 251 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(USHORT, Type::Int16Ty, 1); }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 247 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(INT,    Type::Int32Ty, Signed);  }
+#line 252 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(INT,    Type::Int32Ty, 2); }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 248 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(UINT,   Type::Int32Ty, Unsigned); }
+#line 253 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(UINT,   Type::Int32Ty, 1); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 249 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(UINT,   Type::Int32Ty, Unsigned); }
+#line 254 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(UINT,   Type::Int32Ty, 1); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 250 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(LONG,   Type::Int64Ty, Signed);  }
+#line 255 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(LONG,   Type::Int64Ty, 2); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 251 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(ULONG,  Type::Int64Ty, Unsigned); }
+#line 256 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(ULONG,  Type::Int64Ty, 1); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 252 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(ULONG,  Type::Int64Ty, Unsigned); }
+#line 257 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(ULONG,  Type::Int64Ty, 1); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 253 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(VOID,   Type::VoidTy,  Signless  ); }
+#line 258 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(VOID,   Type::VoidTy,  0); }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 254 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(BOOL,   Type::Int1Ty,  Unsigned  ); }
+#line 259 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(BOOL,   Type::Int1Ty,  1); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 255 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(BOOL,   Type::Int1Ty,  Unsigned  ); }
+#line 260 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(BOOL,   Type::Int1Ty,  1); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 256 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(FLOAT,  Type::FloatTy, Signless ); }
+#line 261 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(FLOAT,  Type::FloatTy, 0); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 257 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(DOUBLE, Type::DoubleTy,Signless); }
+#line 262 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(DOUBLE, Type::DoubleTy,0); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 258 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
-{ RET_TY(LABEL,  Type::LabelTy, Signless ); }
+#line 263 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+{ RET_TY(LABEL,  Type::LabelTy, 0); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 259 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 264 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return TYPE;   }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 260 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 265 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return OPAQUE; }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 262 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 267 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, AddOp, ADD); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 263 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 268 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SubOp, SUB); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 264 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 269 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, MulOp, MUL); }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 265 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 270 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, DivOp,  DIV); }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 266 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 271 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, UDivOp, UDIV); }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 267 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 272 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SDivOp, SDIV); }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 268 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 273 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, FDivOp, FDIV); }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 269 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 274 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, RemOp,  REM); }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 270 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 275 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, URemOp, UREM); }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 271 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 276 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SRemOp, SREM); }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 272 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 277 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, FRemOp, FREM); }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 273 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 278 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, AndOp, AND); }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 274 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 279 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, OrOp , OR ); }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 275 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 280 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, XorOp, XOR); }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 276 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 281 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SetNE, SETNE); }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 277 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 282 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 278 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 283 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SetLT, SETLT); }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 279 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 284 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SetGT, SETGT); }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 280 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 285 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SetLE, SETLE); }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 281 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 286 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, SetGE, SETGE); }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 282 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 287 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, ShlOp, SHL); }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 283 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 288 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, ShrOp, SHR); }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 284 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 289 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, LShrOp, LSHR); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 285 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 290 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(BinaryOpVal, AShrOp, ASHR); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 287 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 292 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, ICmpOp, ICMP); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 288 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 293 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, FCmpOp, FCMP); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 290 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 295 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return EQ; }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 291 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 296 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return NE; }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 292 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 297 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return SLT; }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 293 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 298 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return SGT; }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 294 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 299 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return SLE; }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 295 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 300 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return SGE; }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 296 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 301 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return ULT; }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 297 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 302 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return UGT; }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 298 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 303 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return ULE; }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 299 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 304 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return UGE; }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 300 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 305 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return OEQ; }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 301 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 306 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return ONE; }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 302 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 307 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return OLT; }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 303 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 308 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return OGT; }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 304 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 309 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return OLE; }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 305 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 310 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return OGE; }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 306 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 311 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return ORD; }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 307 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 312 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return UNO; }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 308 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 313 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return UEQ; }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 309 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 314 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return UNE; }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 311 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 316 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, PHIOp, PHI_TOK); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 312 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 317 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, CallOp, CALL); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 313 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 318 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, CastOp, CAST);  }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 314 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 319 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, TruncOp, TRUNC); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 315 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 320 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, ZExtOp , ZEXT); }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 316 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 321 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, SExtOp, SEXT); }
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 317 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 322 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, FPTruncOp, FPTRUNC); }
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 318 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 323 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, FPExtOp, FPEXT); }
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 319 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 324 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, FPToUIOp, FPTOUI); }
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 320 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 325 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, FPToSIOp, FPTOSI); }
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 321 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 326 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, UIToFPOp, UITOFP); }
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 322 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 327 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, SIToFPOp, SITOFP); }
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 323 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 328 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, PtrToIntOp, PTRTOINT); }
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 324 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 329 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, IntToPtrOp, INTTOPTR); }
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 325 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 330 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(CastOpVal, BitCastOp, BITCAST); }
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 326 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 331 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, SelectOp, SELECT); }
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 327 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 332 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return VANEXT_old; }
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 328 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 333 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return VAARG_old; }
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 329 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 334 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 330 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 335 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(TermOpVal, RetOp, RET); }
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 331 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 336 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(TermOpVal, BrOp, BR); }
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 332 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 337 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(TermOpVal, SwitchOp, SWITCH); }
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 333 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 338 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(TermOpVal, InvokeOp, INVOKE); }
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 334 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 339 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return UNWIND; }
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 335 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 340 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(TermOpVal, UnreachableOp, UNREACHABLE); }
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 337 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 342 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(MemOpVal, MallocOp, MALLOC); }
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 338 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 343 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(MemOpVal, AllocaOp, ALLOCA); }
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 339 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 344 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(MemOpVal, FreeOp, FREE); }
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 340 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 345 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(MemOpVal, LoadOp, LOAD); }
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 341 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 346 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(MemOpVal, StoreOp, STORE); }
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 342 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 347 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(MemOpVal, GetElementPtrOp, GETELEMENTPTR); }
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 344 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 349 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, ExtractElementOp, EXTRACTELEMENT); }
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 345 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 350 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, InsertElementOp, INSERTELEMENT); }
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 346 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 351 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { RET_TOK(OtherOpVal, ShuffleVectorOp, SHUFFLEVECTOR); }
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 349 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 354 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 {
                   UnEscapeLexed(yytext+1);
                   Upgradelval.StrVal = strdup(yytext+1);             // Skip %
@@ -2076,7 +2081,7 @@
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 354 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 359 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 {
                   yytext[strlen(yytext)-1] = 0;  // nuke colon
                   UnEscapeLexed(yytext);
@@ -2086,7 +2091,7 @@
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 360 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 365 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 {
                   yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
                   UnEscapeLexed(yytext+1);
@@ -2096,7 +2101,7 @@
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 367 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 372 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { // Note that we cannot unescape a string constant here!  The
                    // string constant might contain a \00 which would not be
                    // understood by the string stuff.  It is valid to make a
@@ -2109,12 +2114,12 @@
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 378 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 383 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { Upgradelval.UInt64Val = atoull(yytext); return EUINT64VAL; }
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 379 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 384 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   // +1:  we have bigger negative range
@@ -2126,7 +2131,7 @@
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 387 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 392 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 {
                    Upgradelval.UInt64Val = HexIntToVal(yytext+3);
                    return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
@@ -2134,7 +2139,7 @@
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 392 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 397 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -2145,7 +2150,7 @@
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 399 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 404 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 {
                   uint64_t Val = atoull(yytext+2);
                   // +1:  we have bigger negative range
@@ -2157,16 +2162,16 @@
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 408 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 413 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { Upgradelval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 409 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 414 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { Upgradelval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 411 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 416 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -2177,20 +2182,20 @@
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 419 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 424 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 420 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 425 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 { return yytext[0]; }
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 422 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 427 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2194 "UpgradeLexer.cpp"
+#line 2199 "UpgradeLexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -3068,5 +3073,5 @@
 	return 0;
 	}
 #endif
-#line 422 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
+#line 427 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
 


Index: llvm/tools/llvm-upgrade/UpgradeLexer.l.cvs
diff -u llvm/tools/llvm-upgrade/UpgradeLexer.l.cvs:1.19 llvm/tools/llvm-upgrade/UpgradeLexer.l.cvs:1.20
--- llvm/tools/llvm-upgrade/UpgradeLexer.l.cvs:1.19	Wed Feb  7 18:21:40 2007
+++ llvm/tools/llvm-upgrade/UpgradeLexer.l.cvs	Wed Mar 21 12:15:50 2007
@@ -51,7 +51,12 @@
 
 #define RET_TY(sym,NewTY,sign) \
   Upgradelval.PrimType.T = NewTY; \
-  Upgradelval.PrimType.S = sign; \
+  switch (sign) { \
+    case 0: Upgradelval.PrimType.S.makeSignless(); break; \
+    case 1: Upgradelval.PrimType.S.makeUnsigned(); break; \
+    case 2: Upgradelval.PrimType.S.makeSigned(); break; \
+    default: assert(0 && "Invalid sign kind"); break; \
+  }\
   return sym
 
 namespace llvm {
@@ -238,24 +243,24 @@
 x86_stdcallcc   { return X86_STDCALLCC_TOK; }
 x86_fastcallcc  { return X86_FASTCALLCC_TOK; }
 
-sbyte           { RET_TY(SBYTE,  Type::Int8Ty,  Signed);  }
-ubyte           { RET_TY(UBYTE,  Type::Int8Ty,  Unsigned); }
-i8              { RET_TY(UBYTE,  Type::Int8Ty,  Unsigned); }
-short           { RET_TY(SHORT,  Type::Int16Ty, Signed);  }
-ushort          { RET_TY(USHORT, Type::Int16Ty, Unsigned); }
-i16             { RET_TY(USHORT, Type::Int16Ty, Unsigned); }
-int             { RET_TY(INT,    Type::Int32Ty, Signed);  }
-uint            { RET_TY(UINT,   Type::Int32Ty, Unsigned); }
-i32             { RET_TY(UINT,   Type::Int32Ty, Unsigned); }
-long            { RET_TY(LONG,   Type::Int64Ty, Signed);  }
-ulong           { RET_TY(ULONG,  Type::Int64Ty, Unsigned); }
-i64             { RET_TY(ULONG,  Type::Int64Ty, Unsigned); }
-void            { RET_TY(VOID,   Type::VoidTy,  Signless  ); }
-bool            { RET_TY(BOOL,   Type::Int1Ty,  Unsigned  ); }
-i1              { RET_TY(BOOL,   Type::Int1Ty,  Unsigned  ); }
-float           { RET_TY(FLOAT,  Type::FloatTy, Signless ); }
-double          { RET_TY(DOUBLE, Type::DoubleTy,Signless); }
-label           { RET_TY(LABEL,  Type::LabelTy, Signless ); }
+sbyte           { RET_TY(SBYTE,  Type::Int8Ty,  2); }
+ubyte           { RET_TY(UBYTE,  Type::Int8Ty,  1); }
+i8              { RET_TY(UBYTE,  Type::Int8Ty,  1); }
+short           { RET_TY(SHORT,  Type::Int16Ty, 2); }
+ushort          { RET_TY(USHORT, Type::Int16Ty, 1); }
+i16             { RET_TY(USHORT, Type::Int16Ty, 1); }
+int             { RET_TY(INT,    Type::Int32Ty, 2); }
+uint            { RET_TY(UINT,   Type::Int32Ty, 1); }
+i32             { RET_TY(UINT,   Type::Int32Ty, 1); }
+long            { RET_TY(LONG,   Type::Int64Ty, 2); }
+ulong           { RET_TY(ULONG,  Type::Int64Ty, 1); }
+i64             { RET_TY(ULONG,  Type::Int64Ty, 1); }
+void            { RET_TY(VOID,   Type::VoidTy,  0); }
+bool            { RET_TY(BOOL,   Type::Int1Ty,  1); }
+i1              { RET_TY(BOOL,   Type::Int1Ty,  1); }
+float           { RET_TY(FLOAT,  Type::FloatTy, 0); }
+double          { RET_TY(DOUBLE, Type::DoubleTy,0); }
+label           { RET_TY(LABEL,  Type::LabelTy, 0); }
 type            { return TYPE;   }
 opaque          { return OPAQUE; }
 


Index: llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
diff -u llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.66 llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.67
--- llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.66	Wed Mar 14 22:26:42 2007
+++ llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs	Wed Mar 21 12:15:50 2007
@@ -427,7 +427,7 @@
 //
 typedef std::vector<Value *> ValueList;           // Numbered defs
 
-typedef std::pair<std::string,const Type*> RenameMapKey;
+typedef std::pair<std::string,TypeInfo> RenameMapKey;
 typedef std::map<RenameMapKey,std::string> RenameMapType;
 
 static void 
@@ -438,7 +438,10 @@
   Module *CurrentModule;
   std::map<const Type *, ValueList> Values; // Module level numbered definitions
   std::map<const Type *,ValueList> LateResolveValues;
-  std::vector<PATypeHolder>    Types;
+  std::vector<PATypeHolder> Types;
+  std::vector<Signedness> TypeSigns;
+  std::map<std::string,Signedness> NamedTypeSigns;
+  std::map<std::string,Signedness> NamedValueSigns;
   std::map<ValID, PATypeHolder> LateResolveTypes;
   static Module::Endianness Endian;
   static Module::PointerSize PointerSize;
@@ -495,6 +498,9 @@
 
     Values.clear();         // Clear out function local definitions
     Types.clear();
+    TypeSigns.clear();
+    NamedTypeSigns.clear();
+    NamedValueSigns.clear();
     CurrentModule = 0;
   }
 
@@ -568,6 +574,24 @@
 
 static bool inFunctionScope() { return CurFun.CurrentFunction != 0; }
 
+/// This function is just a utility to make a Key value for the rename map.
+/// The Key is a combination of the name, type, Signedness of the original 
+/// value (global/function). This just constructs the key and ensures that
+/// named Signedness values are resolved to the actual Signedness.
+/// @brief Make a key for the RenameMaps
+static RenameMapKey makeRenameMapKey(const std::string &Name, const Type* Ty, 
+                                     const Signedness &Sign) {
+  TypeInfo TI; 
+  TI.T = Ty; 
+  if (Sign.isNamed())
+    // Don't allow Named Signedness nodes because they won't match. The actual
+    // Signedness must be looked up in the NamedTypeSigns map.
+    TI.S.copy(CurModule.NamedTypeSigns[Sign.getName()]);
+  else
+    TI.S.copy(Sign);
+  return std::make_pair(Name, TI);
+}
+
 
 //===----------------------------------------------------------------------===//
 //               Code to handle definitions of all the types
@@ -593,7 +617,6 @@
     break;
   case ValID::NameVal:                 // Is it a named definition?
     if (const Type *N = CurModule.CurrentModule->getTypeByName(D.Name)) {
-      D.destroy();  // Free old strdup'd memory...
       return N;
     }
     break;
@@ -608,7 +631,6 @@
   //
   if (DoNotImprovise) return 0;  // Do we just want a null to be returned?
 
-
   if (inFunctionScope()) {
     if (D.Type == ValID::NameVal) {
       error("Reference to an undefined type: '" + D.getName() + "'");
@@ -626,13 +648,94 @@
   Type *Typ = OpaqueType::get();
   CurModule.LateResolveTypes.insert(std::make_pair(D, Typ));
   return Typ;
- }
+}
+
+/// This is like the getType method except that instead of looking up the type
+/// for a given ID, it looks up that type's sign.
+/// @brief Get the signedness of a referenced type
+static Signedness getTypeSign(const ValID &D) {
+  switch (D.Type) {
+  case ValID::NumberVal:               // Is it a numbered definition?
+    // Module constants occupy the lowest numbered slots...
+    if ((unsigned)D.Num < CurModule.TypeSigns.size()) {
+      return CurModule.TypeSigns[(unsigned)D.Num];
+    }
+    break;
+  case ValID::NameVal: {               // Is it a named definition?
+    std::map<std::string,Signedness>::const_iterator I = 
+      CurModule.NamedTypeSigns.find(D.Name);
+    if (I != CurModule.NamedTypeSigns.end())
+      return I->second;
+    // Perhaps its a named forward .. just cache the name
+    Signedness S;
+    S.makeNamed(D.Name);
+    return S;
+  }
+  default: 
+    break;
+  }
+  // If we don't find it, its signless
+  Signedness S;
+  S.makeSignless();
+  return S;
+}
+
+/// This function is analagous to getElementType in LLVM. It provides the same
+/// function except that it looks up the Signedness instead of the type. This is
+/// used when processing GEP instructions that need to extract the type of an
+/// indexed struct/array/ptr member. 
+/// @brief Look up an element's sign.
+static Signedness getElementSign(const ValueInfo& VI, 
+                                 const std::vector<Value*> &Indices) {
+  const Type *Ptr = VI.V->getType();
+  assert(isa<PointerType>(Ptr) && "Need pointer type");
+
+  unsigned CurIdx = 0;
+  Signedness S(VI.S);
+  while (const CompositeType *CT = dyn_cast<CompositeType>(Ptr)) {
+    if (CurIdx == Indices.size())
+      break;
+
+    Value *Index = Indices[CurIdx++];
+    assert(!isa<PointerType>(CT) || CurIdx == 1 && "Invalid type");
+    Ptr = CT->getTypeAtIndex(Index);
+    if (const Type* Ty = Ptr->getForwardedType())
+      Ptr = Ty;
+    assert(S.isComposite() && "Bad Signedness type");
+    if (isa<StructType>(CT)) {
+      S = S.get(cast<ConstantInt>(Index)->getZExtValue());
+    } else {
+      S = S.get(0UL);
+    }
+    if (S.isNamed())
+      S = CurModule.NamedTypeSigns[S.getName()];
+  }
+  Signedness Result;
+  Result.makeComposite(S);
+  return Result;
+}
+
+/// This function just translates a ConstantInfo into a ValueInfo and calls
+/// getElementSign(ValueInfo,...). Its just a convenience.
+/// @brief ConstantInfo version of getElementSign.
+static Signedness getElementSign(const ConstInfo& CI, 
+                                 const std::vector<Constant*> &Indices) {
+  ValueInfo VI;
+  VI.V = CI.C;
+  VI.S.copy(CI.S);
+  std::vector<Value*> Idx;
+  for (unsigned i = 0; i < Indices.size(); ++i)
+    Idx.push_back(Indices[i]);
+  Signedness result = getElementSign(VI, Idx);
+  VI.destroy();
+  return result;
+}
 
 /// This function determines if two function types differ only in their use of
 /// the sret parameter attribute in the first argument. If they are identical 
 /// in all other respects, it returns true. Otherwise, it returns false.
-bool FuncTysDifferOnlyBySRet(const FunctionType *F1, 
-                                   const FunctionType *F2) {
+static bool FuncTysDifferOnlyBySRet(const FunctionType *F1, 
+                                    const FunctionType *F2) {
   if (F1->getReturnType() != F2->getReturnType() ||
       F1->getNumParams() != F2->getNumParams() ||
       F1->getParamAttrs(0) != F2->getParamAttrs(0))
@@ -647,10 +750,27 @@
   return true;
 }
 
+/// This function determines if the type of V and Ty differ only by the SRet
+/// parameter attribute. This is a more generalized case of
+/// FuncTysDIfferOnlyBySRet since it doesn't require FunctionType arguments.
+static bool TypesDifferOnlyBySRet(Value *V, const Type* Ty) {
+  if (V->getType() == Ty)
+    return true;
+  const PointerType *PF1 = dyn_cast<PointerType>(Ty);
+  const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
+  if (PF1 && PF2) {
+    const FunctionType* FT1 = dyn_cast<FunctionType>(PF1->getElementType());
+    const FunctionType* FT2 = dyn_cast<FunctionType>(PF2->getElementType());
+    if (FT1 && FT2)
+      return FuncTysDifferOnlyBySRet(FT1, FT2);
+  }
+  return false;
+}
+
 // The upgrade of csretcc to sret param attribute may have caused a function 
 // to not be found because the param attribute changed the type of the called 
 // function. This helper function, used in getExistingValue, detects that
-// situation and returns V if it occurs and 0 otherwise. 
+// situation and bitcasts the function to the correct type.
 static Value* handleSRetFuncTypeMerge(Value *V, const Type* Ty) {
   // Handle degenerate cases
   if (!V)
@@ -658,23 +778,21 @@
   if (V->getType() == Ty)
     return V;
 
-  Value* Result = 0;
   const PointerType *PF1 = dyn_cast<PointerType>(Ty);
   const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
   if (PF1 && PF2) {
-    const FunctionType *FT1 =
-      dyn_cast<FunctionType>(PF1->getElementType());
-    const FunctionType *FT2 =
-      dyn_cast<FunctionType>(PF2->getElementType());
+    const FunctionType *FT1 = dyn_cast<FunctionType>(PF1->getElementType());
+    const FunctionType *FT2 = dyn_cast<FunctionType>(PF2->getElementType());
     if (FT1 && FT2 && FuncTysDifferOnlyBySRet(FT1, FT2))
       if (FT2->paramHasAttr(1, FunctionType::StructRetAttribute))
-        Result = V;
+        return V;
       else if (Constant *C = dyn_cast<Constant>(V))
-        Result = ConstantExpr::getBitCast(C, PF1);
+        return ConstantExpr::getBitCast(C, PF1);
       else
-        Result = new BitCastInst(V, PF1, "upgrd.cast", CurBB);
+        return new BitCastInst(V, PF1, "upgrd.cast", CurBB);
+      
   }
-  return Result;
+  return 0;
 }
 
 // getExistingValue - Look up the value specified by the provided type and
@@ -710,9 +828,8 @@
 
   case ValID::NameVal: {                // Is it a named definition?
     // Get the name out of the ID
-    std::string Name(D.Name);
-    Value* V = 0;
-    RenameMapKey Key = std::make_pair(Name, Ty);
+    RenameMapKey Key = makeRenameMapKey(D.Name, Ty, D.S);
+    Value *V = 0;
     if (inFunctionScope()) {
       // See if the name was renamed
       RenameMapType::const_iterator I = CurFun.RenameMap.find(Key);
@@ -720,10 +837,12 @@
       if (I != CurFun.RenameMap.end())
         LookupName = I->second;
       else
-        LookupName = Name;
+        LookupName = D.Name;
       ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable();
       V = SymTab.lookup(LookupName);
-      V = handleSRetFuncTypeMerge(V, Ty);
+      if (V && V->getType() != Ty)
+        V = handleSRetFuncTypeMerge(V, Ty);
+      assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type");
     }
     if (!V) {
       RenameMapType::const_iterator I = CurModule.RenameMap.find(Key);
@@ -731,9 +850,11 @@
       if (I != CurModule.RenameMap.end())
         LookupName = I->second;
       else
-        LookupName = Name;
+        LookupName = D.Name;
       V = CurModule.CurrentModule->getValueSymbolTable().lookup(LookupName);
-      V = handleSRetFuncTypeMerge(V, Ty);
+      if (V && V->getType() != Ty)
+        V = handleSRetFuncTypeMerge(V, Ty);
+      assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type");
     }
     if (!V) 
       return 0;
@@ -866,14 +987,13 @@
     break;
   case ValID::NameVal:                  // Is it a named definition?
     Name = ID.Name;
-    if (Value *N = CurFun.CurrentFunction->
-                   getValueSymbolTable().lookup(Name)) {
+    if (Value *N = CurFun.CurrentFunction->getValueSymbolTable().lookup(Name)) {
       if (N->getType() != Type::LabelTy) {
         // Register names didn't use to conflict with basic block names
         // because of type planes. Now they all have to be unique. So, we just
         // rename the register and treat this name as if no basic block
         // had been found.
-        RenameMapKey Key = std::make_pair(N->getName(),N->getType());
+        RenameMapKey Key = makeRenameMapKey(ID.Name, N->getType(), ID.S);
         N->setName(makeNameUnique(N->getName()));
         CurModule.RenameMap[Key] = N->getName();
         BB = 0;
@@ -984,19 +1104,33 @@
   LateResolvers.clear();
 }
 
-// ResolveTypeTo - A brand new type was just declared.  This means that (if
-// name is not null) things referencing Name can be resolved.  Otherwise, things
-// refering to the number can be resolved.  Do this now.
-//
-static void ResolveTypeTo(char *Name, const Type *ToTy) {
+/// This function is used for type resolution and upref handling. When a type
+/// becomes concrete, this function is called to adjust the signedness for the
+/// concrete type.
+static void ResolveTypeSign(const Type* oldTy, const Signedness &Sign) {
+  std::string TyName = CurModule.CurrentModule->getTypeName(oldTy);
+  if (!TyName.empty())
+    CurModule.NamedTypeSigns[TyName] = Sign;
+}
+
+/// ResolveTypeTo - A brand new type was just declared.  This means that (if
+/// name is not null) things referencing Name can be resolved.  Otherwise, 
+/// things refering to the number can be resolved.  Do this now.
+static void ResolveTypeTo(char *Name, const Type *ToTy, const Signedness& Sign){
   ValID D;
-  if (Name) D = ValID::create(Name);
-  else      D = ValID::create((int)CurModule.Types.size());
+  if (Name)
+    D = ValID::create(Name);
+  else      
+    D = ValID::create((int)CurModule.Types.size());
+  D.S.copy(Sign);
+
+  CurModule.NamedTypeSigns[Name] = Sign;
 
   std::map<ValID, PATypeHolder>::iterator I =
     CurModule.LateResolveTypes.find(D);
   if (I != CurModule.LateResolveTypes.end()) {
-    ((DerivedType*)I->second.get())->refineAbstractTypeTo(ToTy);
+    const Type *OldTy = I->second.get();
+    ((DerivedType*)OldTy)->refineAbstractTypeTo(ToTy);
     CurModule.LateResolveTypes.erase(I);
   }
 }
@@ -1056,12 +1190,12 @@
 // null potentially, in which case this is a noop.  The string passed in is
 // assumed to be a malloc'd string buffer, and is free'd by this function.
 //
-static void setValueName(Value *V, char *NameStr) {
+static void setValueName(const ValueInfo &V, char *NameStr) {
   if (NameStr) {
     std::string Name(NameStr);      // Copy string
     free(NameStr);                  // Free old string
 
-    if (V->getType() == Type::VoidTy) {
+    if (V.V->getType() == Type::VoidTy) {
       error("Can't assign name '" + Name + "' to value with void type");
       return;
     }
@@ -1074,13 +1208,13 @@
     if (Existing) {
       // An existing value of the same name was found. This might have happened
       // because of the integer type planes collapsing in LLVM 2.0. 
-      if (Existing->getType() == V->getType() &&
+      if (Existing->getType() == V.V->getType() &&
           !TypeHasInteger(Existing->getType())) {
         // If the type does not contain any integers in them then this can't be
         // a type plane collapsing issue. It truly is a redefinition and we 
         // should error out as the assembly is invalid.
         error("Redefinition of value named '" + Name + "' of type '" +
-              V->getType()->getDescription() + "'");
+              V.V->getType()->getDescription() + "'");
         return;
       } 
       // In LLVM 2.0 we don't allow names to be re-used for any values in a 
@@ -1094,13 +1228,13 @@
       // We're changing the name but it will probably be used by other 
       // instructions as operands later on. Consequently we have to retain
       // a mapping of the renaming that we're doing.
-      RenameMapKey Key = std::make_pair(Name,V->getType());
+      RenameMapKey Key = makeRenameMapKey(Name, V.V->getType(), V.S);
       CurFun.RenameMap[Key] = NewName;
       Name = NewName;
     }
 
     // Set the name.
-    V->setName(Name);
+    V.V->setName(Name);
   }
 }
 
@@ -1109,7 +1243,8 @@
 static GlobalVariable *
 ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage,
                     bool isConstantGlobal, const Type *Ty,
-                    Constant *Initializer) {
+                    Constant *Initializer,
+                    const Signedness &Sign) {
   if (isa<FunctionType>(Ty))
     error("Cannot declare global vars of function type");
 
@@ -1129,6 +1264,7 @@
   } else {
     ID = ValID::create((int)CurModule.Values[PTy].size());
   }
+  ID.S.makeComposite(Sign);
 
   if (GlobalValue *FWGV = CurModule.GetForwardRefForGlobal(PTy, ID)) {
     // Move the global to the end of the list, from whereever it was
@@ -1154,13 +1290,7 @@
       // There is alread a global of the same name which means there is a
       // conflict. Let's see what we can do about it.
       std::string NewName(makeNameUnique(Name));
-      if (Linkage == GlobalValue::InternalLinkage) {
-        // The linkage type is internal so just warn about the rename without
-        // invoking "scarey language" about linkage failures. GVars with
-        // InternalLinkage can be renamed at will.
-        warning("Global variable '" + Name + "' was renamed to '"+ 
-                NewName + "'");
-      } else {
+      if (Linkage != GlobalValue::InternalLinkage) {
         // The linkage of this gval is external so we can't reliably rename 
         // it because it could potentially create a linking problem.  
         // However, we can't leave the name conflict in the output either or 
@@ -1171,7 +1301,7 @@
       }
 
       // Put the renaming in the global rename map
-      RenameMapKey Key = std::make_pair(Name,PointerType::get(Ty));
+      RenameMapKey Key = makeRenameMapKey(Name, PointerType::get(Ty), ID.S);
       CurModule.RenameMap[Key] = NewName;
 
       // Rename it
@@ -1184,6 +1314,8 @@
     new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name,
                        CurModule.CurrentModule);
   InsertValue(GV, CurModule.Values);
+  // Remember the sign of this global.
+  CurModule.NamedValueSigns[Name] = ID.S;
   return GV;
 }
 
@@ -1194,21 +1326,26 @@
 // This function returns true if the type has already been defined, but is
 // allowed to be redefined in the specified context.  If the name is a new name
 // for the type plane, it is inserted and false is returned.
-static bool setTypeName(const Type *T, char *NameStr) {
+static bool setTypeName(const PATypeInfo& TI, char *NameStr) {
   assert(!inFunctionScope() && "Can't give types function-local names");
   if (NameStr == 0) return false;
  
   std::string Name(NameStr);      // Copy string
   free(NameStr);                  // Free old string
 
+  const Type* Ty = TI.PAT->get();
+
   // We don't allow assigning names to void type
-  if (T == Type::VoidTy) {
+  if (Ty == Type::VoidTy) {
     error("Can't assign name '" + Name + "' to the void type");
     return false;
   }
 
   // Set the type name, checking for conflicts as we do so.
-  bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name, T);
+  bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name, Ty);
+
+  // Save the sign information for later use 
+  CurModule.NamedTypeSigns[Name] = TI.S;
 
   if (AlreadyExists) {   // Inserting a name that is already defined???
     const Type *Existing = CurModule.CurrentModule->getTypeByName(Name);
@@ -1218,7 +1355,7 @@
     // opaque type.  In this case, Existing will be an opaque type.
     if (const OpaqueType *OpTy = dyn_cast<OpaqueType>(Existing)) {
       // We ARE replacing an opaque type!
-      const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(T);
+      const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(Ty);
       return true;
     }
 
@@ -1226,11 +1363,11 @@
     // the redefinition is identical to the original. This will be so if
     // Existing and T point to the same Type object. In this one case we
     // allow the equivalent redefinition.
-    if (Existing == T) return true;  // Yes, it's equal.
+    if (Existing == Ty) return true;  // Yes, it's equal.
 
     // Any other kind of (non-equivalent) redefinition is an error.
     error("Redefinition of type named '" + Name + "' in the '" +
-          T->getDescription() + "' type plane");
+          Ty->getDescription() + "' type plane");
   }
 
   return false;
@@ -1262,7 +1399,7 @@
     OpaqueType *UpRefTy;
 
     UpRefRecord(unsigned NL, OpaqueType *URTy)
-      : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) {}
+      : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) { }
   };
 }
 
@@ -1276,7 +1413,7 @@
 /// count reaches zero, the upreferenced type is the type that is passed in:
 /// thus we can complete the cycle.
 ///
-static PATypeHolder HandleUpRefs(const Type *ty) {
+static PATypeHolder HandleUpRefs(const Type *ty, const Signedness& Sign) {
   // If Ty isn't abstract, or if there are no up-references in it, then there is
   // nothing to resolve here.
   if (!ty->isAbstract() || UpRefs.empty()) return ty;
@@ -1292,10 +1429,11 @@
   // this variable.
   OpaqueType *TypeToResolve = 0;
 
-  for (unsigned i = 0; i != UpRefs.size(); ++i) {
+  unsigned i = 0;
+  for (; i != UpRefs.size(); ++i) {
     UR_OUT("  UR#" << i << " - TypeContains(" << Ty->getDescription() << ", "
-           << UpRefs[i].second->getDescription() << ") = "
-           << (TypeContains(Ty, UpRefs[i].second) ? "true" : "false") << "\n");
+           << UpRefs[i].UpRefTy->getDescription() << ") = "
+           << (TypeContains(Ty, UpRefs[i].UpRefTy) ? "true" : "false") << "\n");
     if (TypeContains(Ty, UpRefs[i].LastContainedTy)) {
       // Decrement level of upreference
       unsigned Level = --UpRefs[i].NestingLevel;
@@ -1306,8 +1444,9 @@
           TypeToResolve = UpRefs[i].UpRefTy;
         } else {
           UR_OUT("  * Resolving upreference for "
-                 << UpRefs[i].second->getDescription() << "\n";
-                 std::string OldName = UpRefs[i].UpRefTy->getDescription());
+                 << UpRefs[i].UpRefTy->getDescription() << "\n";
+          std::string OldName = UpRefs[i].UpRefTy->getDescription());
+          ResolveTypeSign(UpRefs[i].UpRefTy, Sign);
           UpRefs[i].UpRefTy->refineAbstractTypeTo(TypeToResolve);
           UR_OUT("  * Type '" << OldName << "' refined upreference to: "
                  << (const void*)Ty << ", " << Ty->getDescription() << "\n");
@@ -1320,14 +1459,113 @@
 
   if (TypeToResolve) {
     UR_OUT("  * Resolving upreference for "
-           << UpRefs[i].second->getDescription() << "\n";
+           << UpRefs[i].UpRefTy->getDescription() << "\n";
            std::string OldName = TypeToResolve->getDescription());
+    ResolveTypeSign(TypeToResolve, Sign);
     TypeToResolve->refineAbstractTypeTo(Ty);
   }
 
   return Ty;
 }
 
+bool Signedness::operator<(const Signedness &that) const {
+  if (isNamed()) {
+    if (that.isNamed()) 
+      return *(this->name) < *(that.name);
+    else
+      return CurModule.NamedTypeSigns[*name] < that;
+  } else if (that.isNamed()) {
+    return *this < CurModule.NamedTypeSigns[*that.name];
+  }
+
+  if (isComposite() && that.isComposite()) {
+    if (sv->size() == that.sv->size()) {
+      SignVector::const_iterator thisI = sv->begin(), thisE = sv->end();
+      SignVector::const_iterator thatI = that.sv->begin(), 
+                                 thatE = that.sv->end();
+      for (; thisI != thisE; ++thisI, ++thatI) {
+        if (*thisI < *thatI)
+          return true;
+        else if (!(*thisI == *thatI))
+          return false;
+      }
+      return false;
+    }
+    return sv->size() < that.sv->size();
+  }  
+  return kind < that.kind;
+}
+
+bool Signedness::operator==(const Signedness &that) const {
+  if (isNamed())
+    if (that.isNamed())
+      return *(this->name) == *(that.name);
+    else 
+      return CurModule.NamedTypeSigns[*(this->name)] == that;
+  else if (that.isNamed())
+    return *this == CurModule.NamedTypeSigns[*(that.name)];
+  if (isComposite() && that.isComposite()) {
+    if (sv->size() == that.sv->size()) {
+      SignVector::const_iterator thisI = sv->begin(), thisE = sv->end();
+      SignVector::const_iterator thatI = that.sv->begin(), 
+                                 thatE = that.sv->end();
+      for (; thisI != thisE; ++thisI, ++thatI) {
+        if (!(*thisI == *thatI))
+          return false;
+      }
+      return true;
+    }
+    return false;
+  }
+  return kind == that.kind;
+}
+
+void Signedness::copy(const Signedness &that) {
+  if (that.isNamed()) {
+    kind = Named;
+    name = new std::string(*that.name);
+  } else if (that.isComposite()) {
+    kind = Composite;
+    sv = new SignVector();
+    *sv = *that.sv;
+  } else {
+    kind = that.kind;
+    sv = 0;
+  }
+}
+
+void Signedness::destroy() {
+  if (isNamed()) {
+    delete name;
+  } else if (isComposite()) {
+    delete sv;
+  } 
+}
+
+void Signedness::dump() const {
+  if (isComposite()) {
+    if (sv->size() == 1) {
+      (*sv)[0].dump();
+      std::cerr << "*";
+    } else {
+      std::cerr << "{ " ;
+      for (unsigned i = 0; i < sv->size(); ++i) {
+        if (i != 0)
+          std::cerr << ", ";
+        (*sv)[i].dump();
+      }
+      std::cerr << "} " ;
+    }
+  } else if (isNamed()) {
+    std::cerr << *name;
+  } else if (isSigned()) {
+    std::cerr << "S";
+  } else if (isUnsigned()) {
+    std::cerr << "U";
+  } else
+    std::cerr << ".";
+}
+
 static inline Instruction::TermOps 
 getTermOp(TermOps op) {
   switch (op) {
@@ -1342,7 +1580,7 @@
 }
 
 static inline Instruction::BinaryOps 
-getBinaryOp(BinaryOps op, const Type *Ty, Signedness Sign) {
+getBinaryOp(BinaryOps op, const Type *Ty, const Signedness& Sign) {
   switch (op) {
     default     : assert(0 && "Invalid OldBinaryOps");
     case SetEQ  : 
@@ -1363,7 +1601,7 @@
         isFP = PTy->getElementType()->isFloatingPoint();
       if (isFP)
         return Instruction::FDiv;
-      else if (Sign == Signed)
+      else if (Sign.isSigned())
         return Instruction::SDiv;
       return Instruction::UDiv;
     }
@@ -1380,7 +1618,7 @@
       // Select correct opcode
       if (isFP)
         return Instruction::FRem;
-      else if (Sign == Signed)
+      else if (Sign.isSigned())
         return Instruction::SRem;
       return Instruction::URem;
     }
@@ -1391,7 +1629,7 @@
     case AShrOp : return Instruction::AShr;
     case ShlOp  : return Instruction::Shl;
     case ShrOp  : 
-      if (Sign == Signed)
+      if (Sign.isSigned())
         return Instruction::AShr;
       return Instruction::LShr;
     case AndOp  : return Instruction::And;
@@ -1402,8 +1640,8 @@
 
 static inline Instruction::OtherOps 
 getCompareOp(BinaryOps op, unsigned short &predicate, const Type* &Ty,
-             Signedness Sign) {
-  bool isSigned = Sign == Signed;
+             const Signedness &Sign) {
+  bool isSigned = Sign.isSigned();
   bool isFP = Ty->isFloatingPoint();
   switch (op) {
     default     : assert(0 && "Invalid OldSetCC");
@@ -1483,7 +1721,7 @@
 }
 
 static inline Instruction::OtherOps 
-getOtherOp(OtherOps op, Signedness Sign) {
+getOtherOp(OtherOps op, const Signedness &Sign) {
   switch (op) {
     default               : assert(0 && "Invalid OldOtherOps");
     case PHIOp            : return Instruction::PHI;
@@ -1501,8 +1739,8 @@
 }
 
 static inline Value*
-getCast(CastOps op, Value *Src, Signedness SrcSign, const Type *DstTy, 
-        Signedness DstSign, bool ForceInstruction = false) {
+getCast(CastOps op, Value *Src, const Signedness &SrcSign, const Type *DstTy, 
+        const Signedness &DstSign, bool ForceInstruction = false) {
   Instruction::CastOps Opcode;
   const Type* SrcTy = Src->getType();
   if (op == CastOp) {
@@ -1539,7 +1777,8 @@
     }
     // Determine the opcode to use by calling CastInst::getCastOpcode
     Opcode = 
-      CastInst::getCastOpcode(Src, SrcSign == Signed, DstTy, DstSign == Signed);
+      CastInst::getCastOpcode(Src, SrcSign.isSigned(), DstTy, 
+                              DstSign.isSigned());
 
   } else switch (op) {
     default: assert(0 && "Invalid cast token");
@@ -1631,7 +1870,7 @@
       // all indices for SequentialType elements. We must retain the same 
       // semantic (zext) for unsigned types.
       if (const IntegerType *Ity = dyn_cast<IntegerType>(Index->getType()))
-        if (Ity->getBitWidth() < 64 && (*Indices)[i].S == Unsigned) {
+        if (Ity->getBitWidth() < 64 && (*Indices)[i].S.isUnsigned()) {
           if (CIndices)
             Index = ConstantExpr::getCast(Instruction::ZExt, 
               cast<Constant>(Index), Type::Int64Ty);
@@ -1830,13 +2069,13 @@
 #endif
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 1454 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1693 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   std::pair<llvm::PATypeInfo, char*>     *ArgVal;
   llvm::BasicBlock                       *BasicBlockVal;
-  llvm::TerminatorInst                   *TermInstVal;
+  llvm::TermInstInfo                     TermInstVal;
   llvm::InstrInfo                        InstVal;
   llvm::ConstInfo                        ConstVal;
   llvm::ValueInfo                        ValueVal;
@@ -1873,7 +2112,7 @@
   llvm::Module::Endianness          Endianness;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 1877 "UpgradeParser.tab.c"
+#line 2116 "UpgradeParser.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -1885,7 +2124,7 @@
 
 
 /* Line 219 of yacc.c.  */
-#line 1889 "UpgradeParser.tab.c"
+#line 2128 "UpgradeParser.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -2244,37 +2483,37 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const unsigned short int yyrline[] =
 {
-       0,  1594,  1594,  1595,  1603,  1604,  1614,  1614,  1614,  1614,
-    1614,  1614,  1614,  1614,  1614,  1614,  1614,  1618,  1618,  1618,
-    1622,  1622,  1622,  1622,  1622,  1622,  1626,  1626,  1627,  1627,
-    1628,  1628,  1629,  1629,  1630,  1630,  1634,  1634,  1635,  1635,
-    1636,  1636,  1637,  1637,  1638,  1638,  1639,  1639,  1640,  1640,
-    1641,  1642,  1645,  1645,  1645,  1645,  1649,  1649,  1649,  1649,
-    1649,  1649,  1649,  1650,  1650,  1650,  1650,  1650,  1650,  1656,
-    1656,  1656,  1656,  1660,  1660,  1660,  1660,  1664,  1664,  1668,
-    1668,  1673,  1676,  1681,  1682,  1683,  1684,  1685,  1686,  1687,
-    1688,  1692,  1693,  1694,  1695,  1696,  1697,  1698,  1699,  1709,
-    1710,  1718,  1719,  1727,  1736,  1737,  1744,  1745,  1749,  1753,
-    1769,  1770,  1777,  1778,  1785,  1793,  1793,  1793,  1793,  1793,
-    1793,  1793,  1794,  1794,  1794,  1794,  1794,  1799,  1803,  1807,
-    1812,  1821,  1838,  1844,  1857,  1866,  1870,  1881,  1885,  1898,
-    1902,  1909,  1910,  1916,  1923,  1935,  1965,  1978,  2001,  2029,
-    2051,  2062,  2084,  2095,  2104,  2109,  2167,  2174,  2182,  2189,
-    2196,  2200,  2204,  2213,  2228,  2241,  2250,  2278,  2291,  2300,
-    2306,  2312,  2323,  2329,  2335,  2346,  2347,  2356,  2357,  2369,
-    2378,  2379,  2380,  2381,  2382,  2398,  2418,  2420,  2422,  2422,
-    2429,  2429,  2436,  2436,  2443,  2443,  2451,  2453,  2455,  2460,
-    2474,  2475,  2479,  2482,  2490,  2494,  2501,  2505,  2509,  2513,
-    2521,  2521,  2525,  2526,  2530,  2538,  2543,  2551,  2552,  2559,
-    2566,  2570,  2746,  2746,  2750,  2760,  2760,  2764,  2769,  2770,
-    2771,  2775,  2776,  2775,  2788,  2789,  2794,  2795,  2796,  2797,
-    2798,  2799,  2800,  2801,  2802,  2823,  2826,  2841,  2842,  2847,
-    2847,  2855,  2864,  2867,  2876,  2886,  2891,  2900,  2911,  2911,
-    2914,  2917,  2920,  2924,  2930,  2945,  2951,  3007,  3010,  3016,
-    3026,  3039,  3068,  3076,  3084,  3088,  3095,  3096,  3100,  3103,
-    3109,  3126,  3142,  3156,  3168,  3180,  3191,  3209,  3218,  3227,
-    3234,  3255,  3279,  3285,  3291,  3297,  3313,  3391,  3399,  3400,
-    3404,  3405,  3409,  3415,  3421,  3427,  3433,  3440,  3452,  3477
+       0,  1833,  1833,  1834,  1842,  1843,  1853,  1853,  1853,  1853,
+    1853,  1853,  1853,  1853,  1853,  1853,  1853,  1857,  1857,  1857,
+    1861,  1861,  1861,  1861,  1861,  1861,  1865,  1865,  1866,  1866,
+    1867,  1867,  1868,  1868,  1869,  1869,  1873,  1873,  1874,  1874,
+    1875,  1875,  1876,  1876,  1877,  1877,  1878,  1878,  1879,  1879,
+    1880,  1881,  1884,  1884,  1884,  1884,  1888,  1888,  1888,  1888,
+    1888,  1888,  1888,  1889,  1889,  1889,  1889,  1889,  1889,  1895,
+    1895,  1895,  1895,  1899,  1899,  1899,  1899,  1903,  1903,  1907,
+    1907,  1912,  1915,  1920,  1921,  1922,  1923,  1924,  1925,  1926,
+    1927,  1931,  1932,  1933,  1934,  1935,  1936,  1937,  1938,  1948,
+    1949,  1957,  1958,  1966,  1975,  1976,  1983,  1984,  1988,  1992,
+    2008,  2009,  2016,  2017,  2024,  2032,  2032,  2032,  2032,  2032,
+    2032,  2032,  2033,  2033,  2033,  2033,  2033,  2038,  2042,  2046,
+    2051,  2060,  2078,  2084,  2097,  2108,  2112,  2125,  2129,  2143,
+    2147,  2154,  2155,  2161,  2168,  2180,  2210,  2223,  2246,  2274,
+    2296,  2307,  2329,  2340,  2349,  2354,  2413,  2420,  2428,  2435,
+    2442,  2446,  2450,  2459,  2474,  2487,  2496,  2524,  2537,  2546,
+    2552,  2558,  2569,  2575,  2581,  2592,  2593,  2602,  2603,  2615,
+    2624,  2625,  2626,  2627,  2628,  2644,  2664,  2666,  2668,  2668,
+    2675,  2675,  2683,  2683,  2691,  2691,  2700,  2702,  2704,  2709,
+    2723,  2724,  2728,  2731,  2739,  2743,  2750,  2754,  2758,  2762,
+    2770,  2770,  2774,  2775,  2779,  2787,  2792,  2800,  2801,  2808,
+    2815,  2819,  3004,  3004,  3008,  3018,  3018,  3022,  3027,  3028,
+    3029,  3033,  3034,  3033,  3046,  3047,  3052,  3053,  3054,  3055,
+    3059,  3063,  3064,  3065,  3066,  3087,  3091,  3105,  3106,  3111,
+    3111,  3119,  3129,  3132,  3141,  3152,  3157,  3166,  3177,  3177,
+    3180,  3184,  3188,  3193,  3203,  3221,  3230,  3295,  3299,  3306,
+    3318,  3333,  3363,  3373,  3383,  3387,  3394,  3395,  3399,  3402,
+    3408,  3427,  3445,  3461,  3475,  3489,  3500,  3518,  3527,  3536,
+    3543,  3564,  3588,  3594,  3600,  3606,  3622,  3706,  3714,  3715,
+    3719,  3720,  3724,  3730,  3737,  3743,  3750,  3757,  3770,  3796
 };
 #endif
 
@@ -3686,7 +3925,7 @@
   switch (yyn)
     {
         case 3:
-#line 1595 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1834 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if ((yyvsp[0].UIntVal) > (uint32_t)INT32_MAX)     // Outside of my range!
       error("Value too large for type");
@@ -3695,7 +3934,7 @@
     break;
 
   case 5:
-#line 1604 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1843 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if ((yyvsp[0].UInt64Val) > (uint64_t)INT64_MAX)     // Outside of my range!
       error("Value too large for type");
@@ -3704,226 +3943,226 @@
     break;
 
   case 26:
-#line 1626 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1865 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.IPred) = ICmpInst::ICMP_EQ; ;}
     break;
 
   case 27:
-#line 1626 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1865 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.IPred) = ICmpInst::ICMP_NE; ;}
     break;
 
   case 28:
-#line 1627 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1866 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.IPred) = ICmpInst::ICMP_SLT; ;}
     break;
 
   case 29:
-#line 1627 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1866 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.IPred) = ICmpInst::ICMP_SGT; ;}
     break;
 
   case 30:
-#line 1628 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1867 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.IPred) = ICmpInst::ICMP_SLE; ;}
     break;
 
   case 31:
-#line 1628 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1867 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.IPred) = ICmpInst::ICMP_SGE; ;}
     break;
 
   case 32:
-#line 1629 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1868 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.IPred) = ICmpInst::ICMP_ULT; ;}
     break;
 
   case 33:
-#line 1629 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1868 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.IPred) = ICmpInst::ICMP_UGT; ;}
     break;
 
   case 34:
-#line 1630 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1869 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.IPred) = ICmpInst::ICMP_ULE; ;}
     break;
 
   case 35:
-#line 1630 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1869 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.IPred) = ICmpInst::ICMP_UGE; ;}
     break;
 
   case 36:
-#line 1634 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1873 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_OEQ; ;}
     break;
 
   case 37:
-#line 1634 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1873 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_ONE; ;}
     break;
 
   case 38:
-#line 1635 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1874 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_OLT; ;}
     break;
 
   case 39:
-#line 1635 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1874 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_OGT; ;}
     break;
 
   case 40:
-#line 1636 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1875 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_OLE; ;}
     break;
 
   case 41:
-#line 1636 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1875 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_OGE; ;}
     break;
 
   case 42:
-#line 1637 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1876 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_ORD; ;}
     break;
 
   case 43:
-#line 1637 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1876 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_UNO; ;}
     break;
 
   case 44:
-#line 1638 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1877 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_UEQ; ;}
     break;
 
   case 45:
-#line 1638 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1877 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_UNE; ;}
     break;
 
   case 46:
-#line 1639 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1878 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_ULT; ;}
     break;
 
   case 47:
-#line 1639 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1878 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_UGT; ;}
     break;
 
   case 48:
-#line 1640 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1879 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_ULE; ;}
     break;
 
   case 49:
-#line 1640 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1879 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_UGE; ;}
     break;
 
   case 50:
-#line 1641 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1880 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_TRUE; ;}
     break;
 
   case 51:
-#line 1642 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1881 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.FPred) = FCmpInst::FCMP_FALSE; ;}
     break;
 
   case 81:
-#line 1673 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1912 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.StrVal) = (yyvsp[-1].StrVal);
   ;}
     break;
 
   case 82:
-#line 1676 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1915 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.StrVal) = 0;
   ;}
     break;
 
   case 83:
-#line 1681 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1920 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
     break;
 
   case 84:
-#line 1682 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1921 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
     break;
 
   case 85:
-#line 1683 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1922 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
     break;
 
   case 86:
-#line 1684 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1923 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
     break;
 
   case 87:
-#line 1685 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1924 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 88:
-#line 1686 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1925 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
     break;
 
   case 89:
-#line 1687 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1926 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 90:
-#line 1688 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1927 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 91:
-#line 1692 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1931 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.UIntVal) = OldCallingConv::C; ;}
     break;
 
   case 92:
-#line 1693 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1932 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.UIntVal) = OldCallingConv::C; ;}
     break;
 
   case 93:
-#line 1694 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1933 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.UIntVal) = OldCallingConv::CSRet; ;}
     break;
 
   case 94:
-#line 1695 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1934 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.UIntVal) = OldCallingConv::Fast; ;}
     break;
 
   case 95:
-#line 1696 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1935 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.UIntVal) = OldCallingConv::Cold; ;}
     break;
 
   case 96:
-#line 1697 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1936 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.UIntVal) = OldCallingConv::X86_StdCall; ;}
     break;
 
   case 97:
-#line 1698 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1937 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.UIntVal) = OldCallingConv::X86_FastCall; ;}
     break;
 
   case 98:
-#line 1699 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1938 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
       error("Calling conv too large");
@@ -3932,12 +4171,12 @@
     break;
 
   case 99:
-#line 1709 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1948 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 100:
-#line 1710 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1949 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.UIntVal) = (yyvsp[0].UInt64Val);
     if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3946,12 +4185,12 @@
     break;
 
   case 101:
-#line 1718 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1957 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
   case 102:
-#line 1719 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1958 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.UIntVal) = (yyvsp[0].UInt64Val);
     if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3960,7 +4199,7 @@
     break;
 
   case 103:
-#line 1727 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1966 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     for (unsigned i = 0, e = strlen((yyvsp[0].StrVal)); i != e; ++i)
       if ((yyvsp[0].StrVal)[i] == '"' || (yyvsp[0].StrVal)[i] == '\\')
@@ -3970,27 +4209,27 @@
     break;
 
   case 104:
-#line 1736 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1975 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 105:
-#line 1737 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1976 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
     break;
 
   case 106:
-#line 1744 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1983 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {;}
     break;
 
   case 107:
-#line 1745 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1984 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {;}
     break;
 
   case 108:
-#line 1749 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1988 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     CurGV->setSection((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -3998,7 +4237,7 @@
     break;
 
   case 109:
-#line 1753 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1992 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val)))
       error("Alignment must be a power of two");
@@ -4008,23 +4247,23 @@
     break;
 
   case 111:
-#line 1770 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2009 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[0].PrimType).T); 
-    (yyval.TypeVal).S = Signless;
+    (yyval.TypeVal).S.makeSignless();
   ;}
     break;
 
   case 113:
-#line 1778 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2017 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[0].PrimType).T); 
-    (yyval.TypeVal).S = Signless;
+    (yyval.TypeVal).S.makeSignless();
   ;}
     break;
 
   case 114:
-#line 1785 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2024 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!UpRefs.empty())
       error("Invalid upreference in type: " + (*(yyvsp[0].TypeVal).PAT)->getDescription());
@@ -4033,50 +4272,52 @@
     break;
 
   case 127:
-#line 1799 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2038 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[0].PrimType).T);
-    (yyval.TypeVal).S = (yyvsp[0].PrimType).S;
+    (yyval.TypeVal).S.copy((yyvsp[0].PrimType).S);
   ;}
     break;
 
   case 128:
-#line 1803 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2042 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.TypeVal).PAT = new PATypeHolder(OpaqueType::get());
-    (yyval.TypeVal).S = Signless;
+    (yyval.TypeVal).S.makeSignless();
   ;}
     break;
 
   case 129:
-#line 1807 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2046 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {            // Named types are also simple types...
+    (yyval.TypeVal).S.copy(getTypeSign((yyvsp[0].ValIDVal)));
     const Type* tmp = getType((yyvsp[0].ValIDVal));
     (yyval.TypeVal).PAT = new PATypeHolder(tmp);
-    (yyval.TypeVal).S = Signless; // FIXME: what if its signed?
   ;}
     break;
 
   case 130:
-#line 1812 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2051 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                   // Type UpReference
     if ((yyvsp[0].UInt64Val) > (uint64_t)~0U) 
       error("Value out of range");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
     UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[0].UInt64Val), OT));  // Add to vector...
     (yyval.TypeVal).PAT = new PATypeHolder(OT);
-    (yyval.TypeVal).S = Signless;
+    (yyval.TypeVal).S.makeSignless();
     UR_OUT("New Upreference!\n");
   ;}
     break;
 
   case 131:
-#line 1821 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2060 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {           // Function derived type?
+    (yyval.TypeVal).S.makeComposite((yyvsp[-3].TypeVal).S);
     std::vector<const Type*> Params;
     for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[-1].TypeList)->begin(),
            E = (yyvsp[-1].TypeList)->end(); I != E; ++I) {
       Params.push_back(I->PAT->get());
+      (yyval.TypeVal).S.add(I->S);
     }
     FunctionType::ParamAttrsList ParamAttrs;
     bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
@@ -4084,97 +4325,101 @@
 
     (yyval.TypeVal).PAT = new PATypeHolder(
       HandleUpRefs(FunctionType::get((yyvsp[-3].TypeVal).PAT->get(), Params, isVarArg, 
-                   ParamAttrs)));
-    (yyval.TypeVal).S = (yyvsp[-3].TypeVal).S;
-    delete (yyvsp[-3].TypeVal).PAT;    // Delete the return type handle
+                   ParamAttrs), (yyval.TypeVal).S));
+    delete (yyvsp[-3].TypeVal).PAT;  // Delete the return type handle
     delete (yyvsp[-1].TypeList);      // Delete the argument list
   ;}
     break;
 
   case 132:
-#line 1838 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2078 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {          // Sized array type?
+    (yyval.TypeVal).S.makeComposite((yyvsp[-1].TypeVal).S);
     (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(ArrayType::get((yyvsp[-1].TypeVal).PAT->get(), 
-                                                        (unsigned)(yyvsp[-3].UInt64Val))));
-    (yyval.TypeVal).S = (yyvsp[-1].TypeVal).S;
+                                           (unsigned)(yyvsp[-3].UInt64Val)), (yyval.TypeVal).S));
     delete (yyvsp[-1].TypeVal).PAT;
   ;}
     break;
 
   case 133:
-#line 1844 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2084 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {          // Vector type?
-     const llvm::Type* ElemTy = (yyvsp[-1].TypeVal).PAT->get();
-     if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
-        error("Unsigned result not equal to signed result");
-     if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
-        error("Elements of a VectorType must be integer or floating point");
-     if (!isPowerOf2_32((yyvsp[-3].UInt64Val)))
-       error("VectorType length should be a power of 2");
-     (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy, 
-                                          (unsigned)(yyvsp[-3].UInt64Val))));
-     (yyval.TypeVal).S = (yyvsp[-1].TypeVal).S;
-     delete (yyvsp[-1].TypeVal).PAT;
+    const llvm::Type* ElemTy = (yyvsp[-1].TypeVal).PAT->get();
+    if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
+       error("Unsigned result not equal to signed result");
+    if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
+       error("Elements of a VectorType must be integer or floating point");
+    if (!isPowerOf2_32((yyvsp[-3].UInt64Val)))
+      error("VectorType length should be a power of 2");
+    (yyval.TypeVal).S.makeComposite((yyvsp[-1].TypeVal).S);
+    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy, 
+                                         (unsigned)(yyvsp[-3].UInt64Val)), (yyval.TypeVal).S));
+    delete (yyvsp[-1].TypeVal).PAT;
   ;}
     break;
 
   case 134:
-#line 1857 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2097 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
+    (yyval.TypeVal).S.makeComposite();
     for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[-1].TypeList)->begin(),
-           E = (yyvsp[-1].TypeList)->end(); I != E; ++I)
+           E = (yyvsp[-1].TypeList)->end(); I != E; ++I) {
       Elements.push_back(I->PAT->get());
-    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
-    (yyval.TypeVal).S = Signless;
+      (yyval.TypeVal).S.add(I->S);
+    }
+    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements), (yyval.TypeVal).S));
     delete (yyvsp[-1].TypeList);
   ;}
     break;
 
   case 135:
-#line 1866 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2108 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal).PAT = new PATypeHolder(StructType::get(std::vector<const Type*>()));
-    (yyval.TypeVal).S = Signless;
+    (yyval.TypeVal).S.makeComposite();
   ;}
     break;
 
   case 136:
-#line 1870 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2112 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                // Packed Structure type?
+    (yyval.TypeVal).S.makeComposite();
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp[-2].TypeList)->begin(),
            E = (yyvsp[-2].TypeList)->end(); I != E; ++I) {
       Elements.push_back(I->PAT->get());
+      (yyval.TypeVal).S.add(I->S);
       delete I->PAT;
     }
-    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true)));
-    (yyval.TypeVal).S = Signless;
+    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true), 
+                                           (yyval.TypeVal).S));
     delete (yyvsp[-2].TypeList);
   ;}
     break;
 
   case 137:
-#line 1881 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2125 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                          // Empty packed structure type?
     (yyval.TypeVal).PAT = new PATypeHolder(StructType::get(std::vector<const Type*>(),true));
-    (yyval.TypeVal).S = Signless;
+    (yyval.TypeVal).S.makeComposite();
   ;}
     break;
 
   case 138:
-#line 1885 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2129 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                             // Pointer type?
     if ((yyvsp[-1].TypeVal).PAT->get() == Type::LabelTy)
       error("Cannot form a pointer to a basic block");
-    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(PointerType::get((yyvsp[-1].TypeVal).PAT->get())));
-    (yyval.TypeVal).S = (yyvsp[-1].TypeVal).S;
+    (yyval.TypeVal).S.makeComposite((yyvsp[-1].TypeVal).S);
+    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs(PointerType::get((yyvsp[-1].TypeVal).PAT->get()),
+                                           (yyval.TypeVal).S));
     delete (yyvsp[-1].TypeVal).PAT;
   ;}
     break;
 
   case 139:
-#line 1898 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2143 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeInfo>();
     (yyval.TypeList)->push_back((yyvsp[0].TypeVal)); 
@@ -4182,42 +4427,42 @@
     break;
 
   case 140:
-#line 1902 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2147 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back((yyvsp[0].TypeVal));
   ;}
     break;
 
   case 142:
-#line 1910 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2155 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
-    VoidTI.S = Signless;
+    VoidTI.S.makeSignless();
     ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(VoidTI);
   ;}
     break;
 
   case 143:
-#line 1916 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2161 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeInfo>();
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
-    VoidTI.S = Signless;
+    VoidTI.S.makeSignless();
     (yyval.TypeList)->push_back(VoidTI);
   ;}
     break;
 
   case 144:
-#line 1923 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2168 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeInfo>();
   ;}
     break;
 
   case 145:
-#line 1935 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized arr
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-3].TypeVal).PAT->get());
     if (ATy == 0)
@@ -4244,14 +4489,14 @@
       Elems.push_back(C);
     }
     (yyval.ConstVal).C = ConstantArray::get(ATy, Elems);
-    (yyval.ConstVal).S = (yyvsp[-3].TypeVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-3].TypeVal).S);
     delete (yyvsp[-3].TypeVal).PAT; 
     delete (yyvsp[-1].ConstVector);
   ;}
     break;
 
   case 146:
-#line 1965 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2210 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal).PAT->get());
     if (ATy == 0)
@@ -4262,13 +4507,13 @@
       error("Type mismatch: constant sized array initialized with 0"
             " arguments, but has size of " + itostr(NumElements) +"");
     (yyval.ConstVal).C = ConstantArray::get(ATy, std::vector<Constant*>());
-    (yyval.ConstVal).S = (yyvsp[-2].TypeVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-2].TypeVal).S);
     delete (yyvsp[-2].TypeVal).PAT;
   ;}
     break;
 
   case 147:
-#line 1978 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp[-2].TypeVal).PAT->get());
     if (ATy == 0)
@@ -4289,13 +4534,13 @@
       Vals.push_back(ConstantInt::get(ETy, *C));
     free((yyvsp[0].StrVal));
     (yyval.ConstVal).C = ConstantArray::get(ATy, Vals);
-    (yyval.ConstVal).S = (yyvsp[-2].TypeVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-2].TypeVal).S);
     delete (yyvsp[-2].TypeVal).PAT;
   ;}
     break;
 
   case 148:
-#line 2001 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized arr
     const VectorType *PTy = dyn_cast<VectorType>((yyvsp[-3].TypeVal).PAT->get());
     if (PTy == 0)
@@ -4320,14 +4565,14 @@
       Elems.push_back(C);
     }
     (yyval.ConstVal).C = ConstantVector::get(PTy, Elems);
-    (yyval.ConstVal).S = (yyvsp[-3].TypeVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-3].TypeVal).S);
     delete (yyvsp[-3].TypeVal).PAT;
     delete (yyvsp[-1].ConstVector);
   ;}
     break;
 
   case 149:
-#line 2029 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2274 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal).PAT->get());
     if (STy == 0)
@@ -4346,14 +4591,14 @@
       Fields.push_back(C);
     }
     (yyval.ConstVal).C = ConstantStruct::get(STy, Fields);
-    (yyval.ConstVal).S = (yyvsp[-3].TypeVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-3].TypeVal).S);
     delete (yyvsp[-3].TypeVal).PAT;
     delete (yyvsp[-1].ConstVector);
   ;}
     break;
 
   case 150:
-#line 2051 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2296 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-2].TypeVal).PAT->get());
     if (STy == 0)
@@ -4362,13 +4607,13 @@
     if (STy->getNumContainedTypes() != 0)
       error("Illegal number of initializers for structure type");
     (yyval.ConstVal).C = ConstantStruct::get(STy, std::vector<Constant*>());
-    (yyval.ConstVal).S = (yyvsp[-2].TypeVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-2].TypeVal).S);
     delete (yyvsp[-2].TypeVal).PAT;
   ;}
     break;
 
   case 151:
-#line 2062 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2307 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-5].TypeVal).PAT->get());
     if (STy == 0)
@@ -4387,14 +4632,14 @@
       Fields.push_back(C);
     }
     (yyval.ConstVal).C = ConstantStruct::get(STy, Fields);
-    (yyval.ConstVal).S = (yyvsp[-5].TypeVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-5].TypeVal).S);
     delete (yyvsp[-5].TypeVal).PAT; 
     delete (yyvsp[-2].ConstVector);
   ;}
     break;
 
   case 152:
-#line 2084 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2329 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-4].TypeVal).PAT->get());
     if (STy == 0)
@@ -4403,35 +4648,35 @@
     if (STy->getNumContainedTypes() != 0)
       error("Illegal number of initializers for packed structure type");
     (yyval.ConstVal).C = ConstantStruct::get(STy, std::vector<Constant*>());
-    (yyval.ConstVal).S = (yyvsp[-4].TypeVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-4].TypeVal).S);
     delete (yyvsp[-4].TypeVal).PAT;
   ;}
     break;
 
   case 153:
-#line 2095 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2340 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal).PAT->get());
     if (PTy == 0)
       error("Cannot make null pointer constant with type: '" + 
             (yyvsp[-1].TypeVal).PAT->get()->getDescription() + "'");
     (yyval.ConstVal).C = ConstantPointerNull::get(PTy);
-    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
     delete (yyvsp[-1].TypeVal).PAT;
   ;}
     break;
 
   case 154:
-#line 2104 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2349 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.ConstVal).C = UndefValue::get((yyvsp[-1].TypeVal).PAT->get());
-    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
     delete (yyvsp[-1].TypeVal).PAT;
   ;}
     break;
 
   case 155:
-#line 2109 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2354 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const PointerType *Ty = dyn_cast<PointerType>((yyvsp[-1].TypeVal).PAT->get());
     if (Ty == 0)
@@ -4447,6 +4692,7 @@
     //
     Function *SavedCurFn = CurFun.CurrentFunction;
     CurFun.CurrentFunction = 0;
+    (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
     Value *V = getExistingValue(Ty, (yyvsp[0].ValIDVal));
     CurFun.CurrentFunction = SavedCurFn;
 
@@ -4487,89 +4733,89 @@
       }
     }
     (yyval.ConstVal).C = cast<GlobalValue>(V);
-    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
     delete (yyvsp[-1].TypeVal).PAT;            // Free the type handle
   ;}
     break;
 
   case 156:
-#line 2167 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2413 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if ((yyvsp[-1].TypeVal).PAT->get() != (yyvsp[0].ConstVal).C->getType())
       error("Mismatched types for constant expression");
     (yyval.ConstVal) = (yyvsp[0].ConstVal);
-    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
     delete (yyvsp[-1].TypeVal).PAT;
   ;}
     break;
 
   case 157:
-#line 2174 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2420 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
       error("Cannot create a null initialized value of this type");
     (yyval.ConstVal).C = Constant::getNullValue(Ty);
-    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
     delete (yyvsp[-1].TypeVal).PAT;
   ;}
     break;
 
   case 158:
-#line 2182 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2428 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {      // integral constants
     const Type *Ty = (yyvsp[-1].PrimType).T;
     if (!ConstantInt::isValueValidForType(Ty, (yyvsp[0].SInt64Val)))
       error("Constant value doesn't fit in type");
     (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[0].SInt64Val));
-    (yyval.ConstVal).S = Signed;
+    (yyval.ConstVal).S.makeSigned();
   ;}
     break;
 
   case 159:
-#line 2189 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2435 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {            // integral constants
     const Type *Ty = (yyvsp[-1].PrimType).T;
     if (!ConstantInt::isValueValidForType(Ty, (yyvsp[0].UInt64Val)))
       error("Constant value doesn't fit in type");
     (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[0].UInt64Val));
-    (yyval.ConstVal).S = Unsigned;
+    (yyval.ConstVal).S.makeUnsigned();
   ;}
     break;
 
   case 160:
-#line 2196 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2442 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                      // Boolean constants
     (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, true);
-    (yyval.ConstVal).S = Unsigned;
+    (yyval.ConstVal).S.makeUnsigned();
   ;}
     break;
 
   case 161:
-#line 2200 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2446 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                     // Boolean constants
     (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, false);
-    (yyval.ConstVal).S = Unsigned;
+    (yyval.ConstVal).S.makeUnsigned();
   ;}
     break;
 
   case 162:
-#line 2204 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2450 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                   // Float & Double constants
     if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType).T, (yyvsp[0].FPVal)))
       error("Floating point constant invalid for type");
     (yyval.ConstVal).C = ConstantFP::get((yyvsp[-1].PrimType).T, (yyvsp[0].FPVal));
-    (yyval.ConstVal).S = Signless;
+    (yyval.ConstVal).S.makeSignless();
   ;}
     break;
 
   case 163:
-#line 2213 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2459 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type* SrcTy = (yyvsp[-3].ConstVal).C->getType();
     const Type* DstTy = (yyvsp[-1].TypeVal).PAT->get();
-    Signedness SrcSign = (yyvsp[-3].ConstVal).S;
-    Signedness DstSign = (yyvsp[-1].TypeVal).S;
+    Signedness SrcSign((yyvsp[-3].ConstVal).S);
+    Signedness DstSign((yyvsp[-1].TypeVal).S);
     if (!SrcTy->isFirstClassType())
       error("cast constant expression from a non-primitive type: '" +
             SrcTy->getDescription() + "'");
@@ -4577,13 +4823,13 @@
       error("cast constant expression to a non-primitive type: '" +
             DstTy->getDescription() + "'");
     (yyval.ConstVal).C = cast<Constant>(getCast((yyvsp[-5].CastOpVal), (yyvsp[-3].ConstVal).C, SrcSign, DstTy, DstSign));
-    (yyval.ConstVal).S = DstSign;
+    (yyval.ConstVal).S.copy(DstSign);
     delete (yyvsp[-1].TypeVal).PAT;
   ;}
     break;
 
   case 164:
-#line 2228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2474 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-2].ConstVal).C->getType();
     if (!isa<PointerType>(Ty))
@@ -4595,12 +4841,12 @@
 
     delete (yyvsp[-1].ValueList);
     (yyval.ConstVal).C = ConstantExpr::getGetElementPtr((yyvsp[-2].ConstVal).C, &CIndices[0], CIndices.size());
-    (yyval.ConstVal).S = Signless;
+    (yyval.ConstVal).S.copy(getElementSign((yyvsp[-2].ConstVal), CIndices));
   ;}
     break;
 
   case 165:
-#line 2241 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2487 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-5].ConstVal).C->getType()->isInteger() ||
         cast<IntegerType>((yyvsp[-5].ConstVal).C->getType())->getBitWidth() != 1)
@@ -4608,12 +4854,12 @@
     if ((yyvsp[-3].ConstVal).C->getType() != (yyvsp[-1].ConstVal).C->getType())
       error("Select operand types must match");
     (yyval.ConstVal).C = ConstantExpr::getSelect((yyvsp[-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
-    (yyval.ConstVal).S = Unsigned;
+    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S);
   ;}
     break;
 
   case 166:
-#line 2250 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2496 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-3].ConstVal).C->getType();
     if (Ty != (yyvsp[-1].ConstVal).C->getType())
@@ -4640,12 +4886,12 @@
              ConstantExpr::getCast(Instruction::PtrToInt, (yyvsp[-1].ConstVal).C, IntPtrTy));
       (yyval.ConstVal).C = ConstantExpr::getCast(Instruction::IntToPtr, (yyval.ConstVal).C, Ty);
     }
-    (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S; 
+    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S); 
   ;}
     break;
 
   case 167:
-#line 2278 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2524 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type* Ty = (yyvsp[-3].ConstVal).C->getType();
     if (Ty != (yyvsp[-1].ConstVal).C->getType())
@@ -4657,12 +4903,12 @@
     }
     Instruction::BinaryOps Opcode = getBinaryOp((yyvsp[-5].BinaryOpVal), Ty, (yyvsp[-3].ConstVal).S);
     (yyval.ConstVal).C = ConstantExpr::get(Opcode, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
-    (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S);
   ;}
     break;
 
   case 168:
-#line 2291 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2537 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type* Ty = (yyvsp[-3].ConstVal).C->getType();
     if (Ty != (yyvsp[-1].ConstVal).C->getType())
@@ -4670,32 +4916,32 @@
     unsigned short pred;
     Instruction::OtherOps Opcode = getCompareOp((yyvsp[-5].BinaryOpVal), pred, Ty, (yyvsp[-3].ConstVal).S);
     (yyval.ConstVal).C = ConstantExpr::getCompare(Opcode, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
-    (yyval.ConstVal).S = Unsigned;
+    (yyval.ConstVal).S.makeUnsigned();
   ;}
     break;
 
   case 169:
-#line 2300 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2546 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if ((yyvsp[-3].ConstVal).C->getType() != (yyvsp[-1].ConstVal).C->getType()) 
       error("icmp operand types must match");
     (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp[-5].IPred), (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
-    (yyval.ConstVal).S = Unsigned;
+    (yyval.ConstVal).S.makeUnsigned();
   ;}
     break;
 
   case 170:
-#line 2306 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2552 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if ((yyvsp[-3].ConstVal).C->getType() != (yyvsp[-1].ConstVal).C->getType()) 
       error("fcmp operand types must match");
     (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp[-5].FPred), (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
-    (yyval.ConstVal).S = Unsigned;
+    (yyval.ConstVal).S.makeUnsigned();
   ;}
     break;
 
   case 171:
-#line 2312 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2558 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-1].ConstVal).C->getType()->isInteger() ||
         cast<IntegerType>((yyvsp[-1].ConstVal).C->getType())->getBitWidth() != 8)
@@ -4705,47 +4951,47 @@
       error("Shift constant expression requires integer operand");
     Constant *ShiftAmt = ConstantExpr::getZExt((yyvsp[-1].ConstVal).C, Ty);
     (yyval.ConstVal).C = ConstantExpr::get(getBinaryOp((yyvsp[-5].BinaryOpVal), Ty, (yyvsp[-3].ConstVal).S), (yyvsp[-3].ConstVal).C, ShiftAmt);
-    (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S);
   ;}
     break;
 
   case 172:
-#line 2323 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2569 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C))
       error("Invalid extractelement operands");
     (yyval.ConstVal).C = ConstantExpr::getExtractElement((yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
-    (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S.get(0));
   ;}
     break;
 
   case 173:
-#line 2329 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2575 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C))
       error("Invalid insertelement operands");
     (yyval.ConstVal).C = ConstantExpr::getInsertElement((yyvsp[-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
-    (yyval.ConstVal).S = (yyvsp[-5].ConstVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-5].ConstVal).S);
   ;}
     break;
 
   case 174:
-#line 2335 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2581 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C))
       error("Invalid shufflevector operands");
     (yyval.ConstVal).C = ConstantExpr::getShuffleVector((yyvsp[-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
-    (yyval.ConstVal).S = (yyvsp[-5].ConstVal).S;
+    (yyval.ConstVal).S.copy((yyvsp[-5].ConstVal).S);
   ;}
     break;
 
   case 175:
-#line 2346 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2592 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal)); ;}
     break;
 
   case 176:
-#line 2347 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2593 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.ConstVector) = new std::vector<ConstInfo>();
     (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
@@ -4753,17 +4999,17 @@
     break;
 
   case 177:
-#line 2356 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2602 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 178:
-#line 2357 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2603 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 179:
-#line 2369 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2615 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.ModuleVal) = ParserResult = (yyvsp[0].ModuleVal);
     CurModule.ModuleDone();
@@ -4771,27 +5017,27 @@
     break;
 
   case 180:
-#line 2378 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2624 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); CurFun.FunctionDone(); ;}
     break;
 
   case 181:
-#line 2379 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2625 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); ;}
     break;
 
   case 182:
-#line 2380 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2626 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ModuleVal) = (yyvsp[-3].ModuleVal); ;}
     break;
 
   case 183:
-#line 2381 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2627 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); ;}
     break;
 
   case 184:
-#line 2382 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2628 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.ModuleVal) = CurModule.CurrentModule;
     // Emit an error if there are any unresolved types left.
@@ -4807,7 +5053,7 @@
     break;
 
   case 185:
-#line 2398 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2644 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     // Eagerly resolve types.  This is not an optimization, this is a
     // requirement that is due to the fact that we could have this:
@@ -4818,115 +5064,118 @@
     // If types are not resolved eagerly, then the two types will not be
     // determined to be the same type!
     //
-    const Type* Ty = (yyvsp[0].TypeVal).PAT->get();
-    ResolveTypeTo((yyvsp[-2].StrVal), Ty);
+    ResolveTypeTo((yyvsp[-2].StrVal), (yyvsp[0].TypeVal).PAT->get(), (yyvsp[0].TypeVal).S);
 
-    if (!setTypeName(Ty, (yyvsp[-2].StrVal)) && !(yyvsp[-2].StrVal)) {
-      // If this is a named type that is not a redefinition, add it to the slot
-      // table.
-      CurModule.Types.push_back(Ty);
+    if (!setTypeName((yyvsp[0].TypeVal), (yyvsp[-2].StrVal)) && !(yyvsp[-2].StrVal)) {
+      // If this is a numbered type that is not a redefinition, add it to the 
+      // slot table.
+      CurModule.Types.push_back((yyvsp[0].TypeVal).PAT->get());
+      CurModule.TypeSigns.push_back((yyvsp[0].TypeVal).S);
     }
     delete (yyvsp[0].TypeVal).PAT;
   ;}
     break;
 
   case 186:
-#line 2418 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2664 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {       // Function prototypes can be in const pool
   ;}
     break;
 
   case 187:
-#line 2420 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2666 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {  // Asm blocks can be in the const pool
   ;}
     break;
 
   case 188:
-#line 2422 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2668 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if ((yyvsp[0].ConstVal).C == 0) 
       error("Global value initializer is not a constant");
-    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), (yyvsp[-2].Linkage), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal).C->getType(), (yyvsp[0].ConstVal).C);
+    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), (yyvsp[-2].Linkage), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal).C->getType(), (yyvsp[0].ConstVal).C, (yyvsp[0].ConstVal).S);
   ;}
     break;
 
   case 189:
-#line 2426 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2672 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 190:
-#line 2429 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2675 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
-    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), Ty, 0);
+    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), Ty, 0,
+                                (yyvsp[0].TypeVal).S);
     delete (yyvsp[0].TypeVal).PAT;
   ;}
     break;
 
   case 191:
-#line 2433 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2680 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 192:
-#line 2436 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2683 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
-    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), Ty, 0);
+    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), Ty, 0,
+                                (yyvsp[0].TypeVal).S);
     delete (yyvsp[0].TypeVal).PAT;
   ;}
     break;
 
   case 193:
-#line 2440 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2688 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 194:
-#line 2443 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2691 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
     CurGV = 
-      ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), Ty, 0);
+      ParseGlobalVariable((yyvsp[-3].StrVal), GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), Ty, 0, 
+                          (yyvsp[0].TypeVal).S);
     delete (yyvsp[0].TypeVal).PAT;
   ;}
     break;
 
   case 195:
-#line 2448 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2697 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
   case 196:
-#line 2451 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2700 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
   ;}
     break;
 
   case 197:
-#line 2453 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2702 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
   ;}
     break;
 
   case 198:
-#line 2455 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2704 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
   ;}
     break;
 
   case 199:
-#line 2460 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2709 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
     char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
@@ -4941,24 +5190,24 @@
     break;
 
   case 200:
-#line 2474 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2723 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Endianness) = Module::BigEndian; ;}
     break;
 
   case 201:
-#line 2475 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2724 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Endianness) = Module::LittleEndian; ;}
     break;
 
   case 202:
-#line 2479 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2728 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     CurModule.setEndianness((yyvsp[0].Endianness));
   ;}
     break;
 
   case 203:
-#line 2482 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2731 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if ((yyvsp[0].UInt64Val) == 32)
       CurModule.setPointerSize(Module::Pointer32);
@@ -4970,7 +5219,7 @@
     break;
 
   case 204:
-#line 2490 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2739 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -4978,7 +5227,7 @@
     break;
 
   case 205:
-#line 2494 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2743 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -4986,7 +5235,7 @@
     break;
 
   case 207:
-#line 2505 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2754 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
       CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
       free((yyvsp[0].StrVal));
@@ -4994,7 +5243,7 @@
     break;
 
   case 208:
-#line 2509 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2758 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -5002,17 +5251,17 @@
     break;
 
   case 209:
-#line 2513 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2762 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { ;}
     break;
 
   case 213:
-#line 2526 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2775 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.StrVal) = 0; ;}
     break;
 
   case 214:
-#line 2530 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2779 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if ((yyvsp[-1].TypeVal).PAT->get() == Type::VoidTy)
       error("void typed arguments are invalid");
@@ -5021,7 +5270,7 @@
     break;
 
   case 215:
-#line 2538 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2787 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     (yyval.ArgList)->push_back(*(yyvsp[0].ArgVal));
@@ -5030,7 +5279,7 @@
     break;
 
   case 216:
-#line 2543 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2792 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.ArgList) = new std::vector<std::pair<PATypeInfo,char*> >();
     (yyval.ArgList)->push_back(*(yyvsp[0].ArgVal));
@@ -5039,39 +5288,39 @@
     break;
 
   case 217:
-#line 2551 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2800 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ArgList) = (yyvsp[0].ArgList); ;}
     break;
 
   case 218:
-#line 2552 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2801 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
-    VoidTI.S = Signless;
+    VoidTI.S.makeSignless();
     (yyval.ArgList)->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
   ;}
     break;
 
   case 219:
-#line 2559 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2808 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.ArgList) = new std::vector<std::pair<PATypeInfo,char*> >();
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
-    VoidTI.S = Signless;
+    VoidTI.S.makeSignless();
     (yyval.ArgList)->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
   ;}
     break;
 
   case 220:
-#line 2566 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2815 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ArgList) = 0; ;}
     break;
 
   case 221:
-#line 2570 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 2819 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     UnEscapeLexed((yyvsp[-5].StrVal));
     std::string FunctionName((yyvsp[-5].StrVal));
@@ -5082,6 +5331,8 @@
     if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
       error("LLVM functions cannot return aggregate types");
 
+    Signedness FTySign;
+    FTySign.makeComposite((yyvsp[-6].TypeVal).S);
     std::vector<const Type*> ParamTyList;
 
     // In LLVM 2.0 the signatures of three varargs intrinsics changed to take
@@ -5097,6 +5348,7 @@
            I = (yyvsp[-3].ArgList)->begin(), E = (yyvsp[-3].ArgList)->end(); I != E; ++I) {
         const Type *Ty = I->first.PAT->get();
         ParamTyList.push_back(Ty);
+        FTySign.add(I->first.S);
       }
     }
 
@@ -5123,6 +5375,7 @@
     } else {
       ID = ValID::create((int)CurModule.Values[PFT].size());
     }
+    ID.S.makeComposite(FTySign);
 
     Function *Fn = 0;
     Module* M = CurModule.CurrentModule;
@@ -5149,14 +5402,16 @@
           std::string NewName(makeNameUnique(FunctionName));
           if (Conflict->hasInternalLinkage()) {
             Conflict->setName(NewName);
-            RenameMapKey Key = std::make_pair(FunctionName,Conflict->getType());
+            RenameMapKey Key = 
+              makeRenameMapKey(FunctionName, Conflict->getType(), ID.S);
             CurModule.RenameMap[Key] = NewName;
             Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
             InsertValue(Fn, CurModule.Values);
           } else {
             Fn = new Function(FT, CurFun.Linkage, NewName, M);
             InsertValue(Fn, CurModule.Values);
-            RenameMapKey Key = std::make_pair(FunctionName,PFT);
+            RenameMapKey Key = 
+              makeRenameMapKey(FunctionName, PFT, ID.S);
             CurModule.RenameMap[Key] = NewName;
           }
         } else {
@@ -5178,9 +5433,11 @@
         // type plane. After PR411 was fixed, this is no loner the case. 
         // To resolve this we must rename one of the two. 
         if (Conflict->hasInternalLinkage()) {
-          // We can safely renamed the Conflict.
+          // We can safely rename the Conflict.
+          RenameMapKey Key = 
+            makeRenameMapKey(Conflict->getName(), Conflict->getType(), 
+              CurModule.NamedValueSigns[Conflict->getName()]);
           Conflict->setName(makeNameUnique(Conflict->getName()));
-          RenameMapKey Key = std::make_pair(FunctionName,Conflict->getType());
           CurModule.RenameMap[Key] = Conflict->getName();
           Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
           InsertValue(Fn, CurModule.Values);
@@ -5189,7 +5446,7 @@
           std::string NewName = makeNameUnique(FunctionName);
           Fn = new Function(FT, CurFun.Linkage, NewName, M);
           InsertValue(Fn, CurModule.Values);
-          RenameMapKey Key = std::make_pair(FunctionName,PFT);
+          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
           CurModule.RenameMap[Key] = NewName;
         } else {
           // We can't quietly rename either of these things, but we must
@@ -5200,7 +5457,7 @@
                   "' may cause linkage errors");
           Fn = new Function(FT, CurFun.Linkage, NewName, M);
           InsertValue(Fn, CurModule.Values);
-          RenameMapKey Key = std::make_pair(FunctionName,PFT);
+          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
           CurModule.RenameMap[Key] = NewName;
         }
       } else {
@@ -5239,7 +5496,8 @@
       std::vector<std::pair<PATypeInfo,char*> >::iterator E = (yyvsp[-3].ArgList)->end();
       for ( ; I != E && ArgIt != ArgEnd; ++I, ++ArgIt) {
         delete I->first.PAT;                      // Delete the typeholder...
-        setValueName(ArgIt, I->second);           // Insert arg into symtab...
+        ValueInfo VI; VI.V = ArgIt; VI.S.copy(I->first.S); 
+        setValueName(VI, I->second);           // Insert arg into symtab...
         InsertValue(ArgIt);
       }
       delete (yyvsp[-3].ArgList);                     // We're now done with the argument list
@@ -5248,7 +5506,7 @@
     break;
 
   case 224:
-#line 2750 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3008 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -5259,39 +5517,39 @@
     break;
 
   case 227:
-#line 2764 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3022 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   ;}
     break;
 
   case 228:
-#line 2769 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3027 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
   case 229:
-#line 2770 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3028 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
   case 230:
-#line 2771 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3029 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
   case 231:
-#line 2775 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3033 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
   case 232:
-#line 2776 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3034 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { CurFun.Linkage = (yyvsp[0].Linkage); ;}
     break;
 
   case 233:
-#line 2776 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3034 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.FunctionVal) = CurFun.CurrentFunction;
     CurFun.FunctionDone();
@@ -5300,63 +5558,69 @@
     break;
 
   case 234:
-#line 2788 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3046 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 235:
-#line 2789 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3047 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 236:
-#line 2794 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
-    {    (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val)); ;}
+#line 3052 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    { (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val)); ;}
     break;
 
   case 237:
-#line 2795 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3053 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val)); ;}
     break;
 
   case 238:
-#line 2796 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3054 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal)); ;}
     break;
 
   case 239:
-#line 2797 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, true)); ;}
+#line 3055 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    { 
+    (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, true));
+    (yyval.ValIDVal).S.makeUnsigned();
+  ;}
     break;
 
   case 240:
-#line 2798 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
-    { (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, false)); ;}
+#line 3059 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    { 
+    (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, false)); 
+    (yyval.ValIDVal).S.makeUnsigned();
+  ;}
     break;
 
   case 241:
-#line 2799 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3063 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::createNull(); ;}
     break;
 
   case 242:
-#line 2800 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3064 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::createUndef(); ;}
     break;
 
   case 243:
-#line 2801 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3065 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::createZeroInit(); ;}
     break;
 
   case 244:
-#line 2802 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3066 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[-1].ConstVector))[0].C->getType();
     int NumElements = (yyvsp[-1].ConstVector)->size(); 
     VectorType* pt = VectorType::get(ETy, NumElements);
-    PATypeHolder* PTy = new PATypeHolder(
-      HandleUpRefs(VectorType::get(ETy, NumElements)));
+    (yyval.ValIDVal).S.makeComposite((*(yyvsp[-1].ConstVector))[0].S);
+    PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt, (yyval.ValIDVal).S));
     
     // Verify all elements are correct type!
     std::vector<Constant*> Elems;
@@ -5375,14 +5639,15 @@
     break;
 
   case 245:
-#line 2823 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3087 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal).C);
+    (yyval.ValIDVal).S.copy((yyvsp[0].ConstVal).S);
   ;}
     break;
 
   case 246:
-#line 2826 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3091 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
     std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
@@ -5395,52 +5660,54 @@
     break;
 
   case 247:
-#line 2841 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
-    {  (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal)); ;}
+#line 3105 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {  (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal)); (yyval.ValIDVal).S.makeSignless(); ;}
     break;
 
   case 248:
-#line 2842 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
-    {  (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal)); ;}
+#line 3106 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    {  (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal)); (yyval.ValIDVal).S.makeSignless(); ;}
     break;
 
   case 251:
-#line 2855 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3119 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
-    (yyval.ValueVal).S = (yyvsp[-1].TypeVal).S;
+    (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
     (yyval.ValueVal).V = getVal(Ty, (yyvsp[0].ValIDVal)); 
+    (yyval.ValueVal).S.copy((yyvsp[-1].TypeVal).S);
     delete (yyvsp[-1].TypeVal).PAT;
   ;}
     break;
 
   case 252:
-#line 2864 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3129 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   ;}
     break;
 
   case 253:
-#line 2867 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3132 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   ;}
     break;
 
   case 254:
-#line 2876 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3141 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
-    InsertValue((yyvsp[0].TermInstVal));
-    (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp[0].TermInstVal));
+    ValueInfo VI; VI.V = (yyvsp[0].TermInstVal).TI; VI.S.copy((yyvsp[0].TermInstVal).S);
+    setValueName(VI, (yyvsp[-1].StrVal));
+    InsertValue((yyvsp[0].TermInstVal).TI);
+    (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp[0].TermInstVal).TI);
     InsertValue((yyvsp[-2].BasicBlockVal));
     (yyval.BasicBlockVal) = (yyvsp[-2].BasicBlockVal);
   ;}
     break;
 
   case 255:
-#line 2886 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3152 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if ((yyvsp[0].InstVal).I)
       (yyvsp[-1].BasicBlockVal)->getInstList().push_back((yyvsp[0].InstVal).I);
@@ -5449,9 +5716,9 @@
     break;
 
   case 256:
-#line 2891 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3157 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
+    (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++),true);
     // Make sure to move the basic block to the correct location in the
     // function, instead of leaving it inserted wherever it was first
     // referenced.
@@ -5462,7 +5729,7 @@
     break;
 
   case 257:
-#line 2900 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3166 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp[0].StrVal)), true);
     // Make sure to move the basic block to the correct location in the
@@ -5475,44 +5742,54 @@
     break;
 
   case 260:
-#line 2914 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {              // Return with a result...
-    (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal).V);
+    (yyval.TermInstVal).TI = new ReturnInst((yyvsp[0].ValueVal).V);
+    (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
   case 261:
-#line 2917 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3184 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                                       // Return with no result...
-    (yyval.TermInstVal) = new ReturnInst();
+    (yyval.TermInstVal).TI = new ReturnInst();
+    (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
   case 262:
-#line 2920 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3188 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                         // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
-    (yyval.TermInstVal) = new BranchInst(tmpBB);
+    (yyval.TermInstVal).TI = new BranchInst(tmpBB);
+    (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
   case 263:
-#line 2924 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3193 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {  
+    (yyvsp[-3].ValIDVal).S.makeSignless();
+    (yyvsp[0].ValIDVal).S.makeSignless();
     BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
     BasicBlock* tmpBBB = getBBVal((yyvsp[0].ValIDVal));
+    (yyvsp[-6].ValIDVal).S.makeUnsigned();
     Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[-6].ValIDVal));
-    (yyval.TermInstVal) = new BranchInst(tmpBBA, tmpBBB, tmpVal);
+    (yyval.TermInstVal).TI = new BranchInst(tmpBBA, tmpBBB, tmpVal);
+    (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
   case 264:
-#line 2930 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
+    (yyvsp[-6].ValIDVal).S.copy((yyvsp[-7].PrimType).S);
     Value* tmpVal = getVal((yyvsp[-7].PrimType).T, (yyvsp[-6].ValIDVal));
+    (yyvsp[-3].ValIDVal).S.makeSignless();
     BasicBlock* tmpBB = getBBVal((yyvsp[-3].ValIDVal));
     SwitchInst *S = new SwitchInst(tmpVal, tmpBB, (yyvsp[-1].JumpTable)->size());
-    (yyval.TermInstVal) = S;
+    (yyval.TermInstVal).TI = S;
+    (yyval.TermInstVal).S.makeSignless();
     std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = (yyvsp[-1].JumpTable)->begin(),
       E = (yyvsp[-1].JumpTable)->end();
     for (; I != E; ++I) {
@@ -5526,29 +5803,36 @@
     break;
 
   case 265:
-#line 2945 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3221 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
+    (yyvsp[-5].ValIDVal).S.copy((yyvsp[-6].PrimType).S);
     Value* tmpVal = getVal((yyvsp[-6].PrimType).T, (yyvsp[-5].ValIDVal));
+    (yyvsp[-2].ValIDVal).S.makeSignless();
     BasicBlock* tmpBB = getBBVal((yyvsp[-2].ValIDVal));
     SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
-    (yyval.TermInstVal) = S;
+    (yyval.TermInstVal).TI = S;
+    (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
   case 266:
-#line 2952 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const PointerType *PFTy;
     const FunctionType *Ty;
+    Signedness FTySign;
 
     if (!(PFTy = dyn_cast<PointerType>((yyvsp[-10].TypeVal).PAT->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
+      FTySign.makeComposite((yyvsp[-10].TypeVal).S);
       if ((yyvsp[-7].ValueList)) {
         for (std::vector<ValueInfo>::iterator I = (yyvsp[-7].ValueList)->begin(), E = (yyvsp[-7].ValueList)->end();
-             I != E; ++I)
+             I != E; ++I) {
           ParamTypes.push_back((*I).V->getType());
+          FTySign.add(I->S);
+        }
       }
       FunctionType::ParamAttrsList ParamAttrs;
       if ((yyvsp[-11].UIntVal) == OldCallingConv::CSRet) {
@@ -5559,14 +5843,19 @@
       if (isVarArg) ParamTypes.pop_back();
       Ty = FunctionType::get((yyvsp[-10].TypeVal).PAT->get(), ParamTypes, isVarArg, ParamAttrs);
       PFTy = PointerType::get(Ty);
+      (yyval.TermInstVal).S.copy((yyvsp[-10].TypeVal).S);
+    } else {
+      FTySign = (yyvsp[-10].TypeVal).S;
+      (yyval.TermInstVal).S.copy((yyvsp[-10].TypeVal).S.get(0)); // 0th element of FuncTy sign is result ty
     }
+    (yyvsp[-9].ValIDVal).S.makeComposite(FTySign);
     Value *V = getVal(PFTy, (yyvsp[-9].ValIDVal));   // Get the function we're calling...
     BasicBlock *Normal = getBBVal((yyvsp[-3].ValIDVal));
     BasicBlock *Except = getBBVal((yyvsp[0].ValIDVal));
 
     // Create the call node...
     if (!(yyvsp[-7].ValueList)) {                                   // Has no arguments?
-      (yyval.TermInstVal) = new InvokeInst(V, Normal, Except, 0, 0);
+      (yyval.TermInstVal).TI = new InvokeInst(V, Normal, Except, 0, 0);
     } else {                                     // Has arguments?
       // Loop through FunctionType's arguments and ensure they are specified
       // correctly!
@@ -5586,58 +5875,64 @@
       if (I != E || (ArgI != ArgE && !Ty->isVarArg()))
         error("Invalid number of parameters detected");
 
-      (yyval.TermInstVal) = new InvokeInst(V, Normal, Except, &Args[0], Args.size());
+      (yyval.TermInstVal).TI = new InvokeInst(V, Normal, Except, &Args[0], Args.size());
     }
-    cast<InvokeInst>((yyval.TermInstVal))->setCallingConv(upgradeCallingConv((yyvsp[-11].UIntVal)));
+    cast<InvokeInst>((yyval.TermInstVal).TI)->setCallingConv(upgradeCallingConv((yyvsp[-11].UIntVal)));
     delete (yyvsp[-10].TypeVal).PAT;
     delete (yyvsp[-7].ValueList);
   ;}
     break;
 
   case 267:
-#line 3007 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3295 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    (yyval.TermInstVal) = new UnwindInst();
+    (yyval.TermInstVal).TI = new UnwindInst();
+    (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
   case 268:
-#line 3010 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3299 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-    (yyval.TermInstVal) = new UnreachableInst();
+    (yyval.TermInstVal).TI = new UnreachableInst();
+    (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
   case 269:
-#line 3016 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3306 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.JumpTable) = (yyvsp[-5].JumpTable);
+    (yyvsp[-3].ValIDVal).S.copy((yyvsp[-4].PrimType).S);
     Constant *V = cast<Constant>(getExistingValue((yyvsp[-4].PrimType).T, (yyvsp[-3].ValIDVal)));
     
     if (V == 0)
       error("May only switch on a constant pool value");
 
+    (yyvsp[0].ValIDVal).S.makeSignless();
     BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
   ;}
     break;
 
   case 270:
-#line 3026 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3318 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
+    (yyvsp[-3].ValIDVal).S.copy((yyvsp[-4].PrimType).S);
     Constant *V = cast<Constant>(getExistingValue((yyvsp[-4].PrimType).T, (yyvsp[-3].ValIDVal)));
 
     if (V == 0)
       error("May only switch on a constant pool value");
 
+    (yyvsp[0].ValIDVal).S.makeSignless();
     BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB)); 
   ;}
     break;
 
   case 271:
-#line 3039 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3333 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     bool omit = false;
     if ((yyvsp[-1].StrVal))
@@ -5659,9 +5954,10 @@
           omit = true;
     if (omit) {
       (yyval.InstVal).I = 0;
-      (yyval.InstVal).S = Signless;
+      (yyval.InstVal).S.makeSignless();
     } else {
-      setValueName((yyvsp[0].InstVal).I, (yyvsp[-1].StrVal));
+      ValueInfo VI; VI.V = (yyvsp[0].InstVal).I; VI.S.copy((yyvsp[0].InstVal).S);
+      setValueName(VI, (yyvsp[-1].StrVal));
       InsertValue((yyvsp[0].InstVal).I);
       (yyval.InstVal) = (yyvsp[0].InstVal);
     }
@@ -5669,11 +5965,13 @@
     break;
 
   case 272:
-#line 3068 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3363 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {    // Used for PHI nodes
     (yyval.PHIList).P = new std::list<std::pair<Value*, BasicBlock*> >();
-    (yyval.PHIList).S = (yyvsp[-5].TypeVal).S;
+    (yyval.PHIList).S.copy((yyvsp[-5].TypeVal).S);
+    (yyvsp[-3].ValIDVal).S.copy((yyvsp[-5].TypeVal).S);
     Value* tmpVal = getVal((yyvsp[-5].TypeVal).PAT->get(), (yyvsp[-3].ValIDVal));
+    (yyvsp[-1].ValIDVal).S.makeSignless();
     BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
     (yyval.PHIList).P->push_back(std::make_pair(tmpVal, tmpBB));
     delete (yyvsp[-5].TypeVal).PAT;
@@ -5681,17 +5979,19 @@
     break;
 
   case 273:
-#line 3076 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3373 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.PHIList) = (yyvsp[-6].PHIList);
+    (yyvsp[-3].ValIDVal).S.copy((yyvsp[-6].PHIList).S);
     Value* tmpVal = getVal((yyvsp[-6].PHIList).P->front().first->getType(), (yyvsp[-3].ValIDVal));
+    (yyvsp[-1].ValIDVal).S.makeSignless();
     BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
     (yyvsp[-6].PHIList).P->push_back(std::make_pair(tmpVal, tmpBB));
   ;}
     break;
 
   case 274:
-#line 3084 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3383 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {    // Used for call statements, and memory insts...
     (yyval.ValueList) = new std::vector<ValueInfo>();
     (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
@@ -5699,7 +5999,7 @@
     break;
 
   case 275:
-#line 3088 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3387 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.ValueList) = (yyvsp[-2].ValueList);
     (yyvsp[-2].ValueList)->push_back((yyvsp[0].ValueVal));
@@ -5707,27 +6007,29 @@
     break;
 
   case 277:
-#line 3096 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3395 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValueList) = 0; ;}
     break;
 
   case 278:
-#line 3100 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3399 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.BoolVal) = true;
   ;}
     break;
 
   case 279:
-#line 3103 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3402 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.BoolVal) = false;
   ;}
     break;
 
   case 280:
-#line 3109 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3408 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
+    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     const Type* Ty = (yyvsp[-3].TypeVal).PAT->get();
     if (!Ty->isInteger() && !Ty->isFloatingPoint() && !isa<VectorType>(Ty))
       error("Arithmetic operator requires integer, FP, or packed operands");
@@ -5741,14 +6043,16 @@
     (yyval.InstVal).I = BinaryOperator::create(Opcode, val1, val2);
     if ((yyval.InstVal).I == 0)
       error("binary operator returned null");
-    (yyval.InstVal).S = (yyvsp[-3].TypeVal).S;
+    (yyval.InstVal).S.copy((yyvsp[-3].TypeVal).S);
     delete (yyvsp[-3].TypeVal).PAT;
   ;}
     break;
 
   case 281:
-#line 3126 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3427 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
+    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     const Type *Ty = (yyvsp[-3].TypeVal).PAT->get();
     if (!Ty->isInteger()) {
       if (!isa<VectorType>(Ty) ||
@@ -5761,14 +6065,16 @@
     (yyval.InstVal).I = BinaryOperator::create(Opcode, tmpVal1, tmpVal2);
     if ((yyval.InstVal).I == 0)
       error("binary operator returned null");
-    (yyval.InstVal).S = (yyvsp[-3].TypeVal).S;
+    (yyval.InstVal).S.copy((yyvsp[-3].TypeVal).S);
     delete (yyvsp[-3].TypeVal).PAT;
   ;}
     break;
 
   case 282:
-#line 3142 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3445 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
+    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     const Type* Ty = (yyvsp[-3].TypeVal).PAT->get();
     if(isa<VectorType>(Ty))
       error("VectorTypes currently not supported in setcc instructions");
@@ -5779,14 +6085,16 @@
     (yyval.InstVal).I = CmpInst::create(Opcode, pred, tmpVal1, tmpVal2);
     if ((yyval.InstVal).I == 0)
       error("binary operator returned null");
-    (yyval.InstVal).S = Unsigned;
+    (yyval.InstVal).S.makeUnsigned();
     delete (yyvsp[-3].TypeVal).PAT;
   ;}
     break;
 
   case 283:
-#line 3156 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3461 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
+    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     const Type *Ty = (yyvsp[-3].TypeVal).PAT->get();
     if (isa<VectorType>(Ty)) 
       error("VectorTypes currently not supported in icmp instructions");
@@ -5795,14 +6103,16 @@
     Value* tmpVal1 = getVal(Ty, (yyvsp[-2].ValIDVal));
     Value* tmpVal2 = getVal(Ty, (yyvsp[0].ValIDVal));
     (yyval.InstVal).I = new ICmpInst((yyvsp[-4].IPred), tmpVal1, tmpVal2);
-    (yyval.InstVal).S = Unsigned;
+    (yyval.InstVal).S.makeUnsigned();
     delete (yyvsp[-3].TypeVal).PAT;
   ;}
     break;
 
   case 284:
-#line 3168 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3475 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
+    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
+    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     const Type *Ty = (yyvsp[-3].TypeVal).PAT->get();
     if (isa<VectorType>(Ty))
       error("VectorTypes currently not supported in fcmp instructions");
@@ -5811,13 +6121,13 @@
     Value* tmpVal1 = getVal(Ty, (yyvsp[-2].ValIDVal));
     Value* tmpVal2 = getVal(Ty, (yyvsp[0].ValIDVal));
     (yyval.InstVal).I = new FCmpInst((yyvsp[-4].FPred), tmpVal1, tmpVal2);
-    (yyval.InstVal).S = Unsigned;
+    (yyval.InstVal).S.makeUnsigned();
     delete (yyvsp[-3].TypeVal).PAT;
   ;}
     break;
 
   case 285:
-#line 3180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3489 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     warning("Use of obsolete 'not' instruction: Replacing with 'xor");
     const Type *Ty = (yyvsp[0].ValueVal).V->getType();
@@ -5827,12 +6137,12 @@
     (yyval.InstVal).I = BinaryOperator::create(Instruction::Xor, (yyvsp[0].ValueVal).V, Ones);
     if ((yyval.InstVal).I == 0)
       error("Could not create a xor instruction");
-    (yyval.InstVal).S = (yyvsp[0].ValueVal).S;
+    (yyval.InstVal).S.copy((yyvsp[0].ValueVal).S);
   ;}
     break;
 
   case 286:
-#line 3191 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3500 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[0].ValueVal).V->getType()->isInteger() ||
         cast<IntegerType>((yyvsp[0].ValueVal).V->getType())->getBitWidth() != 8)
@@ -5849,25 +6159,25 @@
     else
       ShiftAmt = (yyvsp[0].ValueVal).V;
     (yyval.InstVal).I = BinaryOperator::create(getBinaryOp((yyvsp[-3].BinaryOpVal), Ty, (yyvsp[-2].ValueVal).S), (yyvsp[-2].ValueVal).V, ShiftAmt);
-    (yyval.InstVal).S = (yyvsp[-2].ValueVal).S;
+    (yyval.InstVal).S.copy((yyvsp[-2].ValueVal).S);
   ;}
     break;
 
   case 287:
-#line 3209 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3518 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *DstTy = (yyvsp[0].TypeVal).PAT->get();
     if (!DstTy->isFirstClassType())
       error("cast instruction to a non-primitive type: '" +
             DstTy->getDescription() + "'");
     (yyval.InstVal).I = cast<Instruction>(getCast((yyvsp[-3].CastOpVal), (yyvsp[-2].ValueVal).V, (yyvsp[-2].ValueVal).S, DstTy, (yyvsp[0].TypeVal).S, true));
-    (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
+    (yyval.InstVal).S.copy((yyvsp[0].TypeVal).S);
     delete (yyvsp[0].TypeVal).PAT;
   ;}
     break;
 
   case 288:
-#line 3218 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3527 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-4].ValueVal).V->getType()->isInteger() ||
         cast<IntegerType>((yyvsp[-4].ValueVal).V->getType())->getBitWidth() != 1)
@@ -5875,23 +6185,23 @@
     if ((yyvsp[-2].ValueVal).V->getType() != (yyvsp[0].ValueVal).V->getType())
       error("select value types should match");
     (yyval.InstVal).I = new SelectInst((yyvsp[-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V);
-    (yyval.InstVal).S = (yyvsp[-4].ValueVal).S;
+    (yyval.InstVal).S.copy((yyvsp[-2].ValueVal).S);
   ;}
     break;
 
   case 289:
-#line 3227 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3536 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
     NewVarArgs = true;
     (yyval.InstVal).I = new VAArgInst((yyvsp[-2].ValueVal).V, Ty);
-    (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
+    (yyval.InstVal).S.copy((yyvsp[0].TypeVal).S);
     delete (yyvsp[0].TypeVal).PAT;
   ;}
     break;
 
   case 290:
-#line 3234 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3543 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type* ArgTy = (yyvsp[-2].ValueVal).V->getType();
     const Type* DstTy = (yyvsp[0].TypeVal).PAT->get();
@@ -5910,13 +6220,13 @@
     CurBB->getInstList().push_back(bar);
     CurBB->getInstList().push_back(new StoreInst(bar, foo));
     (yyval.InstVal).I = new VAArgInst(foo, DstTy);
-    (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
+    (yyval.InstVal).S.copy((yyvsp[0].TypeVal).S);
     delete (yyvsp[0].TypeVal).PAT;
   ;}
     break;
 
   case 291:
-#line 3255 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3564 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type* ArgTy = (yyvsp[-2].ValueVal).V->getType();
     const Type* DstTy = (yyvsp[0].TypeVal).PAT->get();
@@ -5938,43 +6248,43 @@
     Instruction* tmp = new VAArgInst(foo, DstTy);
     CurBB->getInstList().push_back(tmp);
     (yyval.InstVal).I = new LoadInst(foo);
-    (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
+    (yyval.InstVal).S.copy((yyvsp[0].TypeVal).S);
     delete (yyvsp[0].TypeVal).PAT;
   ;}
     break;
 
   case 292:
-#line 3279 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3588 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
       error("Invalid extractelement operands");
     (yyval.InstVal).I = new ExtractElementInst((yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V);
-    (yyval.InstVal).S = (yyvsp[-2].ValueVal).S;
+    (yyval.InstVal).S.copy((yyvsp[-2].ValueVal).S.get(0));
   ;}
     break;
 
   case 293:
-#line 3285 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3594 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
       error("Invalid insertelement operands");
     (yyval.InstVal).I = new InsertElementInst((yyvsp[-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V);
-    (yyval.InstVal).S = (yyvsp[-4].ValueVal).S;
+    (yyval.InstVal).S.copy((yyvsp[-4].ValueVal).S);
   ;}
     break;
 
   case 294:
-#line 3291 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3600 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
       error("Invalid shufflevector operands");
     (yyval.InstVal).I = new ShuffleVectorInst((yyvsp[-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V);
-    (yyval.InstVal).S = (yyvsp[-4].ValueVal).S;
+    (yyval.InstVal).S.copy((yyvsp[-4].ValueVal).S);
   ;}
     break;
 
   case 295:
-#line 3297 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3606 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[0].PHIList).P->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -5988,26 +6298,29 @@
       (yyvsp[0].PHIList).P->pop_front();
     }
     (yyval.InstVal).I = PHI;
-    (yyval.InstVal).S = (yyvsp[0].PHIList).S;
+    (yyval.InstVal).S.copy((yyvsp[0].PHIList).S);
     delete (yyvsp[0].PHIList).P;  // Free the list...
   ;}
     break;
 
   case 296:
-#line 3313 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3622 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
-
     // Handle the short call syntax
     const PointerType *PFTy;
     const FunctionType *FTy;
+    Signedness FTySign;
     if (!(PFTy = dyn_cast<PointerType>((yyvsp[-4].TypeVal).PAT->get())) ||
         !(FTy = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
+      FTySign.makeComposite((yyvsp[-4].TypeVal).S);
       if ((yyvsp[-1].ValueList)) {
         for (std::vector<ValueInfo>::iterator I = (yyvsp[-1].ValueList)->begin(), E = (yyvsp[-1].ValueList)->end();
-             I != E; ++I)
+             I != E; ++I) {
           ParamTypes.push_back((*I).V->getType());
+          FTySign.add(I->S);
+        }
       }
 
       FunctionType::ParamAttrsList ParamAttrs;
@@ -6024,7 +6337,12 @@
 
       FTy = FunctionType::get(RetTy, ParamTypes, isVarArg, ParamAttrs);
       PFTy = PointerType::get(FTy);
+      (yyval.InstVal).S.copy((yyvsp[-4].TypeVal).S);
+    } else {
+      FTySign = (yyvsp[-4].TypeVal).S;
+      (yyval.InstVal).S.copy((yyvsp[-4].TypeVal).S.get(0)); // 0th element of FuncTy signedness is result sign
     }
+    (yyvsp[-3].ValIDVal).S.makeComposite(FTySign);
 
     // First upgrade any intrinsic calls.
     std::vector<Value*> Args;
@@ -6036,7 +6354,6 @@
     // If we got an upgraded intrinsic
     if (Inst) {
       (yyval.InstVal).I = Inst;
-      (yyval.InstVal).S = Signless;
     } else {
       // Get the function we're calling
       Value *V = getVal(PFTy, (yyvsp[-3].ValIDVal));
@@ -6068,7 +6385,6 @@
       CI->setTailCall((yyvsp[-6].BoolVal));
       CI->setCallingConv(upgradeCallingConv((yyvsp[-5].UIntVal)));
       (yyval.InstVal).I = CI;
-      (yyval.InstVal).S = (yyvsp[-4].TypeVal).S;
     }
     delete (yyvsp[-4].TypeVal).PAT;
     delete (yyvsp[-1].ValueList);
@@ -6076,88 +6392,90 @@
     break;
 
   case 297:
-#line 3391 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3706 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.InstVal) = (yyvsp[0].InstVal);
   ;}
     break;
 
   case 298:
-#line 3399 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3714 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValueList) = (yyvsp[0].ValueList); ;}
     break;
 
   case 299:
-#line 3400 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3715 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValueList) = new std::vector<ValueInfo>(); ;}
     break;
 
   case 300:
-#line 3404 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3719 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
   case 301:
-#line 3405 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3720 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
   case 302:
-#line 3409 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3724 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
-    (yyval.InstVal).S = (yyvsp[-1].TypeVal).S;
+    (yyval.InstVal).S.makeComposite((yyvsp[-1].TypeVal).S);
     (yyval.InstVal).I = new MallocInst(Ty, 0, (yyvsp[0].UIntVal));
     delete (yyvsp[-1].TypeVal).PAT;
   ;}
     break;
 
   case 303:
-#line 3415 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3730 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-4].TypeVal).PAT->get();
-    (yyval.InstVal).S = (yyvsp[-4].TypeVal).S;
+    (yyvsp[-1].ValIDVal).S.makeUnsigned();
+    (yyval.InstVal).S.makeComposite((yyvsp[-4].TypeVal).S);
     (yyval.InstVal).I = new MallocInst(Ty, getVal((yyvsp[-2].PrimType).T, (yyvsp[-1].ValIDVal)), (yyvsp[0].UIntVal));
     delete (yyvsp[-4].TypeVal).PAT;
   ;}
     break;
 
   case 304:
-#line 3421 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3737 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
-    (yyval.InstVal).S = (yyvsp[-1].TypeVal).S;
+    (yyval.InstVal).S.makeComposite((yyvsp[-1].TypeVal).S);
     (yyval.InstVal).I = new AllocaInst(Ty, 0, (yyvsp[0].UIntVal));
     delete (yyvsp[-1].TypeVal).PAT;
   ;}
     break;
 
   case 305:
-#line 3427 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3743 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-4].TypeVal).PAT->get();
-    (yyval.InstVal).S = (yyvsp[-4].TypeVal).S;
+    (yyvsp[-1].ValIDVal).S.makeUnsigned();
+    (yyval.InstVal).S.makeComposite((yyvsp[-2].PrimType).S);
     (yyval.InstVal).I = new AllocaInst(Ty, getVal((yyvsp[-2].PrimType).T, (yyvsp[-1].ValIDVal)), (yyvsp[0].UIntVal));
     delete (yyvsp[-4].TypeVal).PAT;
   ;}
     break;
 
   case 306:
-#line 3433 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3750 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *PTy = (yyvsp[0].ValueVal).V->getType();
     if (!isa<PointerType>(PTy))
       error("Trying to free nonpointer type '" + PTy->getDescription() + "'");
     (yyval.InstVal).I = new FreeInst((yyvsp[0].ValueVal).V);
-    (yyval.InstVal).S = Signless;
+    (yyval.InstVal).S.makeSignless();
   ;}
     break;
 
   case 307:
-#line 3440 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3757 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type* Ty = (yyvsp[-1].TypeVal).PAT->get();
-    (yyval.InstVal).S = (yyvsp[-1].TypeVal).S;
+    (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
     if (!isa<PointerType>(Ty))
       error("Can't load from nonpointer type: " + Ty->getDescription());
     if (!cast<PointerType>(Ty)->getElementType()->isFirstClassType())
@@ -6165,13 +6483,15 @@
                      Ty->getDescription());
     Value* tmpVal = getVal(Ty, (yyvsp[0].ValIDVal));
     (yyval.InstVal).I = new LoadInst(tmpVal, "", (yyvsp[-3].BoolVal));
+    (yyval.InstVal).S.copy((yyvsp[-1].TypeVal).S.get(0));
     delete (yyvsp[-1].TypeVal).PAT;
   ;}
     break;
 
   case 308:
-#line 3452 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3770 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
+    (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
     const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal).PAT->get());
     if (!PTy)
       error("Can't store to a nonpointer type: " + 
@@ -6193,14 +6513,15 @@
       }
     }
     (yyval.InstVal).I = new StoreInst(StoreVal, tmpVal, (yyvsp[-5].BoolVal));
-    (yyval.InstVal).S = Signless;
+    (yyval.InstVal).S.makeSignless();
     delete (yyvsp[-1].TypeVal).PAT;
   ;}
     break;
 
   case 309:
-#line 3477 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3796 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
+    (yyvsp[-1].ValIDVal).S.copy((yyvsp[-2].TypeVal).S);
     const Type* Ty = (yyvsp[-2].TypeVal).PAT->get();
     if (!isa<PointerType>(Ty))
       error("getelementptr insn requires pointer operand");
@@ -6210,7 +6531,8 @@
 
     Value* tmpVal = getVal(Ty, (yyvsp[-1].ValIDVal));
     (yyval.InstVal).I = new GetElementPtrInst(tmpVal, &VIndices[0], VIndices.size());
-    (yyval.InstVal).S = Signless;
+    ValueInfo VI; VI.V = tmpVal; VI.S.copy((yyvsp[-2].TypeVal).S);
+    (yyval.InstVal).S.copy(getElementSign(VI, VIndices));
     delete (yyvsp[-2].TypeVal).PAT;
     delete (yyvsp[0].ValueList);
   ;}
@@ -6221,7 +6543,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 6225 "UpgradeParser.tab.c"
+#line 6547 "UpgradeParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -6489,7 +6811,7 @@
 }
 
 
-#line 3493 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3814 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
 
 
 int yyerror(const char *ErrorMsg) {


Index: llvm/tools/llvm-upgrade/UpgradeParser.h.cvs
diff -u llvm/tools/llvm-upgrade/UpgradeParser.h.cvs:1.50 llvm/tools/llvm-upgrade/UpgradeParser.h.cvs:1.51
--- llvm/tools/llvm-upgrade/UpgradeParser.h.cvs:1.50	Wed Mar 14 22:26:42 2007
+++ llvm/tools/llvm-upgrade/UpgradeParser.h.cvs	Wed Mar 21 12:15:50 2007
@@ -335,13 +335,13 @@
 
 
 #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
-#line 1454 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 1693 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
 typedef union YYSTYPE {
   llvm::Module                           *ModuleVal;
   llvm::Function                         *FunctionVal;
   std::pair<llvm::PATypeInfo, char*>     *ArgVal;
   llvm::BasicBlock                       *BasicBlockVal;
-  llvm::TerminatorInst                   *TermInstVal;
+  llvm::TermInstInfo                     TermInstVal;
   llvm::InstrInfo                        InstVal;
   llvm::ConstInfo                        ConstVal;
   llvm::ValueInfo                        ValueVal;


Index: llvm/tools/llvm-upgrade/UpgradeParser.y.cvs
diff -u llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.65 llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.66
--- llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.65	Wed Mar 14 22:26:42 2007
+++ llvm/tools/llvm-upgrade/UpgradeParser.y.cvs	Wed Mar 21 12:15:50 2007
@@ -67,7 +67,7 @@
 //
 typedef std::vector<Value *> ValueList;           // Numbered defs
 
-typedef std::pair<std::string,const Type*> RenameMapKey;
+typedef std::pair<std::string,TypeInfo> RenameMapKey;
 typedef std::map<RenameMapKey,std::string> RenameMapType;
 
 static void 
@@ -78,7 +78,10 @@
   Module *CurrentModule;
   std::map<const Type *, ValueList> Values; // Module level numbered definitions
   std::map<const Type *,ValueList> LateResolveValues;
-  std::vector<PATypeHolder>    Types;
+  std::vector<PATypeHolder> Types;
+  std::vector<Signedness> TypeSigns;
+  std::map<std::string,Signedness> NamedTypeSigns;
+  std::map<std::string,Signedness> NamedValueSigns;
   std::map<ValID, PATypeHolder> LateResolveTypes;
   static Module::Endianness Endian;
   static Module::PointerSize PointerSize;
@@ -135,6 +138,9 @@
 
     Values.clear();         // Clear out function local definitions
     Types.clear();
+    TypeSigns.clear();
+    NamedTypeSigns.clear();
+    NamedValueSigns.clear();
     CurrentModule = 0;
   }
 
@@ -208,6 +214,24 @@
 
 static bool inFunctionScope() { return CurFun.CurrentFunction != 0; }
 
+/// This function is just a utility to make a Key value for the rename map.
+/// The Key is a combination of the name, type, Signedness of the original 
+/// value (global/function). This just constructs the key and ensures that
+/// named Signedness values are resolved to the actual Signedness.
+/// @brief Make a key for the RenameMaps
+static RenameMapKey makeRenameMapKey(const std::string &Name, const Type* Ty, 
+                                     const Signedness &Sign) {
+  TypeInfo TI; 
+  TI.T = Ty; 
+  if (Sign.isNamed())
+    // Don't allow Named Signedness nodes because they won't match. The actual
+    // Signedness must be looked up in the NamedTypeSigns map.
+    TI.S.copy(CurModule.NamedTypeSigns[Sign.getName()]);
+  else
+    TI.S.copy(Sign);
+  return std::make_pair(Name, TI);
+}
+
 
 //===----------------------------------------------------------------------===//
 //               Code to handle definitions of all the types
@@ -233,7 +257,6 @@
     break;
   case ValID::NameVal:                 // Is it a named definition?
     if (const Type *N = CurModule.CurrentModule->getTypeByName(D.Name)) {
-      D.destroy();  // Free old strdup'd memory...
       return N;
     }
     break;
@@ -248,7 +271,6 @@
   //
   if (DoNotImprovise) return 0;  // Do we just want a null to be returned?
 
-
   if (inFunctionScope()) {
     if (D.Type == ValID::NameVal) {
       error("Reference to an undefined type: '" + D.getName() + "'");
@@ -266,13 +288,94 @@
   Type *Typ = OpaqueType::get();
   CurModule.LateResolveTypes.insert(std::make_pair(D, Typ));
   return Typ;
- }
+}
+
+/// This is like the getType method except that instead of looking up the type
+/// for a given ID, it looks up that type's sign.
+/// @brief Get the signedness of a referenced type
+static Signedness getTypeSign(const ValID &D) {
+  switch (D.Type) {
+  case ValID::NumberVal:               // Is it a numbered definition?
+    // Module constants occupy the lowest numbered slots...
+    if ((unsigned)D.Num < CurModule.TypeSigns.size()) {
+      return CurModule.TypeSigns[(unsigned)D.Num];
+    }
+    break;
+  case ValID::NameVal: {               // Is it a named definition?
+    std::map<std::string,Signedness>::const_iterator I = 
+      CurModule.NamedTypeSigns.find(D.Name);
+    if (I != CurModule.NamedTypeSigns.end())
+      return I->second;
+    // Perhaps its a named forward .. just cache the name
+    Signedness S;
+    S.makeNamed(D.Name);
+    return S;
+  }
+  default: 
+    break;
+  }
+  // If we don't find it, its signless
+  Signedness S;
+  S.makeSignless();
+  return S;
+}
+
+/// This function is analagous to getElementType in LLVM. It provides the same
+/// function except that it looks up the Signedness instead of the type. This is
+/// used when processing GEP instructions that need to extract the type of an
+/// indexed struct/array/ptr member. 
+/// @brief Look up an element's sign.
+static Signedness getElementSign(const ValueInfo& VI, 
+                                 const std::vector<Value*> &Indices) {
+  const Type *Ptr = VI.V->getType();
+  assert(isa<PointerType>(Ptr) && "Need pointer type");
+
+  unsigned CurIdx = 0;
+  Signedness S(VI.S);
+  while (const CompositeType *CT = dyn_cast<CompositeType>(Ptr)) {
+    if (CurIdx == Indices.size())
+      break;
+
+    Value *Index = Indices[CurIdx++];
+    assert(!isa<PointerType>(CT) || CurIdx == 1 && "Invalid type");
+    Ptr = CT->getTypeAtIndex(Index);
+    if (const Type* Ty = Ptr->getForwardedType())
+      Ptr = Ty;
+    assert(S.isComposite() && "Bad Signedness type");
+    if (isa<StructType>(CT)) {
+      S = S.get(cast<ConstantInt>(Index)->getZExtValue());
+    } else {
+      S = S.get(0UL);
+    }
+    if (S.isNamed())
+      S = CurModule.NamedTypeSigns[S.getName()];
+  }
+  Signedness Result;
+  Result.makeComposite(S);
+  return Result;
+}
+
+/// This function just translates a ConstantInfo into a ValueInfo and calls
+/// getElementSign(ValueInfo,...). Its just a convenience.
+/// @brief ConstantInfo version of getElementSign.
+static Signedness getElementSign(const ConstInfo& CI, 
+                                 const std::vector<Constant*> &Indices) {
+  ValueInfo VI;
+  VI.V = CI.C;
+  VI.S.copy(CI.S);
+  std::vector<Value*> Idx;
+  for (unsigned i = 0; i < Indices.size(); ++i)
+    Idx.push_back(Indices[i]);
+  Signedness result = getElementSign(VI, Idx);
+  VI.destroy();
+  return result;
+}
 
 /// This function determines if two function types differ only in their use of
 /// the sret parameter attribute in the first argument. If they are identical 
 /// in all other respects, it returns true. Otherwise, it returns false.
-bool FuncTysDifferOnlyBySRet(const FunctionType *F1, 
-                                   const FunctionType *F2) {
+static bool FuncTysDifferOnlyBySRet(const FunctionType *F1, 
+                                    const FunctionType *F2) {
   if (F1->getReturnType() != F2->getReturnType() ||
       F1->getNumParams() != F2->getNumParams() ||
       F1->getParamAttrs(0) != F2->getParamAttrs(0))
@@ -287,10 +390,27 @@
   return true;
 }
 
+/// This function determines if the type of V and Ty differ only by the SRet
+/// parameter attribute. This is a more generalized case of
+/// FuncTysDIfferOnlyBySRet since it doesn't require FunctionType arguments.
+static bool TypesDifferOnlyBySRet(Value *V, const Type* Ty) {
+  if (V->getType() == Ty)
+    return true;
+  const PointerType *PF1 = dyn_cast<PointerType>(Ty);
+  const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
+  if (PF1 && PF2) {
+    const FunctionType* FT1 = dyn_cast<FunctionType>(PF1->getElementType());
+    const FunctionType* FT2 = dyn_cast<FunctionType>(PF2->getElementType());
+    if (FT1 && FT2)
+      return FuncTysDifferOnlyBySRet(FT1, FT2);
+  }
+  return false;
+}
+
 // The upgrade of csretcc to sret param attribute may have caused a function 
 // to not be found because the param attribute changed the type of the called 
 // function. This helper function, used in getExistingValue, detects that
-// situation and returns V if it occurs and 0 otherwise. 
+// situation and bitcasts the function to the correct type.
 static Value* handleSRetFuncTypeMerge(Value *V, const Type* Ty) {
   // Handle degenerate cases
   if (!V)
@@ -298,23 +418,21 @@
   if (V->getType() == Ty)
     return V;
 
-  Value* Result = 0;
   const PointerType *PF1 = dyn_cast<PointerType>(Ty);
   const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
   if (PF1 && PF2) {
-    const FunctionType *FT1 =
-      dyn_cast<FunctionType>(PF1->getElementType());
-    const FunctionType *FT2 =
-      dyn_cast<FunctionType>(PF2->getElementType());
+    const FunctionType *FT1 = dyn_cast<FunctionType>(PF1->getElementType());
+    const FunctionType *FT2 = dyn_cast<FunctionType>(PF2->getElementType());
     if (FT1 && FT2 && FuncTysDifferOnlyBySRet(FT1, FT2))
       if (FT2->paramHasAttr(1, FunctionType::StructRetAttribute))
-        Result = V;
+        return V;
       else if (Constant *C = dyn_cast<Constant>(V))
-        Result = ConstantExpr::getBitCast(C, PF1);
+        return ConstantExpr::getBitCast(C, PF1);
       else
-        Result = new BitCastInst(V, PF1, "upgrd.cast", CurBB);
+        return new BitCastInst(V, PF1, "upgrd.cast", CurBB);
+      
   }
-  return Result;
+  return 0;
 }
 
 // getExistingValue - Look up the value specified by the provided type and
@@ -350,9 +468,8 @@
 
   case ValID::NameVal: {                // Is it a named definition?
     // Get the name out of the ID
-    std::string Name(D.Name);
-    Value* V = 0;
-    RenameMapKey Key = std::make_pair(Name, Ty);
+    RenameMapKey Key = makeRenameMapKey(D.Name, Ty, D.S);
+    Value *V = 0;
     if (inFunctionScope()) {
       // See if the name was renamed
       RenameMapType::const_iterator I = CurFun.RenameMap.find(Key);
@@ -360,10 +477,12 @@
       if (I != CurFun.RenameMap.end())
         LookupName = I->second;
       else
-        LookupName = Name;
+        LookupName = D.Name;
       ValueSymbolTable &SymTab = CurFun.CurrentFunction->getValueSymbolTable();
       V = SymTab.lookup(LookupName);
-      V = handleSRetFuncTypeMerge(V, Ty);
+      if (V && V->getType() != Ty)
+        V = handleSRetFuncTypeMerge(V, Ty);
+      assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type");
     }
     if (!V) {
       RenameMapType::const_iterator I = CurModule.RenameMap.find(Key);
@@ -371,9 +490,11 @@
       if (I != CurModule.RenameMap.end())
         LookupName = I->second;
       else
-        LookupName = Name;
+        LookupName = D.Name;
       V = CurModule.CurrentModule->getValueSymbolTable().lookup(LookupName);
-      V = handleSRetFuncTypeMerge(V, Ty);
+      if (V && V->getType() != Ty)
+        V = handleSRetFuncTypeMerge(V, Ty);
+      assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong type");
     }
     if (!V) 
       return 0;
@@ -506,14 +627,13 @@
     break;
   case ValID::NameVal:                  // Is it a named definition?
     Name = ID.Name;
-    if (Value *N = CurFun.CurrentFunction->
-                   getValueSymbolTable().lookup(Name)) {
+    if (Value *N = CurFun.CurrentFunction->getValueSymbolTable().lookup(Name)) {
       if (N->getType() != Type::LabelTy) {
         // Register names didn't use to conflict with basic block names
         // because of type planes. Now they all have to be unique. So, we just
         // rename the register and treat this name as if no basic block
         // had been found.
-        RenameMapKey Key = std::make_pair(N->getName(),N->getType());
+        RenameMapKey Key = makeRenameMapKey(ID.Name, N->getType(), ID.S);
         N->setName(makeNameUnique(N->getName()));
         CurModule.RenameMap[Key] = N->getName();
         BB = 0;
@@ -624,19 +744,33 @@
   LateResolvers.clear();
 }
 
-// ResolveTypeTo - A brand new type was just declared.  This means that (if
-// name is not null) things referencing Name can be resolved.  Otherwise, things
-// refering to the number can be resolved.  Do this now.
-//
-static void ResolveTypeTo(char *Name, const Type *ToTy) {
+/// This function is used for type resolution and upref handling. When a type
+/// becomes concrete, this function is called to adjust the signedness for the
+/// concrete type.
+static void ResolveTypeSign(const Type* oldTy, const Signedness &Sign) {
+  std::string TyName = CurModule.CurrentModule->getTypeName(oldTy);
+  if (!TyName.empty())
+    CurModule.NamedTypeSigns[TyName] = Sign;
+}
+
+/// ResolveTypeTo - A brand new type was just declared.  This means that (if
+/// name is not null) things referencing Name can be resolved.  Otherwise, 
+/// things refering to the number can be resolved.  Do this now.
+static void ResolveTypeTo(char *Name, const Type *ToTy, const Signedness& Sign){
   ValID D;
-  if (Name) D = ValID::create(Name);
-  else      D = ValID::create((int)CurModule.Types.size());
+  if (Name)
+    D = ValID::create(Name);
+  else      
+    D = ValID::create((int)CurModule.Types.size());
+  D.S.copy(Sign);
+
+  CurModule.NamedTypeSigns[Name] = Sign;
 
   std::map<ValID, PATypeHolder>::iterator I =
     CurModule.LateResolveTypes.find(D);
   if (I != CurModule.LateResolveTypes.end()) {
-    ((DerivedType*)I->second.get())->refineAbstractTypeTo(ToTy);
+    const Type *OldTy = I->second.get();
+    ((DerivedType*)OldTy)->refineAbstractTypeTo(ToTy);
     CurModule.LateResolveTypes.erase(I);
   }
 }
@@ -696,12 +830,12 @@
 // null potentially, in which case this is a noop.  The string passed in is
 // assumed to be a malloc'd string buffer, and is free'd by this function.
 //
-static void setValueName(Value *V, char *NameStr) {
+static void setValueName(const ValueInfo &V, char *NameStr) {
   if (NameStr) {
     std::string Name(NameStr);      // Copy string
     free(NameStr);                  // Free old string
 
-    if (V->getType() == Type::VoidTy) {
+    if (V.V->getType() == Type::VoidTy) {
       error("Can't assign name '" + Name + "' to value with void type");
       return;
     }
@@ -714,13 +848,13 @@
     if (Existing) {
       // An existing value of the same name was found. This might have happened
       // because of the integer type planes collapsing in LLVM 2.0. 
-      if (Existing->getType() == V->getType() &&
+      if (Existing->getType() == V.V->getType() &&
           !TypeHasInteger(Existing->getType())) {
         // If the type does not contain any integers in them then this can't be
         // a type plane collapsing issue. It truly is a redefinition and we 
         // should error out as the assembly is invalid.
         error("Redefinition of value named '" + Name + "' of type '" +
-              V->getType()->getDescription() + "'");
+              V.V->getType()->getDescription() + "'");
         return;
       } 
       // In LLVM 2.0 we don't allow names to be re-used for any values in a 
@@ -734,13 +868,13 @@
       // We're changing the name but it will probably be used by other 
       // instructions as operands later on. Consequently we have to retain
       // a mapping of the renaming that we're doing.
-      RenameMapKey Key = std::make_pair(Name,V->getType());
+      RenameMapKey Key = makeRenameMapKey(Name, V.V->getType(), V.S);
       CurFun.RenameMap[Key] = NewName;
       Name = NewName;
     }
 
     // Set the name.
-    V->setName(Name);
+    V.V->setName(Name);
   }
 }
 
@@ -749,7 +883,8 @@
 static GlobalVariable *
 ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage,
                     bool isConstantGlobal, const Type *Ty,
-                    Constant *Initializer) {
+                    Constant *Initializer,
+                    const Signedness &Sign) {
   if (isa<FunctionType>(Ty))
     error("Cannot declare global vars of function type");
 
@@ -769,6 +904,7 @@
   } else {
     ID = ValID::create((int)CurModule.Values[PTy].size());
   }
+  ID.S.makeComposite(Sign);
 
   if (GlobalValue *FWGV = CurModule.GetForwardRefForGlobal(PTy, ID)) {
     // Move the global to the end of the list, from whereever it was
@@ -794,13 +930,7 @@
       // There is alread a global of the same name which means there is a
       // conflict. Let's see what we can do about it.
       std::string NewName(makeNameUnique(Name));
-      if (Linkage == GlobalValue::InternalLinkage) {
-        // The linkage type is internal so just warn about the rename without
-        // invoking "scarey language" about linkage failures. GVars with
-        // InternalLinkage can be renamed at will.
-        warning("Global variable '" + Name + "' was renamed to '"+ 
-                NewName + "'");
-      } else {
+      if (Linkage != GlobalValue::InternalLinkage) {
         // The linkage of this gval is external so we can't reliably rename 
         // it because it could potentially create a linking problem.  
         // However, we can't leave the name conflict in the output either or 
@@ -811,7 +941,7 @@
       }
 
       // Put the renaming in the global rename map
-      RenameMapKey Key = std::make_pair(Name,PointerType::get(Ty));
+      RenameMapKey Key = makeRenameMapKey(Name, PointerType::get(Ty), ID.S);
       CurModule.RenameMap[Key] = NewName;
 
       // Rename it
@@ -824,6 +954,8 @@
     new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer, Name,
                        CurModule.CurrentModule);
   InsertValue(GV, CurModule.Values);
+  // Remember the sign of this global.
+  CurModule.NamedValueSigns[Name] = ID.S;
   return GV;
 }
 
@@ -834,21 +966,26 @@
 // This function returns true if the type has already been defined, but is
 // allowed to be redefined in the specified context.  If the name is a new name
 // for the type plane, it is inserted and false is returned.
-static bool setTypeName(const Type *T, char *NameStr) {
+static bool setTypeName(const PATypeInfo& TI, char *NameStr) {
   assert(!inFunctionScope() && "Can't give types function-local names");
   if (NameStr == 0) return false;
  
   std::string Name(NameStr);      // Copy string
   free(NameStr);                  // Free old string
 
+  const Type* Ty = TI.PAT->get();
+
   // We don't allow assigning names to void type
-  if (T == Type::VoidTy) {
+  if (Ty == Type::VoidTy) {
     error("Can't assign name '" + Name + "' to the void type");
     return false;
   }
 
   // Set the type name, checking for conflicts as we do so.
-  bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name, T);
+  bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name, Ty);
+
+  // Save the sign information for later use 
+  CurModule.NamedTypeSigns[Name] = TI.S;
 
   if (AlreadyExists) {   // Inserting a name that is already defined???
     const Type *Existing = CurModule.CurrentModule->getTypeByName(Name);
@@ -858,7 +995,7 @@
     // opaque type.  In this case, Existing will be an opaque type.
     if (const OpaqueType *OpTy = dyn_cast<OpaqueType>(Existing)) {
       // We ARE replacing an opaque type!
-      const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(T);
+      const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(Ty);
       return true;
     }
 
@@ -866,11 +1003,11 @@
     // the redefinition is identical to the original. This will be so if
     // Existing and T point to the same Type object. In this one case we
     // allow the equivalent redefinition.
-    if (Existing == T) return true;  // Yes, it's equal.
+    if (Existing == Ty) return true;  // Yes, it's equal.
 
     // Any other kind of (non-equivalent) redefinition is an error.
     error("Redefinition of type named '" + Name + "' in the '" +
-          T->getDescription() + "' type plane");
+          Ty->getDescription() + "' type plane");
   }
 
   return false;
@@ -902,7 +1039,7 @@
     OpaqueType *UpRefTy;
 
     UpRefRecord(unsigned NL, OpaqueType *URTy)
-      : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) {}
+      : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) { }
   };
 }
 
@@ -916,7 +1053,7 @@
 /// count reaches zero, the upreferenced type is the type that is passed in:
 /// thus we can complete the cycle.
 ///
-static PATypeHolder HandleUpRefs(const Type *ty) {
+static PATypeHolder HandleUpRefs(const Type *ty, const Signedness& Sign) {
   // If Ty isn't abstract, or if there are no up-references in it, then there is
   // nothing to resolve here.
   if (!ty->isAbstract() || UpRefs.empty()) return ty;
@@ -932,10 +1069,11 @@
   // this variable.
   OpaqueType *TypeToResolve = 0;
 
-  for (unsigned i = 0; i != UpRefs.size(); ++i) {
+  unsigned i = 0;
+  for (; i != UpRefs.size(); ++i) {
     UR_OUT("  UR#" << i << " - TypeContains(" << Ty->getDescription() << ", "
-           << UpRefs[i].second->getDescription() << ") = "
-           << (TypeContains(Ty, UpRefs[i].second) ? "true" : "false") << "\n");
+           << UpRefs[i].UpRefTy->getDescription() << ") = "
+           << (TypeContains(Ty, UpRefs[i].UpRefTy) ? "true" : "false") << "\n");
     if (TypeContains(Ty, UpRefs[i].LastContainedTy)) {
       // Decrement level of upreference
       unsigned Level = --UpRefs[i].NestingLevel;
@@ -946,8 +1084,9 @@
           TypeToResolve = UpRefs[i].UpRefTy;
         } else {
           UR_OUT("  * Resolving upreference for "
-                 << UpRefs[i].second->getDescription() << "\n";
-                 std::string OldName = UpRefs[i].UpRefTy->getDescription());
+                 << UpRefs[i].UpRefTy->getDescription() << "\n";
+          std::string OldName = UpRefs[i].UpRefTy->getDescription());
+          ResolveTypeSign(UpRefs[i].UpRefTy, Sign);
           UpRefs[i].UpRefTy->refineAbstractTypeTo(TypeToResolve);
           UR_OUT("  * Type '" << OldName << "' refined upreference to: "
                  << (const void*)Ty << ", " << Ty->getDescription() << "\n");
@@ -960,14 +1099,113 @@
 
   if (TypeToResolve) {
     UR_OUT("  * Resolving upreference for "
-           << UpRefs[i].second->getDescription() << "\n";
+           << UpRefs[i].UpRefTy->getDescription() << "\n";
            std::string OldName = TypeToResolve->getDescription());
+    ResolveTypeSign(TypeToResolve, Sign);
     TypeToResolve->refineAbstractTypeTo(Ty);
   }
 
   return Ty;
 }
 
+bool Signedness::operator<(const Signedness &that) const {
+  if (isNamed()) {
+    if (that.isNamed()) 
+      return *(this->name) < *(that.name);
+    else
+      return CurModule.NamedTypeSigns[*name] < that;
+  } else if (that.isNamed()) {
+    return *this < CurModule.NamedTypeSigns[*that.name];
+  }
+
+  if (isComposite() && that.isComposite()) {
+    if (sv->size() == that.sv->size()) {
+      SignVector::const_iterator thisI = sv->begin(), thisE = sv->end();
+      SignVector::const_iterator thatI = that.sv->begin(), 
+                                 thatE = that.sv->end();
+      for (; thisI != thisE; ++thisI, ++thatI) {
+        if (*thisI < *thatI)
+          return true;
+        else if (!(*thisI == *thatI))
+          return false;
+      }
+      return false;
+    }
+    return sv->size() < that.sv->size();
+  }  
+  return kind < that.kind;
+}
+
+bool Signedness::operator==(const Signedness &that) const {
+  if (isNamed())
+    if (that.isNamed())
+      return *(this->name) == *(that.name);
+    else 
+      return CurModule.NamedTypeSigns[*(this->name)] == that;
+  else if (that.isNamed())
+    return *this == CurModule.NamedTypeSigns[*(that.name)];
+  if (isComposite() && that.isComposite()) {
+    if (sv->size() == that.sv->size()) {
+      SignVector::const_iterator thisI = sv->begin(), thisE = sv->end();
+      SignVector::const_iterator thatI = that.sv->begin(), 
+                                 thatE = that.sv->end();
+      for (; thisI != thisE; ++thisI, ++thatI) {
+        if (!(*thisI == *thatI))
+          return false;
+      }
+      return true;
+    }
+    return false;
+  }
+  return kind == that.kind;
+}
+
+void Signedness::copy(const Signedness &that) {
+  if (that.isNamed()) {
+    kind = Named;
+    name = new std::string(*that.name);
+  } else if (that.isComposite()) {
+    kind = Composite;
+    sv = new SignVector();
+    *sv = *that.sv;
+  } else {
+    kind = that.kind;
+    sv = 0;
+  }
+}
+
+void Signedness::destroy() {
+  if (isNamed()) {
+    delete name;
+  } else if (isComposite()) {
+    delete sv;
+  } 
+}
+
+void Signedness::dump() const {
+  if (isComposite()) {
+    if (sv->size() == 1) {
+      (*sv)[0].dump();
+      std::cerr << "*";
+    } else {
+      std::cerr << "{ " ;
+      for (unsigned i = 0; i < sv->size(); ++i) {
+        if (i != 0)
+          std::cerr << ", ";
+        (*sv)[i].dump();
+      }
+      std::cerr << "} " ;
+    }
+  } else if (isNamed()) {
+    std::cerr << *name;
+  } else if (isSigned()) {
+    std::cerr << "S";
+  } else if (isUnsigned()) {
+    std::cerr << "U";
+  } else
+    std::cerr << ".";
+}
+
 static inline Instruction::TermOps 
 getTermOp(TermOps op) {
   switch (op) {
@@ -982,7 +1220,7 @@
 }
 
 static inline Instruction::BinaryOps 
-getBinaryOp(BinaryOps op, const Type *Ty, Signedness Sign) {
+getBinaryOp(BinaryOps op, const Type *Ty, const Signedness& Sign) {
   switch (op) {
     default     : assert(0 && "Invalid OldBinaryOps");
     case SetEQ  : 
@@ -1003,7 +1241,7 @@
         isFP = PTy->getElementType()->isFloatingPoint();
       if (isFP)
         return Instruction::FDiv;
-      else if (Sign == Signed)
+      else if (Sign.isSigned())
         return Instruction::SDiv;
       return Instruction::UDiv;
     }
@@ -1020,7 +1258,7 @@
       // Select correct opcode
       if (isFP)
         return Instruction::FRem;
-      else if (Sign == Signed)
+      else if (Sign.isSigned())
         return Instruction::SRem;
       return Instruction::URem;
     }
@@ -1031,7 +1269,7 @@
     case AShrOp : return Instruction::AShr;
     case ShlOp  : return Instruction::Shl;
     case ShrOp  : 
-      if (Sign == Signed)
+      if (Sign.isSigned())
         return Instruction::AShr;
       return Instruction::LShr;
     case AndOp  : return Instruction::And;
@@ -1042,8 +1280,8 @@
 
 static inline Instruction::OtherOps 
 getCompareOp(BinaryOps op, unsigned short &predicate, const Type* &Ty,
-             Signedness Sign) {
-  bool isSigned = Sign == Signed;
+             const Signedness &Sign) {
+  bool isSigned = Sign.isSigned();
   bool isFP = Ty->isFloatingPoint();
   switch (op) {
     default     : assert(0 && "Invalid OldSetCC");
@@ -1123,7 +1361,7 @@
 }
 
 static inline Instruction::OtherOps 
-getOtherOp(OtherOps op, Signedness Sign) {
+getOtherOp(OtherOps op, const Signedness &Sign) {
   switch (op) {
     default               : assert(0 && "Invalid OldOtherOps");
     case PHIOp            : return Instruction::PHI;
@@ -1141,8 +1379,8 @@
 }
 
 static inline Value*
-getCast(CastOps op, Value *Src, Signedness SrcSign, const Type *DstTy, 
-        Signedness DstSign, bool ForceInstruction = false) {
+getCast(CastOps op, Value *Src, const Signedness &SrcSign, const Type *DstTy, 
+        const Signedness &DstSign, bool ForceInstruction = false) {
   Instruction::CastOps Opcode;
   const Type* SrcTy = Src->getType();
   if (op == CastOp) {
@@ -1179,7 +1417,8 @@
     }
     // Determine the opcode to use by calling CastInst::getCastOpcode
     Opcode = 
-      CastInst::getCastOpcode(Src, SrcSign == Signed, DstTy, DstSign == Signed);
+      CastInst::getCastOpcode(Src, SrcSign.isSigned(), DstTy, 
+                              DstSign.isSigned());
 
   } else switch (op) {
     default: assert(0 && "Invalid cast token");
@@ -1271,7 +1510,7 @@
       // all indices for SequentialType elements. We must retain the same 
       // semantic (zext) for unsigned types.
       if (const IntegerType *Ity = dyn_cast<IntegerType>(Index->getType()))
-        if (Ity->getBitWidth() < 64 && (*Indices)[i].S == Unsigned) {
+        if (Ity->getBitWidth() < 64 && (*Indices)[i].S.isUnsigned()) {
           if (CIndices)
             Index = ConstantExpr::getCast(Instruction::ZExt, 
               cast<Constant>(Index), Type::Int64Ty);
@@ -1456,7 +1695,7 @@
   llvm::Function                         *FunctionVal;
   std::pair<llvm::PATypeInfo, char*>     *ArgVal;
   llvm::BasicBlock                       *BasicBlockVal;
-  llvm::TerminatorInst                   *TermInstVal;
+  llvm::TermInstInfo                     TermInstVal;
   llvm::InstrInfo                        InstVal;
   llvm::ConstInfo                        ConstVal;
   llvm::ValueInfo                        ValueVal;
@@ -1769,7 +2008,7 @@
   : Types
   | VOID { 
     $$.PAT = new PATypeHolder($1.T); 
-    $$.S = Signless;
+    $$.S.makeSignless();
   }
   ;
 
@@ -1777,7 +2016,7 @@
   : UpRTypes 
   | VOID { 
     $$.PAT = new PATypeHolder($1.T); 
-    $$.S = Signless;
+    $$.S.makeSignless();
   }
   ;
 
@@ -1798,16 +2037,16 @@
 UpRTypes 
   : PrimType { 
     $$.PAT = new PATypeHolder($1.T);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
   }
   | OPAQUE {
     $$.PAT = new PATypeHolder(OpaqueType::get());
-    $$.S = Signless;
+    $$.S.makeSignless();
   }
   | SymbolicValueRef {            // Named types are also simple types...
+    $$.S.copy(getTypeSign($1));
     const Type* tmp = getType($1);
     $$.PAT = new PATypeHolder(tmp);
-    $$.S = Signless; // FIXME: what if its signed?
   }
   | '\\' EUINT64VAL {                   // Type UpReference
     if ($2 > (uint64_t)~0U) 
@@ -1815,14 +2054,16 @@
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
     UpRefs.push_back(UpRefRecord((unsigned)$2, OT));  // Add to vector...
     $$.PAT = new PATypeHolder(OT);
-    $$.S = Signless;
+    $$.S.makeSignless();
     UR_OUT("New Upreference!\n");
   }
   | UpRTypesV '(' ArgTypeListI ')' {           // Function derived type?
+    $$.S.makeComposite($1.S);
     std::vector<const Type*> Params;
     for (std::list<llvm::PATypeInfo>::iterator I = $3->begin(),
            E = $3->end(); I != E; ++I) {
       Params.push_back(I->PAT->get());
+      $$.S.add(I->S);
     }
     FunctionType::ParamAttrsList ParamAttrs;
     bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
@@ -1830,63 +2071,67 @@
 
     $$.PAT = new PATypeHolder(
       HandleUpRefs(FunctionType::get($1.PAT->get(), Params, isVarArg, 
-                   ParamAttrs)));
-    $$.S = $1.S;
-    delete $1.PAT;    // Delete the return type handle
+                   ParamAttrs), $$.S));
+    delete $1.PAT;  // Delete the return type handle
     delete $3;      // Delete the argument list
   }
   | '[' EUINT64VAL 'x' UpRTypes ']' {          // Sized array type?
+    $$.S.makeComposite($4.S);
     $$.PAT = new PATypeHolder(HandleUpRefs(ArrayType::get($4.PAT->get(), 
-                                                        (unsigned)$2)));
-    $$.S = $4.S;
+                                           (unsigned)$2), $$.S));
     delete $4.PAT;
   }
   | '<' EUINT64VAL 'x' UpRTypes '>' {          // Vector type?
-     const llvm::Type* ElemTy = $4.PAT->get();
-     if ((unsigned)$2 != $2)
-        error("Unsigned result not equal to signed result");
-     if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
-        error("Elements of a VectorType must be integer or floating point");
-     if (!isPowerOf2_32($2))
-       error("VectorType length should be a power of 2");
-     $$.PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy, 
-                                          (unsigned)$2)));
-     $$.S = $4.S;
-     delete $4.PAT;
+    const llvm::Type* ElemTy = $4.PAT->get();
+    if ((unsigned)$2 != $2)
+       error("Unsigned result not equal to signed result");
+    if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
+       error("Elements of a VectorType must be integer or floating point");
+    if (!isPowerOf2_32($2))
+      error("VectorType length should be a power of 2");
+    $$.S.makeComposite($4.S);
+    $$.PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy, 
+                                         (unsigned)$2), $$.S));
+    delete $4.PAT;
   }
   | '{' TypeListI '}' {                        // Structure type?
     std::vector<const Type*> Elements;
+    $$.S.makeComposite();
     for (std::list<llvm::PATypeInfo>::iterator I = $2->begin(),
-           E = $2->end(); I != E; ++I)
+           E = $2->end(); I != E; ++I) {
       Elements.push_back(I->PAT->get());
-    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements)));
-    $$.S = Signless;
+      $$.S.add(I->S);
+    }
+    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements), $$.S));
     delete $2;
   }
   | '{' '}' {                                  // Empty structure type?
     $$.PAT = new PATypeHolder(StructType::get(std::vector<const Type*>()));
-    $$.S = Signless;
+    $$.S.makeComposite();
   }
   | '<' '{' TypeListI '}' '>' {                // Packed Structure type?
+    $$.S.makeComposite();
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeInfo>::iterator I = $3->begin(),
            E = $3->end(); I != E; ++I) {
       Elements.push_back(I->PAT->get());
+      $$.S.add(I->S);
       delete I->PAT;
     }
-    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true)));
-    $$.S = Signless;
+    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get(Elements, true), 
+                                           $$.S));
     delete $3;
   }
   | '<' '{' '}' '>' {                          // Empty packed structure type?
     $$.PAT = new PATypeHolder(StructType::get(std::vector<const Type*>(),true));
-    $$.S = Signless;
+    $$.S.makeComposite();
   }
   | UpRTypes '*' {                             // Pointer type?
     if ($1.PAT->get() == Type::LabelTy)
       error("Cannot form a pointer to a basic block");
-    $$.PAT = new PATypeHolder(HandleUpRefs(PointerType::get($1.PAT->get())));
-    $$.S = $1.S;
+    $$.S.makeComposite($1.S);
+    $$.PAT = new PATypeHolder(HandleUpRefs(PointerType::get($1.PAT->get()),
+                                           $$.S));
     delete $1.PAT;
   }
   ;
@@ -1910,14 +2155,14 @@
   | TypeListI ',' DOTDOTDOT {
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
-    VoidTI.S = Signless;
+    VoidTI.S.makeSignless();
     ($$=$1)->push_back(VoidTI);
   }
   | DOTDOTDOT {
     $$ = new std::list<PATypeInfo>();
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
-    VoidTI.S = Signless;
+    VoidTI.S.makeSignless();
     $$->push_back(VoidTI);
   }
   | /*empty*/ {
@@ -1958,7 +2203,7 @@
       Elems.push_back(C);
     }
     $$.C = ConstantArray::get(ATy, Elems);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT; 
     delete $3;
   }
@@ -1972,7 +2217,7 @@
       error("Type mismatch: constant sized array initialized with 0"
             " arguments, but has size of " + itostr(NumElements) +"");
     $$.C = ConstantArray::get(ATy, std::vector<Constant*>());
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | Types 'c' STRINGCONSTANT {
@@ -1995,7 +2240,7 @@
       Vals.push_back(ConstantInt::get(ETy, *C));
     free($3);
     $$.C = ConstantArray::get(ATy, Vals);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | Types '<' ConstVector '>' { // Nonempty unsized arr
@@ -2022,7 +2267,7 @@
       Elems.push_back(C);
     }
     $$.C = ConstantVector::get(PTy, Elems);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
     delete $3;
   }
@@ -2044,7 +2289,7 @@
       Fields.push_back(C);
     }
     $$.C = ConstantStruct::get(STy, Fields);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
     delete $3;
   }
@@ -2056,7 +2301,7 @@
     if (STy->getNumContainedTypes() != 0)
       error("Illegal number of initializers for structure type");
     $$.C = ConstantStruct::get(STy, std::vector<Constant*>());
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | Types '<' '{' ConstVector '}' '>' {
@@ -2077,7 +2322,7 @@
       Fields.push_back(C);
     }
     $$.C = ConstantStruct::get(STy, Fields);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT; 
     delete $4;
   }
@@ -2089,7 +2334,7 @@
     if (STy->getNumContainedTypes() != 0)
       error("Illegal number of initializers for packed structure type");
     $$.C = ConstantStruct::get(STy, std::vector<Constant*>());
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | Types NULL_TOK {
@@ -2098,12 +2343,12 @@
       error("Cannot make null pointer constant with type: '" + 
             $1.PAT->get()->getDescription() + "'");
     $$.C = ConstantPointerNull::get(PTy);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | Types UNDEF {
     $$.C = UndefValue::get($1.PAT->get());
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | Types SymbolicValueRef {
@@ -2121,6 +2366,7 @@
     //
     Function *SavedCurFn = CurFun.CurrentFunction;
     CurFun.CurrentFunction = 0;
+    $2.S.copy($1.S);
     Value *V = getExistingValue(Ty, $2);
     CurFun.CurrentFunction = SavedCurFn;
 
@@ -2161,14 +2407,14 @@
       }
     }
     $$.C = cast<GlobalValue>(V);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;            // Free the type handle
   }
   | Types ConstExpr {
     if ($1.PAT->get() != $2.C->getType())
       error("Mismatched types for constant expression");
     $$ = $2;
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | Types ZEROINITIALIZER {
@@ -2176,7 +2422,7 @@
     if (isa<FunctionType>(Ty) || Ty == Type::LabelTy || isa<OpaqueType>(Ty))
       error("Cannot create a null initialized value of this type");
     $$.C = Constant::getNullValue(Ty);
-    $$.S = $1.S;
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   | SIntType EINT64VAL {      // integral constants
@@ -2184,28 +2430,28 @@
     if (!ConstantInt::isValueValidForType(Ty, $2))
       error("Constant value doesn't fit in type");
     $$.C = ConstantInt::get(Ty, $2);
-    $$.S = Signed;
+    $$.S.makeSigned();
   }
   | UIntType EUINT64VAL {            // integral constants
     const Type *Ty = $1.T;
     if (!ConstantInt::isValueValidForType(Ty, $2))
       error("Constant value doesn't fit in type");
     $$.C = ConstantInt::get(Ty, $2);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
   }
   | BOOL TRUETOK {                      // Boolean constants
     $$.C = ConstantInt::get(Type::Int1Ty, true);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
   }
   | BOOL FALSETOK {                     // Boolean constants
     $$.C = ConstantInt::get(Type::Int1Ty, false);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
   }
   | FPType FPVAL {                   // Float & Double constants
     if (!ConstantFP::isValueValidForType($1.T, $2))
       error("Floating point constant invalid for type");
     $$.C = ConstantFP::get($1.T, $2);
-    $$.S = Signless;
+    $$.S.makeSignless();
   }
   ;
 
@@ -2213,8 +2459,8 @@
   : CastOps '(' ConstVal TO Types ')' {
     const Type* SrcTy = $3.C->getType();
     const Type* DstTy = $5.PAT->get();
-    Signedness SrcSign = $3.S;
-    Signedness DstSign = $5.S;
+    Signedness SrcSign($3.S);
+    Signedness DstSign($5.S);
     if (!SrcTy->isFirstClassType())
       error("cast constant expression from a non-primitive type: '" +
             SrcTy->getDescription() + "'");
@@ -2222,7 +2468,7 @@
       error("cast constant expression to a non-primitive type: '" +
             DstTy->getDescription() + "'");
     $$.C = cast<Constant>(getCast($1, $3.C, SrcSign, DstTy, DstSign));
-    $$.S = DstSign;
+    $$.S.copy(DstSign);
     delete $5.PAT;
   }
   | GETELEMENTPTR '(' ConstVal IndexList ')' {
@@ -2236,7 +2482,7 @@
 
     delete $4;
     $$.C = ConstantExpr::getGetElementPtr($3.C, &CIndices[0], CIndices.size());
-    $$.S = Signless;
+    $$.S.copy(getElementSign($3, CIndices));
   }
   | SELECT '(' ConstVal ',' ConstVal ',' ConstVal ')' {
     if (!$3.C->getType()->isInteger() ||
@@ -2245,7 +2491,7 @@
     if ($5.C->getType() != $7.C->getType())
       error("Select operand types must match");
     $$.C = ConstantExpr::getSelect($3.C, $5.C, $7.C);
-    $$.S = Unsigned;
+    $$.S.copy($5.S);
   }
   | ArithmeticOps '(' ConstVal ',' ConstVal ')' {
     const Type *Ty = $3.C->getType();
@@ -2273,7 +2519,7 @@
              ConstantExpr::getCast(Instruction::PtrToInt, $5.C, IntPtrTy));
       $$.C = ConstantExpr::getCast(Instruction::IntToPtr, $$.C, Ty);
     }
-    $$.S = $3.S; 
+    $$.S.copy($3.S); 
   }
   | LogicalOps '(' ConstVal ',' ConstVal ')' {
     const Type* Ty = $3.C->getType();
@@ -2286,7 +2532,7 @@
     }
     Instruction::BinaryOps Opcode = getBinaryOp($1, Ty, $3.S);
     $$.C = ConstantExpr::get(Opcode, $3.C, $5.C);
-    $$.S = $3.S;
+    $$.S.copy($3.S);
   }
   | SetCondOps '(' ConstVal ',' ConstVal ')' {
     const Type* Ty = $3.C->getType();
@@ -2295,19 +2541,19 @@
     unsigned short pred;
     Instruction::OtherOps Opcode = getCompareOp($1, pred, Ty, $3.S);
     $$.C = ConstantExpr::getCompare(Opcode, $3.C, $5.C);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
   }
   | ICMP IPredicates '(' ConstVal ',' ConstVal ')' {
     if ($4.C->getType() != $6.C->getType()) 
       error("icmp operand types must match");
     $$.C = ConstantExpr::getCompare($2, $4.C, $6.C);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
   }
   | FCMP FPredicates '(' ConstVal ',' ConstVal ')' {
     if ($4.C->getType() != $6.C->getType()) 
       error("fcmp operand types must match");
     $$.C = ConstantExpr::getCompare($2, $4.C, $6.C);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
   }
   | ShiftOps '(' ConstVal ',' ConstVal ')' {
     if (!$5.C->getType()->isInteger() ||
@@ -2318,25 +2564,25 @@
       error("Shift constant expression requires integer operand");
     Constant *ShiftAmt = ConstantExpr::getZExt($5.C, Ty);
     $$.C = ConstantExpr::get(getBinaryOp($1, Ty, $3.S), $3.C, ShiftAmt);
-    $$.S = $3.S;
+    $$.S.copy($3.S);
   }
   | EXTRACTELEMENT '(' ConstVal ',' ConstVal ')' {
     if (!ExtractElementInst::isValidOperands($3.C, $5.C))
       error("Invalid extractelement operands");
     $$.C = ConstantExpr::getExtractElement($3.C, $5.C);
-    $$.S = $3.S;
+    $$.S.copy($3.S.get(0));
   }
   | INSERTELEMENT '(' ConstVal ',' ConstVal ',' ConstVal ')' {
     if (!InsertElementInst::isValidOperands($3.C, $5.C, $7.C))
       error("Invalid insertelement operands");
     $$.C = ConstantExpr::getInsertElement($3.C, $5.C, $7.C);
-    $$.S = $3.S;
+    $$.S.copy($3.S);
   }
   | SHUFFLEVECTOR '(' ConstVal ',' ConstVal ',' ConstVal ')' {
     if (!ShuffleVectorInst::isValidOperands($3.C, $5.C, $7.C))
       error("Invalid shufflevector operands");
     $$.C = ConstantExpr::getShuffleVector($3.C, $5.C, $7.C);
-    $$.S = $3.S;
+    $$.S.copy($3.S);
   }
   ;
 
@@ -2405,13 +2651,13 @@
     // If types are not resolved eagerly, then the two types will not be
     // determined to be the same type!
     //
-    const Type* Ty = $4.PAT->get();
-    ResolveTypeTo($2, Ty);
+    ResolveTypeTo($2, $4.PAT->get(), $4.S);
 
-    if (!setTypeName(Ty, $2) && !$2) {
-      // If this is a named type that is not a redefinition, add it to the slot
-      // table.
-      CurModule.Types.push_back(Ty);
+    if (!setTypeName($4, $2) && !$2) {
+      // If this is a numbered type that is not a redefinition, add it to the 
+      // slot table.
+      CurModule.Types.push_back($4.PAT->get());
+      CurModule.TypeSigns.push_back($4.S);
     }
     delete $4.PAT;
   }
@@ -2422,20 +2668,22 @@
   | ConstPool OptAssign OptLinkage GlobalType ConstVal {
     if ($5.C == 0) 
       error("Global value initializer is not a constant");
-    CurGV = ParseGlobalVariable($2, $3, $4, $5.C->getType(), $5.C);
+    CurGV = ParseGlobalVariable($2, $3, $4, $5.C->getType(), $5.C, $5.S);
   } GlobalVarAttributes {
     CurGV = 0;
   }
   | ConstPool OptAssign EXTERNAL GlobalType Types {
     const Type *Ty = $5.PAT->get();
-    CurGV = ParseGlobalVariable($2, GlobalValue::ExternalLinkage, $4, Ty, 0);
+    CurGV = ParseGlobalVariable($2, GlobalValue::ExternalLinkage, $4, Ty, 0,
+                                $5.S);
     delete $5.PAT;
   } GlobalVarAttributes {
     CurGV = 0;
   }
   | ConstPool OptAssign DLLIMPORT GlobalType Types {
     const Type *Ty = $5.PAT->get();
-    CurGV = ParseGlobalVariable($2, GlobalValue::DLLImportLinkage, $4, Ty, 0);
+    CurGV = ParseGlobalVariable($2, GlobalValue::DLLImportLinkage, $4, Ty, 0,
+                                $5.S);
     delete $5.PAT;
   } GlobalVarAttributes {
     CurGV = 0;
@@ -2443,7 +2691,8 @@
   | ConstPool OptAssign EXTERN_WEAK GlobalType Types {
     const Type *Ty = $5.PAT->get();
     CurGV = 
-      ParseGlobalVariable($2, GlobalValue::ExternalWeakLinkage, $4, Ty, 0);
+      ParseGlobalVariable($2, GlobalValue::ExternalWeakLinkage, $4, Ty, 0, 
+                          $5.S);
     delete $5.PAT;
   } GlobalVarAttributes {
     CurGV = 0;
@@ -2553,14 +2802,14 @@
     $$ = $1;
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
-    VoidTI.S = Signless;
+    VoidTI.S.makeSignless();
     $$->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
   }
   | DOTDOTDOT {
     $$ = new std::vector<std::pair<PATypeInfo,char*> >();
     PATypeInfo VoidTI;
     VoidTI.PAT = new PATypeHolder(Type::VoidTy);
-    VoidTI.S = Signless;
+    VoidTI.S.makeSignless();
     $$->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
   }
   | /* empty */ { $$ = 0; }
@@ -2577,6 +2826,8 @@
     if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
       error("LLVM functions cannot return aggregate types");
 
+    Signedness FTySign;
+    FTySign.makeComposite($2.S);
     std::vector<const Type*> ParamTyList;
 
     // In LLVM 2.0 the signatures of three varargs intrinsics changed to take
@@ -2592,6 +2843,7 @@
            I = $5->begin(), E = $5->end(); I != E; ++I) {
         const Type *Ty = I->first.PAT->get();
         ParamTyList.push_back(Ty);
+        FTySign.add(I->first.S);
       }
     }
 
@@ -2618,6 +2870,7 @@
     } else {
       ID = ValID::create((int)CurModule.Values[PFT].size());
     }
+    ID.S.makeComposite(FTySign);
 
     Function *Fn = 0;
     Module* M = CurModule.CurrentModule;
@@ -2644,14 +2897,16 @@
           std::string NewName(makeNameUnique(FunctionName));
           if (Conflict->hasInternalLinkage()) {
             Conflict->setName(NewName);
-            RenameMapKey Key = std::make_pair(FunctionName,Conflict->getType());
+            RenameMapKey Key = 
+              makeRenameMapKey(FunctionName, Conflict->getType(), ID.S);
             CurModule.RenameMap[Key] = NewName;
             Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
             InsertValue(Fn, CurModule.Values);
           } else {
             Fn = new Function(FT, CurFun.Linkage, NewName, M);
             InsertValue(Fn, CurModule.Values);
-            RenameMapKey Key = std::make_pair(FunctionName,PFT);
+            RenameMapKey Key = 
+              makeRenameMapKey(FunctionName, PFT, ID.S);
             CurModule.RenameMap[Key] = NewName;
           }
         } else {
@@ -2673,9 +2928,11 @@
         // type plane. After PR411 was fixed, this is no loner the case. 
         // To resolve this we must rename one of the two. 
         if (Conflict->hasInternalLinkage()) {
-          // We can safely renamed the Conflict.
+          // We can safely rename the Conflict.
+          RenameMapKey Key = 
+            makeRenameMapKey(Conflict->getName(), Conflict->getType(), 
+              CurModule.NamedValueSigns[Conflict->getName()]);
           Conflict->setName(makeNameUnique(Conflict->getName()));
-          RenameMapKey Key = std::make_pair(FunctionName,Conflict->getType());
           CurModule.RenameMap[Key] = Conflict->getName();
           Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
           InsertValue(Fn, CurModule.Values);
@@ -2684,7 +2941,7 @@
           std::string NewName = makeNameUnique(FunctionName);
           Fn = new Function(FT, CurFun.Linkage, NewName, M);
           InsertValue(Fn, CurModule.Values);
-          RenameMapKey Key = std::make_pair(FunctionName,PFT);
+          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
           CurModule.RenameMap[Key] = NewName;
         } else {
           // We can't quietly rename either of these things, but we must
@@ -2695,7 +2952,7 @@
                   "' may cause linkage errors");
           Fn = new Function(FT, CurFun.Linkage, NewName, M);
           InsertValue(Fn, CurModule.Values);
-          RenameMapKey Key = std::make_pair(FunctionName,PFT);
+          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
           CurModule.RenameMap[Key] = NewName;
         }
       } else {
@@ -2734,7 +2991,8 @@
       std::vector<std::pair<PATypeInfo,char*> >::iterator E = $5->end();
       for ( ; I != E && ArgIt != ArgEnd; ++I, ++ArgIt) {
         delete I->first.PAT;                      // Delete the typeholder...
-        setValueName(ArgIt, I->second);           // Insert arg into symtab...
+        ValueInfo VI; VI.V = ArgIt; VI.S.copy(I->first.S); 
+        setValueName(VI, I->second);           // Insert arg into symtab...
         InsertValue(ArgIt);
       }
       delete $5;                     // We're now done with the argument list
@@ -2791,11 +3049,17 @@
 
 ConstValueRef 
     // A reference to a direct constant
-  : ESINT64VAL {    $$ = ValID::create($1); }
+  : ESINT64VAL { $$ = ValID::create($1); }
   | EUINT64VAL { $$ = ValID::create($1); }
   | FPVAL { $$ = ValID::create($1); } 
-  | TRUETOK { $$ = ValID::create(ConstantInt::get(Type::Int1Ty, true)); } 
-  | FALSETOK { $$ = ValID::create(ConstantInt::get(Type::Int1Ty, false)); }
+  | TRUETOK { 
+    $$ = ValID::create(ConstantInt::get(Type::Int1Ty, true));
+    $$.S.makeUnsigned();
+  }
+  | FALSETOK { 
+    $$ = ValID::create(ConstantInt::get(Type::Int1Ty, false)); 
+    $$.S.makeUnsigned();
+  }
   | NULL_TOK { $$ = ValID::createNull(); }
   | UNDEF { $$ = ValID::createUndef(); }
   | ZEROINITIALIZER { $$ = ValID::createZeroInit(); }
@@ -2803,8 +3067,8 @@
     const Type *ETy = (*$2)[0].C->getType();
     int NumElements = $2->size(); 
     VectorType* pt = VectorType::get(ETy, NumElements);
-    PATypeHolder* PTy = new PATypeHolder(
-      HandleUpRefs(VectorType::get(ETy, NumElements)));
+    $$.S.makeComposite((*$2)[0].S);
+    PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt, $$.S));
     
     // Verify all elements are correct type!
     std::vector<Constant*> Elems;
@@ -2822,6 +3086,7 @@
   }
   | ConstExpr {
     $$ = ValID::create($1.C);
+    $$.S.copy($1.S);
   }
   | ASM_TOK OptSideEffect STRINGCONSTANT ',' STRINGCONSTANT {
     char *End = UnEscapeLexed($3, true);
@@ -2834,12 +3099,11 @@
   }
   ;
 
-// SymbolicValueRef - Reference to one of two ways of symbolically refering to
-// another value.
+// SymbolicValueRef - Reference to one of two ways of symbolically refering to // another value.
 //
 SymbolicValueRef 
-  : INTVAL {  $$ = ValID::create($1); }
-  | Name   {  $$ = ValID::create($1); }
+  : INTVAL {  $$ = ValID::create($1); $$.S.makeSignless(); }
+  | Name   {  $$ = ValID::create($1); $$.S.makeSignless(); }
   ;
 
 // ValueRef - A reference to a definition... either constant or symbolic
@@ -2854,8 +3118,9 @@
 ResolvedVal 
   : Types ValueRef { 
     const Type *Ty = $1.PAT->get();
-    $$.S = $1.S;
+    $2.S.copy($1.S);
     $$.V = getVal(Ty, $2); 
+    $$.S.copy($1.S);
     delete $1.PAT;
   }
   ;
@@ -2874,9 +3139,10 @@
 //
 BasicBlock 
   : InstructionList OptAssign BBTerminatorInst  {
-    setValueName($3, $2);
-    InsertValue($3);
-    $1->getInstList().push_back($3);
+    ValueInfo VI; VI.V = $3.TI; VI.S.copy($3.S);
+    setValueName(VI, $2);
+    InsertValue($3.TI);
+    $1->getInstList().push_back($3.TI);
     InsertValue($1);
     $$ = $1;
   }
@@ -2889,7 +3155,7 @@
     $$ = $1;
   }
   | /* empty */ {
-    $$ = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++), true);
+    $$ = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++),true);
     // Make sure to move the basic block to the correct location in the
     // function, instead of leaving it inserted wherever it was first
     // referenced.
@@ -2912,26 +3178,36 @@
 
 BBTerminatorInst 
   : RET ResolvedVal {              // Return with a result...
-    $$ = new ReturnInst($2.V);
+    $$.TI = new ReturnInst($2.V);
+    $$.S.makeSignless();
   }
   | RET VOID {                                       // Return with no result...
-    $$ = new ReturnInst();
+    $$.TI = new ReturnInst();
+    $$.S.makeSignless();
   }
   | BR LABEL ValueRef {                         // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal($3);
-    $$ = new BranchInst(tmpBB);
+    $$.TI = new BranchInst(tmpBB);
+    $$.S.makeSignless();
   }                                                  // Conditional Branch...
   | BR BOOL ValueRef ',' LABEL ValueRef ',' LABEL ValueRef {  
+    $6.S.makeSignless();
+    $9.S.makeSignless();
     BasicBlock* tmpBBA = getBBVal($6);
     BasicBlock* tmpBBB = getBBVal($9);
+    $3.S.makeUnsigned();
     Value* tmpVal = getVal(Type::Int1Ty, $3);
-    $$ = new BranchInst(tmpBBA, tmpBBB, tmpVal);
+    $$.TI = new BranchInst(tmpBBA, tmpBBB, tmpVal);
+    $$.S.makeSignless();
   }
   | SWITCH IntType ValueRef ',' LABEL ValueRef '[' JumpTable ']' {
+    $3.S.copy($2.S);
     Value* tmpVal = getVal($2.T, $3);
+    $6.S.makeSignless();
     BasicBlock* tmpBB = getBBVal($6);
     SwitchInst *S = new SwitchInst(tmpVal, tmpBB, $8->size());
-    $$ = S;
+    $$.TI = S;
+    $$.S.makeSignless();
     std::vector<std::pair<Constant*,BasicBlock*> >::iterator I = $8->begin(),
       E = $8->end();
     for (; I != E; ++I) {
@@ -2943,24 +3219,31 @@
     delete $8;
   }
   | SWITCH IntType ValueRef ',' LABEL ValueRef '[' ']' {
+    $3.S.copy($2.S);
     Value* tmpVal = getVal($2.T, $3);
+    $6.S.makeSignless();
     BasicBlock* tmpBB = getBBVal($6);
     SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
-    $$ = S;
+    $$.TI = S;
+    $$.S.makeSignless();
   }
   | INVOKE OptCallingConv TypesV ValueRef '(' ValueRefListE ')'
     TO LABEL ValueRef Unwind LABEL ValueRef {
     const PointerType *PFTy;
     const FunctionType *Ty;
+    Signedness FTySign;
 
     if (!(PFTy = dyn_cast<PointerType>($3.PAT->get())) ||
         !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
+      FTySign.makeComposite($3.S);
       if ($6) {
         for (std::vector<ValueInfo>::iterator I = $6->begin(), E = $6->end();
-             I != E; ++I)
+             I != E; ++I) {
           ParamTypes.push_back((*I).V->getType());
+          FTySign.add(I->S);
+        }
       }
       FunctionType::ParamAttrsList ParamAttrs;
       if ($2 == OldCallingConv::CSRet) {
@@ -2971,14 +3254,19 @@
       if (isVarArg) ParamTypes.pop_back();
       Ty = FunctionType::get($3.PAT->get(), ParamTypes, isVarArg, ParamAttrs);
       PFTy = PointerType::get(Ty);
+      $$.S.copy($3.S);
+    } else {
+      FTySign = $3.S;
+      $$.S.copy($3.S.get(0)); // 0th element of FuncTy sign is result ty
     }
+    $4.S.makeComposite(FTySign);
     Value *V = getVal(PFTy, $4);   // Get the function we're calling...
     BasicBlock *Normal = getBBVal($10);
     BasicBlock *Except = getBBVal($13);
 
     // Create the call node...
     if (!$6) {                                   // Has no arguments?
-      $$ = new InvokeInst(V, Normal, Except, 0, 0);
+      $$.TI = new InvokeInst(V, Normal, Except, 0, 0);
     } else {                                     // Has arguments?
       // Loop through FunctionType's arguments and ensure they are specified
       // correctly!
@@ -2998,38 +3286,44 @@
       if (I != E || (ArgI != ArgE && !Ty->isVarArg()))
         error("Invalid number of parameters detected");
 
-      $$ = new InvokeInst(V, Normal, Except, &Args[0], Args.size());
+      $$.TI = new InvokeInst(V, Normal, Except, &Args[0], Args.size());
     }
-    cast<InvokeInst>($$)->setCallingConv(upgradeCallingConv($2));
+    cast<InvokeInst>($$.TI)->setCallingConv(upgradeCallingConv($2));
     delete $3.PAT;
     delete $6;
   }
   | Unwind {
-    $$ = new UnwindInst();
+    $$.TI = new UnwindInst();
+    $$.S.makeSignless();
   }
   | UNREACHABLE {
-    $$ = new UnreachableInst();
+    $$.TI = new UnreachableInst();
+    $$.S.makeSignless();
   }
   ;
 
 JumpTable 
   : JumpTable IntType ConstValueRef ',' LABEL ValueRef {
     $$ = $1;
+    $3.S.copy($2.S);
     Constant *V = cast<Constant>(getExistingValue($2.T, $3));
     
     if (V == 0)
       error("May only switch on a constant pool value");
 
+    $6.S.makeSignless();
     BasicBlock* tmpBB = getBBVal($6);
     $$->push_back(std::make_pair(V, tmpBB));
   }
   | IntType ConstValueRef ',' LABEL ValueRef {
     $$ = new std::vector<std::pair<Constant*, BasicBlock*> >();
+    $2.S.copy($1.S);
     Constant *V = cast<Constant>(getExistingValue($1.T, $2));
 
     if (V == 0)
       error("May only switch on a constant pool value");
 
+    $5.S.makeSignless();
     BasicBlock* tmpBB = getBBVal($5);
     $$->push_back(std::make_pair(V, tmpBB)); 
   }
@@ -3057,9 +3351,10 @@
           omit = true;
     if (omit) {
       $$.I = 0;
-      $$.S = Signless;
+      $$.S.makeSignless();
     } else {
-      setValueName($2.I, $1);
+      ValueInfo VI; VI.V = $2.I; VI.S.copy($2.S);
+      setValueName(VI, $1);
       InsertValue($2.I);
       $$ = $2;
     }
@@ -3067,15 +3362,19 @@
 
 PHIList : Types '[' ValueRef ',' ValueRef ']' {    // Used for PHI nodes
     $$.P = new std::list<std::pair<Value*, BasicBlock*> >();
-    $$.S = $1.S;
+    $$.S.copy($1.S);
+    $3.S.copy($1.S);
     Value* tmpVal = getVal($1.PAT->get(), $3);
+    $5.S.makeSignless();
     BasicBlock* tmpBB = getBBVal($5);
     $$.P->push_back(std::make_pair(tmpVal, tmpBB));
     delete $1.PAT;
   }
   | PHIList ',' '[' ValueRef ',' ValueRef ']' {
     $$ = $1;
+    $4.S.copy($1.S);
     Value* tmpVal = getVal($1.P->front().first->getType(), $4);
+    $6.S.makeSignless();
     BasicBlock* tmpBB = getBBVal($6);
     $1.P->push_back(std::make_pair(tmpVal, tmpBB));
   }
@@ -3107,6 +3406,8 @@
 
 InstVal 
   : ArithmeticOps Types ValueRef ',' ValueRef {
+    $3.S.copy($2.S);
+    $5.S.copy($2.S);
     const Type* Ty = $2.PAT->get();
     if (!Ty->isInteger() && !Ty->isFloatingPoint() && !isa<VectorType>(Ty))
       error("Arithmetic operator requires integer, FP, or packed operands");
@@ -3120,10 +3421,12 @@
     $$.I = BinaryOperator::create(Opcode, val1, val2);
     if ($$.I == 0)
       error("binary operator returned null");
-    $$.S = $2.S;
+    $$.S.copy($2.S);
     delete $2.PAT;
   }
   | LogicalOps Types ValueRef ',' ValueRef {
+    $3.S.copy($2.S);
+    $5.S.copy($2.S);
     const Type *Ty = $2.PAT->get();
     if (!Ty->isInteger()) {
       if (!isa<VectorType>(Ty) ||
@@ -3136,10 +3439,12 @@
     $$.I = BinaryOperator::create(Opcode, tmpVal1, tmpVal2);
     if ($$.I == 0)
       error("binary operator returned null");
-    $$.S = $2.S;
+    $$.S.copy($2.S);
     delete $2.PAT;
   }
   | SetCondOps Types ValueRef ',' ValueRef {
+    $3.S.copy($2.S);
+    $5.S.copy($2.S);
     const Type* Ty = $2.PAT->get();
     if(isa<VectorType>(Ty))
       error("VectorTypes currently not supported in setcc instructions");
@@ -3150,10 +3455,12 @@
     $$.I = CmpInst::create(Opcode, pred, tmpVal1, tmpVal2);
     if ($$.I == 0)
       error("binary operator returned null");
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
     delete $2.PAT;
   }
   | ICMP IPredicates Types ValueRef ',' ValueRef {
+    $4.S.copy($3.S);
+    $6.S.copy($3.S);
     const Type *Ty = $3.PAT->get();
     if (isa<VectorType>(Ty)) 
       error("VectorTypes currently not supported in icmp instructions");
@@ -3162,10 +3469,12 @@
     Value* tmpVal1 = getVal(Ty, $4);
     Value* tmpVal2 = getVal(Ty, $6);
     $$.I = new ICmpInst($2, tmpVal1, tmpVal2);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
     delete $3.PAT;
   }
   | FCMP FPredicates Types ValueRef ',' ValueRef {
+    $4.S.copy($3.S);
+    $6.S.copy($3.S);
     const Type *Ty = $3.PAT->get();
     if (isa<VectorType>(Ty))
       error("VectorTypes currently not supported in fcmp instructions");
@@ -3174,7 +3483,7 @@
     Value* tmpVal1 = getVal(Ty, $4);
     Value* tmpVal2 = getVal(Ty, $6);
     $$.I = new FCmpInst($2, tmpVal1, tmpVal2);
-    $$.S = Unsigned;
+    $$.S.makeUnsigned();
     delete $3.PAT;
   }
   | NOT ResolvedVal {
@@ -3186,7 +3495,7 @@
     $$.I = BinaryOperator::create(Instruction::Xor, $2.V, Ones);
     if ($$.I == 0)
       error("Could not create a xor instruction");
-    $$.S = $2.S;
+    $$.S.copy($2.S);
   }
   | ShiftOps ResolvedVal ',' ResolvedVal {
     if (!$4.V->getType()->isInteger() ||
@@ -3204,7 +3513,7 @@
     else
       ShiftAmt = $4.V;
     $$.I = BinaryOperator::create(getBinaryOp($1, Ty, $2.S), $2.V, ShiftAmt);
-    $$.S = $2.S;
+    $$.S.copy($2.S);
   }
   | CastOps ResolvedVal TO Types {
     const Type *DstTy = $4.PAT->get();
@@ -3212,7 +3521,7 @@
       error("cast instruction to a non-primitive type: '" +
             DstTy->getDescription() + "'");
     $$.I = cast<Instruction>(getCast($1, $2.V, $2.S, DstTy, $4.S, true));
-    $$.S = $4.S;
+    $$.S.copy($4.S);
     delete $4.PAT;
   }
   | SELECT ResolvedVal ',' ResolvedVal ',' ResolvedVal {
@@ -3222,13 +3531,13 @@
     if ($4.V->getType() != $6.V->getType())
       error("select value types should match");
     $$.I = new SelectInst($2.V, $4.V, $6.V);
-    $$.S = $2.S;
+    $$.S.copy($4.S);
   }
   | VAARG ResolvedVal ',' Types {
     const Type *Ty = $4.PAT->get();
     NewVarArgs = true;
     $$.I = new VAArgInst($2.V, Ty);
-    $$.S = $4.S;
+    $$.S.copy($4.S);
     delete $4.PAT;
   }
   | VAARG_old ResolvedVal ',' Types {
@@ -3249,7 +3558,7 @@
     CurBB->getInstList().push_back(bar);
     CurBB->getInstList().push_back(new StoreInst(bar, foo));
     $$.I = new VAArgInst(foo, DstTy);
-    $$.S = $4.S;
+    $$.S.copy($4.S);
     delete $4.PAT;
   }
   | VANEXT_old ResolvedVal ',' Types {
@@ -3273,26 +3582,26 @@
     Instruction* tmp = new VAArgInst(foo, DstTy);
     CurBB->getInstList().push_back(tmp);
     $$.I = new LoadInst(foo);
-    $$.S = $4.S;
+    $$.S.copy($4.S);
     delete $4.PAT;
   }
   | EXTRACTELEMENT ResolvedVal ',' ResolvedVal {
     if (!ExtractElementInst::isValidOperands($2.V, $4.V))
       error("Invalid extractelement operands");
     $$.I = new ExtractElementInst($2.V, $4.V);
-    $$.S = $2.S;
+    $$.S.copy($2.S.get(0));
   }
   | INSERTELEMENT ResolvedVal ',' ResolvedVal ',' ResolvedVal {
     if (!InsertElementInst::isValidOperands($2.V, $4.V, $6.V))
       error("Invalid insertelement operands");
     $$.I = new InsertElementInst($2.V, $4.V, $6.V);
-    $$.S = $2.S;
+    $$.S.copy($2.S);
   }
   | SHUFFLEVECTOR ResolvedVal ',' ResolvedVal ',' ResolvedVal {
     if (!ShuffleVectorInst::isValidOperands($2.V, $4.V, $6.V))
       error("Invalid shufflevector operands");
     $$.I = new ShuffleVectorInst($2.V, $4.V, $6.V);
-    $$.S = $2.S;
+    $$.S.copy($2.S);
   }
   | PHI_TOK PHIList {
     const Type *Ty = $2.P->front().first->getType();
@@ -3307,22 +3616,25 @@
       $2.P->pop_front();
     }
     $$.I = PHI;
-    $$.S = $2.S;
+    $$.S.copy($2.S);
     delete $2.P;  // Free the list...
   }
   | OptTailCall OptCallingConv TypesV ValueRef '(' ValueRefListE ')'  {
-
     // Handle the short call syntax
     const PointerType *PFTy;
     const FunctionType *FTy;
+    Signedness FTySign;
     if (!(PFTy = dyn_cast<PointerType>($3.PAT->get())) ||
         !(FTy = dyn_cast<FunctionType>(PFTy->getElementType()))) {
       // Pull out the types of all of the arguments...
       std::vector<const Type*> ParamTypes;
+      FTySign.makeComposite($3.S);
       if ($6) {
         for (std::vector<ValueInfo>::iterator I = $6->begin(), E = $6->end();
-             I != E; ++I)
+             I != E; ++I) {
           ParamTypes.push_back((*I).V->getType());
+          FTySign.add(I->S);
+        }
       }
 
       FunctionType::ParamAttrsList ParamAttrs;
@@ -3339,7 +3651,12 @@
 
       FTy = FunctionType::get(RetTy, ParamTypes, isVarArg, ParamAttrs);
       PFTy = PointerType::get(FTy);
+      $$.S.copy($3.S);
+    } else {
+      FTySign = $3.S;
+      $$.S.copy($3.S.get(0)); // 0th element of FuncTy signedness is result sign
     }
+    $4.S.makeComposite(FTySign);
 
     // First upgrade any intrinsic calls.
     std::vector<Value*> Args;
@@ -3351,7 +3668,6 @@
     // If we got an upgraded intrinsic
     if (Inst) {
       $$.I = Inst;
-      $$.S = Signless;
     } else {
       // Get the function we're calling
       Value *V = getVal(PFTy, $4);
@@ -3383,7 +3699,6 @@
       CI->setTailCall($1);
       CI->setCallingConv(upgradeCallingConv($2));
       $$.I = CI;
-      $$.S = $3.S;
     }
     delete $3.PAT;
     delete $6;
@@ -3408,25 +3723,27 @@
 MemoryInst 
   : MALLOC Types OptCAlign {
     const Type *Ty = $2.PAT->get();
-    $$.S = $2.S;
+    $$.S.makeComposite($2.S);
     $$.I = new MallocInst(Ty, 0, $3);
     delete $2.PAT;
   }
   | MALLOC Types ',' UINT ValueRef OptCAlign {
     const Type *Ty = $2.PAT->get();
-    $$.S = $2.S;
+    $5.S.makeUnsigned();
+    $$.S.makeComposite($2.S);
     $$.I = new MallocInst(Ty, getVal($4.T, $5), $6);
     delete $2.PAT;
   }
   | ALLOCA Types OptCAlign {
     const Type *Ty = $2.PAT->get();
-    $$.S = $2.S;
+    $$.S.makeComposite($2.S);
     $$.I = new AllocaInst(Ty, 0, $3);
     delete $2.PAT;
   }
   | ALLOCA Types ',' UINT ValueRef OptCAlign {
     const Type *Ty = $2.PAT->get();
-    $$.S = $2.S;
+    $5.S.makeUnsigned();
+    $$.S.makeComposite($4.S);
     $$.I = new AllocaInst(Ty, getVal($4.T, $5), $6);
     delete $2.PAT;
   }
@@ -3435,11 +3752,11 @@
     if (!isa<PointerType>(PTy))
       error("Trying to free nonpointer type '" + PTy->getDescription() + "'");
     $$.I = new FreeInst($2.V);
-    $$.S = Signless;
+    $$.S.makeSignless();
   }
   | OptVolatile LOAD Types ValueRef {
     const Type* Ty = $3.PAT->get();
-    $$.S = $3.S;
+    $4.S.copy($3.S);
     if (!isa<PointerType>(Ty))
       error("Can't load from nonpointer type: " + Ty->getDescription());
     if (!cast<PointerType>(Ty)->getElementType()->isFirstClassType())
@@ -3447,9 +3764,11 @@
                      Ty->getDescription());
     Value* tmpVal = getVal(Ty, $4);
     $$.I = new LoadInst(tmpVal, "", $1);
+    $$.S.copy($3.S.get(0));
     delete $3.PAT;
   }
   | OptVolatile STORE ResolvedVal ',' Types ValueRef {
+    $6.S.copy($5.S);
     const PointerType *PTy = dyn_cast<PointerType>($5.PAT->get());
     if (!PTy)
       error("Can't store to a nonpointer type: " + 
@@ -3471,10 +3790,11 @@
       }
     }
     $$.I = new StoreInst(StoreVal, tmpVal, $1);
-    $$.S = Signless;
+    $$.S.makeSignless();
     delete $5.PAT;
   }
   | GETELEMENTPTR Types ValueRef IndexList {
+    $3.S.copy($2.S);
     const Type* Ty = $2.PAT->get();
     if (!isa<PointerType>(Ty))
       error("getelementptr insn requires pointer operand");
@@ -3484,7 +3804,8 @@
 
     Value* tmpVal = getVal(Ty, $3);
     $$.I = new GetElementPtrInst(tmpVal, &VIndices[0], VIndices.size());
-    $$.S = Signless;
+    ValueInfo VI; VI.V = tmpVal; VI.S.copy($2.S);
+    $$.S.copy(getElementSign(VI, VIndices));
     delete $2.PAT;
     delete $4;
   };





From reid at x10sys.com  Wed Mar 21 12:26:58 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 12:26:58 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvm-upgrade/UpgradeParser.y
Message-ID: <200703211726.l2LHQwGO000601@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvm-upgrade:

UpgradeParser.y updated: 1.72 -> 1.73
---
Log message:

For PR1243: http://llvm.org/PR1243 :
Okay, really fix it this time. Make sure the CurFun.Linkage is set early
and consolidate some duplicate code.


---
Diffs of the changes:  (+10 -14)

 UpgradeParser.y |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)


Index: llvm/tools/llvm-upgrade/UpgradeParser.y
diff -u llvm/tools/llvm-upgrade/UpgradeParser.y:1.72 llvm/tools/llvm-upgrade/UpgradeParser.y:1.73
--- llvm/tools/llvm-upgrade/UpgradeParser.y:1.72	Wed Mar 21 12:14:36 2007
+++ llvm/tools/llvm-upgrade/UpgradeParser.y	Wed Mar 21 12:26:41 2007
@@ -2936,25 +2936,21 @@
           CurModule.RenameMap[Key] = Conflict->getName();
           Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
           InsertValue(Fn, CurModule.Values);
-        } else if (CurFun.Linkage == GlobalValue::InternalLinkage) {
-          // We can safely rename the function we're defining
-          std::string NewName = makeNameUnique(FunctionName);
-          Fn = new Function(FT, CurFun.Linkage, NewName, M);
-          InsertValue(Fn, CurModule.Values);
-          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
-          CurModule.RenameMap[Key] = NewName;
-        } else {
+        } else { 
           // We can't quietly rename either of these things, but we must
-          // rename one of them. Generate a warning about the renaming and
-          // elect to rename the thing we're now defining.
+          // rename one of them. Only if the function's linkage is internal can
+          // we forgo a warning message about the renamed function. 
           std::string NewName = makeNameUnique(FunctionName);
-          warning("Renaming function '" + FunctionName + "' as '" + NewName +
-                  "' may cause linkage errors");
+          if (CurFun.Linkage != GlobalValue::InternalLinkage) {
+            warning("Renaming function '" + FunctionName + "' as '" + NewName +
+                    "' may cause linkage errors");
+          }
+          // Elect to rename the thing we're now defining.
           Fn = new Function(FT, CurFun.Linkage, NewName, M);
           InsertValue(Fn, CurModule.Values);
           RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
           CurModule.RenameMap[Key] = NewName;
-        }
+        } 
       } else {
         // There's no conflict, just define the function
         Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
@@ -3005,7 +3001,7 @@
   ;
 
 FunctionHeader 
-  : OptLinkage FunctionHeaderH BEGIN {
+  : OptLinkage { CurFun.Linkage = $1; } FunctionHeaderH BEGIN {
     $$ = CurFun.CurrentFunction;
 
     // Make sure that we keep track of the linkage type even if there was a





From reid at x10sys.com  Wed Mar 21 12:28:12 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 12:28:12 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
	UpgradeParser.y.cvs
Message-ID: <200703211728.l2LHSCsO000654@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvm-upgrade:

UpgradeParser.cpp.cvs updated: 1.67 -> 1.68
UpgradeParser.y.cvs updated: 1.66 -> 1.67
---
Log message:

Regenerate.


---
Diffs of the changes:  (+744 -767)

 UpgradeParser.cpp.cvs | 1487 ++++++++++++++++++++++++--------------------------
 UpgradeParser.y.cvs   |   24 
 2 files changed, 744 insertions(+), 767 deletions(-)


Index: llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
diff -u llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.67 llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.68
--- llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.67	Wed Mar 21 12:15:50 2007
+++ llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs	Wed Mar 21 12:27:53 2007
@@ -2275,16 +2275,16 @@
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  4
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1762
+#define YYLAST   1630
 
 /* YYNTOKENS -- Number of terminals. */
 #define YYNTOKENS  166
 /* YYNNTS -- Number of nonterminals. */
-#define YYNNTS  80
+#define YYNNTS  81
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  309
+#define YYNRULES  310
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  605
+#define YYNSTATES  606
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -2366,15 +2366,16 @@
      528,   529,   537,   538,   546,   547,   555,   559,   564,   565,
      567,   569,   571,   575,   579,   583,   587,   591,   595,   597,
      598,   600,   602,   604,   605,   608,   612,   614,   616,   620,
-     622,   623,   632,   634,   636,   640,   642,   644,   647,   648,
-     650,   652,   653,   654,   660,   661,   663,   665,   667,   669,
-     671,   673,   675,   677,   679,   683,   685,   691,   693,   695,
-     697,   699,   702,   705,   708,   712,   715,   716,   718,   720,
-     722,   725,   728,   732,   742,   752,   761,   775,   777,   779,
-     786,   792,   795,   802,   810,   812,   816,   818,   819,   822,
-     824,   830,   836,   842,   849,   856,   859,   864,   869,   876,
-     881,   886,   891,   896,   903,   910,   913,   921,   923,   926,
-     927,   929,   930,   934,   941,   945,   952,   955,   960,   967
+     622,   623,   632,   634,   636,   637,   642,   644,   646,   649,
+     650,   652,   654,   655,   656,   662,   663,   665,   667,   669,
+     671,   673,   675,   677,   679,   681,   685,   687,   693,   695,
+     697,   699,   701,   704,   707,   710,   714,   717,   718,   720,
+     722,   724,   727,   730,   734,   744,   754,   763,   777,   779,
+     781,   788,   794,   797,   804,   812,   814,   818,   820,   821,
+     824,   826,   832,   838,   844,   851,   858,   861,   866,   871,
+     878,   883,   888,   893,   898,   905,   912,   915,   923,   925,
+     928,   929,   931,   932,   936,   943,   947,   954,   957,   962,
+     969
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -2405,7 +2406,7 @@
       -1,   191,    -1,     8,    -1,   193,    -1,     8,    -1,   193,
       -1,     9,    -1,    10,    -1,    11,    -1,    12,    -1,    13,
       -1,    14,    -1,    15,    -1,    16,    -1,    17,    -1,    18,
-      -1,    19,    -1,    21,    -1,   192,    -1,    48,    -1,   228,
+      -1,    19,    -1,    21,    -1,   192,    -1,    48,    -1,   229,
       -1,   154,     4,    -1,   190,   155,   195,   156,    -1,   157,
        4,   158,   193,   159,    -1,   160,     4,   158,   193,   161,
       -1,   162,   194,   163,    -1,   162,   163,    -1,   160,   162,
@@ -2416,10 +2417,10 @@
      191,   160,   198,   161,    -1,   191,   162,   198,   163,    -1,
      191,   162,   163,    -1,   191,   160,   162,   198,   163,   161,
       -1,   191,   160,   162,   163,   161,    -1,   191,    38,    -1,
-     191,    39,    -1,   191,   228,    -1,   191,   197,    -1,   191,
+     191,    39,    -1,   191,   229,    -1,   191,   197,    -1,   191,
       26,    -1,   176,   168,    -1,   177,     4,    -1,     9,    27,
       -1,     9,    28,    -1,   179,     7,    -1,   175,   155,   196,
-      36,   191,   156,    -1,   110,   155,   196,   243,   156,    -1,
+      36,   191,   156,    -1,   110,   155,   196,   244,   156,    -1,
      112,   155,   196,   153,   196,   153,   196,   156,    -1,   169,
      155,   196,   153,   196,   156,    -1,   170,   155,   196,   153,
      196,   156,    -1,   171,   155,   196,   153,   196,   156,    -1,
@@ -2429,9 +2430,9 @@
      115,   155,   196,   153,   196,   153,   196,   156,    -1,   116,
      155,   196,   153,   196,   153,   196,   156,    -1,   198,   153,
      196,    -1,   196,    -1,    32,    -1,    33,    -1,   201,    -1,
-     201,   221,    -1,   201,   223,    -1,   201,    62,    61,   207,
+     201,   222,    -1,   201,   224,    -1,   201,    62,    61,   207,
       -1,   201,    25,    -1,   202,    -1,   202,   180,    20,   189,
-      -1,   202,   223,    -1,   202,    62,    61,   207,    -1,    -1,
+      -1,   202,   224,    -1,   202,    62,    61,   207,    -1,    -1,
      202,   180,   181,   199,   196,   203,   187,    -1,    -1,   202,
      180,    50,   199,   191,   204,   187,    -1,    -1,   202,   180,
       45,   199,   191,   205,   187,    -1,    -1,   202,   180,    47,
@@ -2443,41 +2444,41 @@
       24,    -1,   212,    -1,    -1,   191,   213,    -1,   215,   153,
      214,    -1,   214,    -1,   215,    -1,   215,   153,    37,    -1,
       37,    -1,    -1,   182,   189,   212,   155,   216,   156,   186,
-     183,    -1,    29,    -1,   162,    -1,   181,   217,   218,    -1,
-      30,    -1,   163,    -1,   231,   220,    -1,    -1,    45,    -1,
-      47,    -1,    -1,    -1,    31,   224,   222,   225,   217,    -1,
-      -1,    63,    -1,     3,    -1,     4,    -1,     7,    -1,    27,
-      -1,    28,    -1,    38,    -1,    39,    -1,    26,    -1,   160,
-     198,   161,    -1,   197,    -1,    61,   226,    24,   153,    24,
-      -1,   167,    -1,   212,    -1,   228,    -1,   227,    -1,   191,
-     229,    -1,   231,   232,    -1,   219,   232,    -1,   233,   180,
-     235,    -1,   233,   237,    -1,    -1,    23,    -1,    77,    -1,
-      78,    -1,    72,   230,    -1,    72,     8,    -1,    73,    21,
-     229,    -1,    73,     9,   229,   153,    21,   229,   153,    21,
-     229,    -1,    74,   178,   229,   153,    21,   229,   157,   236,
-     159,    -1,    74,   178,   229,   153,    21,   229,   157,   159,
-      -1,    75,   182,   189,   229,   155,   240,   156,    36,    21,
-     229,   234,    21,   229,    -1,   234,    -1,    76,    -1,   236,
-     178,   227,   153,    21,   229,    -1,   178,   227,   153,    21,
-     229,    -1,   180,   242,    -1,   191,   157,   229,   153,   229,
-     159,    -1,   238,   153,   157,   229,   153,   229,   159,    -1,
-     230,    -1,   239,   153,   230,    -1,   239,    -1,    -1,    60,
-      59,    -1,    59,    -1,   169,   191,   229,   153,   229,    -1,
-     170,   191,   229,   153,   229,    -1,   171,   191,   229,   153,
-     229,    -1,   103,   172,   191,   229,   153,   229,    -1,   104,
-     173,   191,   229,   153,   229,    -1,    49,   230,    -1,   174,
-     230,   153,   230,    -1,   175,   230,    36,   191,    -1,   112,
-     230,   153,   230,   153,   230,    -1,   113,   230,   153,   191,
-      -1,   117,   230,   153,   191,    -1,   118,   230,   153,   191,
-      -1,   114,   230,   153,   230,    -1,   115,   230,   153,   230,
-     153,   230,    -1,   116,   230,   153,   230,   153,   230,    -1,
-     111,   238,    -1,   241,   182,   189,   229,   155,   240,   156,
-      -1,   245,    -1,   153,   239,    -1,    -1,    35,    -1,    -1,
-     105,   191,   184,    -1,   105,   191,   153,    15,   229,   184,
-      -1,   106,   191,   184,    -1,   106,   191,   153,    15,   229,
-     184,    -1,   107,   230,    -1,   244,   108,   191,   229,    -1,
-     244,   109,   230,   153,   191,   229,    -1,   110,   191,   229,
-     243,    -1
+     183,    -1,    29,    -1,   162,    -1,    -1,   181,   220,   217,
+     218,    -1,    30,    -1,   163,    -1,   232,   221,    -1,    -1,
+      45,    -1,    47,    -1,    -1,    -1,    31,   225,   223,   226,
+     217,    -1,    -1,    63,    -1,     3,    -1,     4,    -1,     7,
+      -1,    27,    -1,    28,    -1,    38,    -1,    39,    -1,    26,
+      -1,   160,   198,   161,    -1,   197,    -1,    61,   227,    24,
+     153,    24,    -1,   167,    -1,   212,    -1,   229,    -1,   228,
+      -1,   191,   230,    -1,   232,   233,    -1,   219,   233,    -1,
+     234,   180,   236,    -1,   234,   238,    -1,    -1,    23,    -1,
+      77,    -1,    78,    -1,    72,   231,    -1,    72,     8,    -1,
+      73,    21,   230,    -1,    73,     9,   230,   153,    21,   230,
+     153,    21,   230,    -1,    74,   178,   230,   153,    21,   230,
+     157,   237,   159,    -1,    74,   178,   230,   153,    21,   230,
+     157,   159,    -1,    75,   182,   189,   230,   155,   241,   156,
+      36,    21,   230,   235,    21,   230,    -1,   235,    -1,    76,
+      -1,   237,   178,   228,   153,    21,   230,    -1,   178,   228,
+     153,    21,   230,    -1,   180,   243,    -1,   191,   157,   230,
+     153,   230,   159,    -1,   239,   153,   157,   230,   153,   230,
+     159,    -1,   231,    -1,   240,   153,   231,    -1,   240,    -1,
+      -1,    60,    59,    -1,    59,    -1,   169,   191,   230,   153,
+     230,    -1,   170,   191,   230,   153,   230,    -1,   171,   191,
+     230,   153,   230,    -1,   103,   172,   191,   230,   153,   230,
+      -1,   104,   173,   191,   230,   153,   230,    -1,    49,   231,
+      -1,   174,   231,   153,   231,    -1,   175,   231,    36,   191,
+      -1,   112,   231,   153,   231,   153,   231,    -1,   113,   231,
+     153,   191,    -1,   117,   231,   153,   191,    -1,   118,   231,
+     153,   191,    -1,   114,   231,   153,   231,    -1,   115,   231,
+     153,   231,   153,   231,    -1,   116,   231,   153,   231,   153,
+     231,    -1,   111,   239,    -1,   242,   182,   189,   230,   155,
+     241,   156,    -1,   246,    -1,   153,   240,    -1,    -1,    35,
+      -1,    -1,   105,   191,   184,    -1,   105,   191,   153,    15,
+     230,   184,    -1,   106,   191,   184,    -1,   106,   191,   153,
+      15,   230,   184,    -1,   107,   231,    -1,   245,   108,   191,
+     230,    -1,   245,   109,   231,   153,   191,   230,    -1,   110,
+     191,   230,   244,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -2505,15 +2506,16 @@
     2675,  2675,  2683,  2683,  2691,  2691,  2700,  2702,  2704,  2709,
     2723,  2724,  2728,  2731,  2739,  2743,  2750,  2754,  2758,  2762,
     2770,  2770,  2774,  2775,  2779,  2787,  2792,  2800,  2801,  2808,
-    2815,  2819,  3004,  3004,  3008,  3018,  3018,  3022,  3027,  3028,
-    3029,  3033,  3034,  3033,  3046,  3047,  3052,  3053,  3054,  3055,
-    3059,  3063,  3064,  3065,  3066,  3087,  3091,  3105,  3106,  3111,
-    3111,  3119,  3129,  3132,  3141,  3152,  3157,  3166,  3177,  3177,
-    3180,  3184,  3188,  3193,  3203,  3221,  3230,  3295,  3299,  3306,
-    3318,  3333,  3363,  3373,  3383,  3387,  3394,  3395,  3399,  3402,
-    3408,  3427,  3445,  3461,  3475,  3489,  3500,  3518,  3527,  3536,
-    3543,  3564,  3588,  3594,  3600,  3606,  3622,  3706,  3714,  3715,
-    3719,  3720,  3724,  3730,  3737,  3743,  3750,  3757,  3770,  3796
+    2815,  2819,  3000,  3000,  3004,  3004,  3014,  3014,  3018,  3023,
+    3024,  3025,  3029,  3030,  3029,  3042,  3043,  3048,  3049,  3050,
+    3051,  3055,  3059,  3060,  3061,  3062,  3083,  3087,  3101,  3102,
+    3107,  3107,  3115,  3125,  3128,  3137,  3148,  3153,  3162,  3173,
+    3173,  3176,  3180,  3184,  3189,  3199,  3217,  3226,  3291,  3295,
+    3302,  3314,  3329,  3359,  3369,  3379,  3383,  3390,  3391,  3395,
+    3398,  3404,  3423,  3441,  3457,  3471,  3485,  3496,  3514,  3523,
+    3532,  3539,  3560,  3584,  3590,  3596,  3602,  3618,  3702,  3710,
+    3711,  3715,  3716,  3720,  3726,  3733,  3739,  3746,  3753,  3766,
+    3792
 };
 #endif
 
@@ -2556,7 +2558,7 @@
   "@2", "@3", "@4", "AsmBlock", "BigOrLittle", "TargetDefinition",
   "LibrariesDefinition", "LibList", "Name", "OptName", "ArgVal",
   "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader",
-  "END", "Function", "FnDeclareLinkage", "FunctionProto", "@5", "@6",
+  "@5", "END", "Function", "FnDeclareLinkage", "FunctionProto", "@6", "@7",
   "OptSideEffect", "ConstValueRef", "SymbolicValueRef", "ValueRef",
   "ResolvedVal", "BasicBlockList", "BasicBlock", "InstructionList",
   "Unwind", "BBTerminatorInst", "JumpTable", "Inst", "PHIList",
@@ -2615,15 +2617,16 @@
      204,   202,   205,   202,   206,   202,   202,   202,   202,   207,
      208,   208,   209,   209,   209,   209,   210,   211,   211,   211,
      212,   212,   213,   213,   214,   215,   215,   216,   216,   216,
-     216,   217,   218,   218,   219,   220,   220,   221,   222,   222,
-     222,   224,   225,   223,   226,   226,   227,   227,   227,   227,
-     227,   227,   227,   227,   227,   227,   227,   228,   228,   229,
-     229,   230,   231,   231,   232,   233,   233,   233,   234,   234,
-     235,   235,   235,   235,   235,   235,   235,   235,   235,   236,
-     236,   237,   238,   238,   239,   239,   240,   240,   241,   241,
-     242,   242,   242,   242,   242,   242,   242,   242,   242,   242,
-     242,   242,   242,   242,   242,   242,   242,   242,   243,   243,
-     244,   244,   245,   245,   245,   245,   245,   245,   245,   245
+     216,   217,   218,   218,   220,   219,   221,   221,   222,   223,
+     223,   223,   225,   226,   224,   227,   227,   228,   228,   228,
+     228,   228,   228,   228,   228,   228,   228,   228,   229,   229,
+     230,   230,   231,   232,   232,   233,   234,   234,   234,   235,
+     235,   236,   236,   236,   236,   236,   236,   236,   236,   236,
+     237,   237,   238,   239,   239,   240,   240,   241,   241,   242,
+     242,   243,   243,   243,   243,   243,   243,   243,   243,   243,
+     243,   243,   243,   243,   243,   243,   243,   243,   243,   244,
+     244,   245,   245,   246,   246,   246,   246,   246,   246,   246,
+     246
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -2651,15 +2654,16 @@
        0,     7,     0,     7,     0,     7,     3,     4,     0,     1,
        1,     1,     3,     3,     3,     3,     3,     3,     1,     0,
        1,     1,     1,     0,     2,     3,     1,     1,     3,     1,
-       0,     8,     1,     1,     3,     1,     1,     2,     0,     1,
-       1,     0,     0,     5,     0,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     3,     1,     5,     1,     1,     1,
-       1,     2,     2,     2,     3,     2,     0,     1,     1,     1,
-       2,     2,     3,     9,     9,     8,    13,     1,     1,     6,
-       5,     2,     6,     7,     1,     3,     1,     0,     2,     1,
-       5,     5,     5,     6,     6,     2,     4,     4,     6,     4,
-       4,     4,     4,     6,     6,     2,     7,     1,     2,     0,
-       1,     0,     3,     6,     3,     6,     2,     4,     6,     4
+       0,     8,     1,     1,     0,     4,     1,     1,     2,     0,
+       1,     1,     0,     0,     5,     0,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     3,     1,     5,     1,     1,
+       1,     1,     2,     2,     2,     3,     2,     0,     1,     1,
+       1,     2,     2,     3,     9,     9,     8,    13,     1,     1,
+       6,     5,     2,     6,     7,     1,     3,     1,     0,     2,
+       1,     5,     5,     5,     6,     6,     2,     4,     4,     6,
+       4,     4,     4,     4,     6,     6,     2,     7,     1,     2,
+       0,     1,     0,     3,     6,     3,     6,     2,     4,     6,
+       4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -2667,161 +2671,163 @@
    means the default is an error.  */
 static const unsigned short int yydefact[] =
 {
-     198,     0,    90,   184,     1,   183,   231,    83,    84,    85,
-      86,    87,    88,    89,     0,    91,   256,   180,   181,   256,
-     210,   211,     0,     0,     0,    90,     0,   186,   228,     0,
-       0,    92,    93,    94,    95,    96,    97,     0,     0,   257,
-     253,    82,   225,   226,   227,   252,     0,     0,     0,     0,
-     196,     0,     0,     0,     0,     0,     0,     0,    81,   229,
-     230,   232,   199,   182,    98,     2,     3,   111,   115,   116,
-     117,   118,   119,   120,   121,   122,   123,   124,   125,   126,
-     128,     0,     0,     0,     0,   247,     0,     0,   110,   127,
-     114,   248,   129,   222,   223,   224,   301,   255,     0,     0,
-       0,     0,   209,   197,   187,   185,   177,   178,     0,     0,
-       0,     0,    91,   130,     0,     0,     0,   113,   135,   139,
-       0,     0,   144,   138,   300,     0,   279,     0,     0,     0,
-       0,    91,   268,   258,   259,     6,     7,     8,     9,    10,
+     198,     0,    90,   184,     1,   183,   232,    83,    84,    85,
+      86,    87,    88,    89,     0,   224,   257,   180,   181,   257,
+     210,   211,     0,     0,     0,    90,     0,   186,   229,     0,
+      91,   258,   254,    82,   226,   227,   228,   253,     0,     0,
+       0,     0,   196,     0,     0,     0,     0,     0,     0,     0,
+      81,   230,   231,   233,   199,   182,     0,    92,    93,    94,
+      95,    96,    97,     0,     0,   302,   256,     0,     0,     0,
+       0,   209,   197,   187,     2,     3,   111,   115,   116,   117,
+     118,   119,   120,   121,   122,   123,   124,   125,   126,   128,
+       0,     0,     0,     0,   248,   185,     0,   110,   127,   114,
+     249,   129,   177,   178,     0,     0,     0,     0,    91,    98,
+       0,   222,   223,   225,   301,     0,   280,     0,     0,     0,
+       0,    91,   269,   259,   260,     6,     7,     8,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,    52,
       53,    54,    55,    20,    21,    22,    23,    24,    25,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,    68,    56,    57,    58,    59,    60,    61,
       62,    63,    64,    65,    66,    67,     0,     0,     0,     0,
-       0,   267,   254,    91,   271,     0,   297,   204,   201,   200,
-     202,   203,   205,   208,     0,   192,   194,   190,   115,   116,
+       0,   268,   255,    91,   272,     0,   298,   204,   201,   200,
+     202,   203,   205,   208,     0,   130,     0,     0,     0,   113,
+     135,   139,     0,   144,   138,   192,   194,   190,   115,   116,
      117,   118,   119,   120,   121,   122,   123,   124,   125,     0,
-       0,     0,     0,   188,   233,     0,     0,     0,     0,     0,
-     134,   220,   143,   141,     0,     0,   285,   278,   261,   260,
-       0,     0,    72,    76,    71,    75,    70,    74,    69,    73,
-      77,    78,     0,     0,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,     0,    50,    51,    46,    47,    48,
-      49,    36,    37,    38,    39,    40,    41,    42,    43,    44,
-      45,     0,   101,   101,   306,     0,     0,   295,     0,     0,
+       0,     0,     0,   188,   234,     0,     0,   286,   279,   262,
+     261,     0,     0,    72,    76,    71,    75,    70,    74,    69,
+      73,    77,    78,     0,     0,    26,    27,    28,    29,    30,
+      31,    32,    33,    34,    35,     0,    50,    51,    46,    47,
+      48,    49,    36,    37,    38,    39,    40,    41,    42,    43,
+      44,    45,     0,   101,   101,   307,     0,     0,   296,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   206,   106,   106,   106,   160,   161,
+       0,     0,     0,     0,     0,   206,     0,     0,     0,     0,
+       0,   134,   143,   141,     0,   106,   106,   106,   160,   161,
        4,     5,   158,   159,   162,   157,   153,   154,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   156,   155,   106,   112,   112,   137,
-       0,   140,   219,   213,   216,   217,     0,     0,   131,   236,
-     237,   238,   243,   239,   240,   241,   242,   234,     0,   245,
-     250,   249,   251,     0,   262,     0,     0,     0,     0,     0,
-     302,     0,   304,   299,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   156,   155,   106,   220,   237,   238,
+     239,   244,   240,   241,   242,   243,   235,     0,   246,   251,
+     250,   252,     0,   263,     0,     0,     0,     0,     0,   303,
+       0,   305,   300,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   207,     0,   193,   195,   191,     0,     0,     0,     0,
-       0,     0,     0,   146,   176,     0,     0,     0,   150,     0,
-     147,     0,     0,     0,     0,     0,   189,   132,   133,   136,
-     212,   214,     0,   104,   142,   235,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   309,     0,     0,
-       0,   289,   292,     0,     0,   290,   291,     0,     0,     0,
-     286,   287,     0,   307,     0,     0,     0,   108,   106,     0,
-       0,   299,     0,     0,     0,     0,     0,   145,   135,   114,
-       0,   148,   149,     0,     0,     0,     0,     0,   218,   215,
-     105,    99,     0,   244,     0,     0,   277,     0,     0,   101,
-     102,   101,   274,   298,     0,     0,     0,     0,     0,   280,
-     281,   282,   277,     0,   103,   109,   107,     0,     0,     0,
-       0,     0,     0,     0,   175,   152,     0,     0,     0,     0,
-       0,     0,     0,   221,     0,     0,     0,   276,     0,   283,
-     284,     0,   303,   305,     0,     0,     0,   288,   293,   294,
-       0,   308,     0,     0,   164,     0,     0,     0,     0,   151,
-       0,     0,     0,     0,     0,   100,   246,     0,     0,     0,
-     275,   272,     0,   296,     0,     0,     0,   172,     0,     0,
-     166,   167,   168,   171,   163,     0,   265,     0,     0,     0,
-     273,   169,   170,     0,     0,     0,   263,     0,   264,     0,
-       0,   165,   173,   174,     0,     0,     0,     0,     0,     0,
-     270,     0,     0,   269,   266
+     207,   112,   112,   137,     0,   140,     0,   131,     0,   193,
+     195,   191,     0,     0,     0,     0,     0,     0,     0,   146,
+     176,     0,     0,     0,   150,     0,   147,     0,     0,     0,
+       0,     0,   189,   219,   213,   216,   217,     0,   236,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     310,     0,     0,     0,   290,   293,     0,     0,   291,   292,
+       0,     0,     0,   287,   288,     0,   308,     0,   132,   133,
+     136,   142,     0,     0,   108,   106,     0,     0,   300,     0,
+       0,     0,     0,     0,   145,   135,   114,     0,   148,   149,
+       0,     0,     0,     0,     0,   212,   214,     0,   104,     0,
+     245,     0,     0,   278,     0,     0,   101,   102,   101,   275,
+     299,     0,     0,     0,     0,     0,   281,   282,   283,   278,
+       0,   103,   109,   107,     0,     0,     0,     0,     0,     0,
+       0,   175,   152,     0,     0,     0,     0,     0,     0,   218,
+     215,   105,    99,     0,     0,     0,   277,     0,   284,   285,
+       0,   304,   306,     0,     0,     0,   289,   294,   295,     0,
+     309,     0,     0,   164,     0,     0,     0,     0,   151,     0,
+       0,     0,     0,     0,     0,   221,   247,     0,     0,     0,
+     276,   273,     0,   297,     0,     0,     0,   172,     0,     0,
+     166,   167,   168,   171,   163,   100,     0,   266,     0,     0,
+       0,   274,   169,   170,     0,     0,     0,   264,     0,   265,
+       0,     0,   165,   173,   174,     0,     0,     0,     0,     0,
+       0,   271,     0,     0,   270,   267
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,    85,   312,   329,   330,   331,   264,   281,   332,   333,
-     219,   220,   252,   221,    25,    15,    37,   523,   370,   457,
-     481,   393,   458,    86,    87,   222,    89,    90,   120,   234,
-     404,   359,   405,   108,     1,     2,     3,   336,   307,   305,
-     306,    63,   200,    50,   103,   204,    91,   421,   344,   345,
-     346,    38,    95,    16,    44,    17,    61,    18,    28,   112,
-     426,   360,    92,   362,   492,    19,    40,    41,   191,   192,
-     578,    97,   287,   527,   528,   193,   194,   437,   195,   196
+      -1,    94,   312,   329,   330,   331,   255,   272,   332,   333,
+     219,   220,   243,   221,    25,    15,    63,   555,   359,   454,
+     522,   389,   455,    95,    96,   222,    98,    99,   202,   304,
+     400,   348,   401,   104,     1,     2,     3,   336,   307,   305,
+     306,    55,   190,    42,    72,   194,   100,   476,   415,   416,
+     417,    64,   113,    16,    30,    36,    17,    53,    18,    28,
+     108,   419,   349,   101,   351,   489,    19,    32,    33,   181,
+     182,   579,    66,   278,   526,   527,   183,   184,   430,   185,
+     186
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -555
+#define YYPACT_NINF -542
 static const short int yypact[] =
 {
-    -555,   136,    58,   247,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,  -555,  -555,  -555,    96,   181,   141,  -555,  -555,    -9,
-    -555,  -555,    16,     7,   114,    65,    39,  -555,    50,   188,
-     210,  -555,  -555,  -555,  -555,  -555,  -555,  1357,   -19,  -555,
-    -555,   134,  -555,  -555,  -555,  -555,    68,    69,    70,    73,
-    -555,    60,   188,  1357,     4,     4,     4,     4,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  -555,    63,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,   222,   224,     1,   171,  -555,   134,    84,  -555,  -555,
-    -103,  -555,  -555,  -555,  -555,  -555,  1611,  -555,   216,    66,
-     238,   219,   233,  -555,  -555,  -555,  -555,  -555,  1418,  1418,
-    1418,  1459,   181,  -555,   100,   101,   737,  -555,  -555,  -103,
-    -112,   105,   803,  -555,  -555,  1418,  -555,   202,  1479,    13,
-     221,   181,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,    77,
-     377,  1418,  1418,  1418,  1418,  1418,  1418,  1418,  1418,  1418,
-    1418,  1418,  1418,  -555,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  1418,  1418,  1418,  1418,
-    1418,  -555,  -555,   181,  -555,    33,  -555,  -555,  -555,  -555,
-    -555,  -555,  -555,  -555,   -15,  -555,  -555,  -555,    36,   158,
-     262,   164,   264,   167,   266,   169,   268,   269,   270,   204,
-     271,   274,   579,  -555,  -555,  1418,  1418,   121,   -67,  1418,
-    -555,  1199,  -555,   120,   127,   920,  -555,  -555,    63,  -555,
-     920,   920,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,  -555,   920,  1357,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,  -555,  -555,  -555,  1418,  -555,  -555,  -555,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,  1418,   142,   143,  -555,   920,   147,   153,   154,   155,
-     157,   165,   166,   168,   170,   920,   920,   920,   173,   275,
-    1357,  1418,  1418,   293,  -555,   174,   174,   174,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  -555,  -555,    77,   377,
-     175,   177,   180,   182,   183,  1240,  1520,   757,   296,   192,
-     193,   199,   203,   207,  -555,  -555,   174,   -45,   -71,  -555,
-     161,  -103,  -555,   134,  -555,   176,   209,  1260,  -555,  -555,
-    -555,  -555,  -555,  -555,  -555,  -555,  -555,   261,  1459,  -555,
-    -555,  -555,  -555,   206,  -555,   213,   920,   920,   920,    -2,
-    -555,     0,  -555,   215,   920,   179,  1418,  1418,  1418,  1418,
-    1418,  1418,  1418,   217,   218,   223,  1418,  1418,   920,   920,
-     226,  -555,   -17,  -555,  -555,  -555,   214,   220,  1459,  1459,
-    1459,  1459,  1459,  -555,  -555,   -13,   778,   -94,  -555,   -40,
-    -555,  1459,  1459,  1459,  1459,  1459,  -555,  -555,  -555,  -555,
-    -555,  -555,  1301,   346,  -555,  -555,   357,   -69,   361,   362,
-     229,   234,   235,   920,   382,   920,  1418,  -555,   236,   920,
-     237,  -555,  -555,   239,   240,  -555,  -555,   920,   920,   920,
-    -555,  -555,   241,  -555,  1418,   367,   390,  -555,   174,  1459,
-    1459,   215,   242,   245,   248,   249,  1459,  -555,   254,   -16,
-      -8,  -555,  -555,   250,   253,   263,   272,   364,  -555,  -555,
-    -555,   366,   273,  -555,   920,   920,  1418,   920,   920,   276,
-    -555,   276,  -555,   279,   920,   280,  1418,  1418,  1418,  -555,
-    -555,  -555,  1418,   920,  -555,  -555,  -555,   281,   282,   283,
-    1459,  1459,  1459,  1459,  -555,  -555,   284,  1459,  1459,  1459,
-    1459,  1418,   423,  -555,   416,   288,   285,   279,   290,  -555,
-    -555,   391,  -555,  -555,  1418,   294,   920,  -555,  -555,  -555,
-     291,  -555,  1459,  1459,  -555,   299,   298,   302,   303,  -555,
-     301,   306,   307,   308,   310,  -555,  -555,   437,    15,   432,
-    -555,  -555,   312,  -555,   316,   319,  1459,  -555,  1459,  1459,
-    -555,  -555,  -555,  -555,  -555,   920,  -555,  1046,    64,   460,
-    -555,  -555,  -555,   326,   329,   331,  -555,   335,  -555,  1046,
-     920,  -555,  -555,  -555,   468,   337,   132,   920,   470,   472,
-    -555,   920,   920,  -555,  -555
+    -542,    13,   162,   567,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,    83,  -542,    19,  -542,  -542,   -14,
+    -542,  -542,    50,   -87,    87,   233,    27,  -542,   123,   141,
+     175,  -542,  -542,    98,  -542,  -542,  -542,  -542,    33,    40,
+      66,    68,  -542,    14,   141,  1265,   156,   156,   156,   156,
+    -542,  -542,  -542,  -542,  -542,  -542,   221,  -542,  -542,  -542,
+    -542,  -542,  -542,  1265,   -19,  1479,  -542,   204,   135,   226,
+     227,   235,  -542,  -542,  -542,  -542,    81,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+     256,   257,     4,    15,  -542,  -542,   108,  -542,  -542,    12,
+    -542,  -542,  -542,  -542,  1306,  1306,  1306,  1326,   175,  -542,
+      98,  -542,  -542,  -542,  -542,  1306,  -542,   205,  1367,   116,
+     479,   175,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,   355,
+     429,  1306,  1306,  1306,  1306,  1306,  1306,  1306,  1306,  1306,
+    1306,  1306,  1306,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  1306,  1306,  1306,  1306,
+    1306,  -542,  -542,   175,  -542,    86,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,   -13,  -542,   110,   111,    75,  -542,
+    -542,    12,   -81,  1046,  -542,  -542,  -542,  -542,   174,   208,
+     266,   210,   267,   212,   268,   230,   277,   275,   278,   246,
+     280,   279,   566,  -542,  -542,   136,   766,  -542,  -542,    81,
+    -542,   766,   766,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,   766,  1265,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  1306,  -542,  -542,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,  -542,  1306,   137,   145,  -542,   766,   132,   146,   147,
+     148,   149,   151,   152,   158,   160,   766,   766,   766,   161,
+     281,  1265,  1306,  1306,   291,  -542,  1306,  1306,   155,   -27,
+    1306,  -542,  -542,   165,   163,   176,   176,   176,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,  -542,  -542,   355,   429,
+     172,   177,   178,   179,   182,  1087,  1387,   529,   311,   184,
+     185,   186,   188,   189,  -542,  -542,   176,  1107,  -542,  -542,
+    -542,  -542,  -542,  -542,  -542,  -542,   282,  1326,  -542,  -542,
+    -542,  -542,   193,  -542,   194,   766,   766,   766,     7,  -542,
+      20,  -542,   195,   766,   192,  1306,  1306,  1306,  1306,  1306,
+    1306,  1306,   200,   201,   206,  1306,  1306,   766,   766,   207,
+    -542,   -59,  -149,  -542,   196,    12,  1148,  -542,    44,  -542,
+    -542,  -542,   203,   211,  1326,  1326,  1326,  1326,  1326,  -542,
+    -542,    -8,   741,   -82,  -542,    10,  -542,  1326,  1326,  1326,
+    1326,  1326,  -542,  -542,    98,  -542,   214,   209,  -542,   337,
+     -34,   342,   348,   215,   218,   219,   766,   371,   766,  1306,
+    -542,   223,   766,   224,  -542,  -542,   225,   234,  -542,  -542,
+     766,   766,   766,  -542,  -542,   228,  -542,  1306,  -542,  -542,
+    -542,  -542,   362,   375,  -542,   176,  1326,  1326,   195,   236,
+     237,   240,   243,  1326,  -542,   238,   -25,    11,  -542,  -542,
+     244,   245,   247,   250,   352,  -542,  -542,  1205,   370,   252,
+    -542,   766,   766,  1306,   766,   766,   258,  -542,   258,  -542,
+     259,   766,   264,  1306,  1306,  1306,  -542,  -542,  -542,  1306,
+     766,  -542,  -542,  -542,   270,   271,   263,  1326,  1326,  1326,
+    1326,  -542,  -542,   260,  1326,  1326,  1326,  1326,  1306,  -542,
+    -542,  -542,   368,   402,   274,   276,   259,   287,  -542,  -542,
+     374,  -542,  -542,  1306,   285,   766,  -542,  -542,  -542,   290,
+    -542,  1326,  1326,  -542,   283,   295,   284,   294,  -542,   296,
+     297,   299,   302,   303,   430,  -542,  -542,   414,    41,   425,
+    -542,  -542,   305,  -542,   306,   310,  1326,  -542,  1326,  1326,
+    -542,  -542,  -542,  -542,  -542,  -542,   766,  -542,   893,   144,
+     448,  -542,  -542,  -542,   314,   315,   316,  -542,   331,  -542,
+     893,   766,  -542,  -542,  -542,   464,   334,   180,   766,   481,
+     482,  -542,   766,   766,  -542,  -542
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -555,  -555,  -555,   398,   399,   400,   198,   200,   402,   403,
-    -128,  -127,  -525,  -555,   476,   493,  -111,  -555,  -276,    97,
-    -555,  -298,  -555,   -47,  -555,   -37,  -555,   -60,   -62,  -555,
-     -99,   300,  -308,    61,  -555,  -555,  -555,  -555,  -555,  -555,
-    -555,   469,  -555,  -555,  -555,  -555,     8,  -555,   102,  -555,
-    -555,   411,  -555,  -555,  -555,  -555,  -555,   523,  -555,  -555,
-    -555,  -554,   -11,   112,  -124,  -555,   508,  -555,   -68,  -555,
-    -555,  -555,  -555,    93,    28,  -555,  -555,    71,  -555,  -555
+    -542,  -542,  -542,   435,   439,   441,   191,   197,   442,   445,
+    -119,  -116,  -541,  -542,   478,   489,  -107,  -542,  -267,    37,
+    -542,  -238,  -542,   -60,  -542,   -45,  -542,   -74,   -51,  -542,
+    -101,   300,  -252,   134,  -542,  -542,  -542,  -542,  -542,  -542,
+    -542,   473,  -542,  -542,  -542,  -542,     8,  -542,    46,  -542,
+    -542,   410,  -542,  -542,  -542,  -542,  -542,  -542,   518,  -542,
+    -542,  -542,  -528,   142,   -90,  -113,  -542,   505,  -542,   -72,
+    -542,  -542,  -542,  -542,    97,    28,  -542,  -542,    70,  -542,
+    -542
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -2831,296 +2837,255 @@
 #define YYTABLE_NINF -180
 static const short int yytable[] =
 {
-      88,   236,   250,   251,   239,   115,   105,   372,   394,   395,
-      93,    26,   223,   433,    39,   435,    88,   455,   407,   409,
-     253,    42,   240,   587,   119,   242,   243,   244,   245,   246,
-     247,   248,   249,   577,   241,   595,   106,   107,   416,   284,
-     456,   229,   288,   289,   290,   291,   292,   293,   294,    26,
-     427,   230,  -112,   589,   228,   434,   119,   434,  -179,   466,
-     233,   123,   119,   308,   309,   298,   299,   471,    46,    47,
-      48,   205,   206,   207,   242,   243,   244,   245,   246,   247,
-     248,   249,   300,     5,   466,    53,   229,    49,   235,     6,
-     418,   235,   483,   123,   121,    59,   340,    60,   470,     7,
-       8,     9,    10,    11,    12,    13,     7,     8,     9,    10,
-      54,    12,    55,   466,   417,    56,   109,   110,   111,   123,
-      14,   198,   199,   472,   282,   283,   235,   285,   286,   235,
-     235,   235,   235,   235,   235,   235,     4,  -139,   303,  -112,
-     466,   301,   302,    94,   304,   466,   467,  -139,   123,   295,
-     296,   297,   235,   235,    43,   516,    20,    29,    21,    51,
-     506,   -72,   -72,   116,    39,   337,   338,   -71,   -71,   341,
-     -70,   -70,   -69,   -69,   576,    52,    65,    66,   390,   117,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    58,    79,    20,   343,    21,   254,   255,   256,   257,
-     258,   259,   260,   261,   262,   263,   366,   310,   311,   133,
-     134,   335,    62,   532,    64,   533,    88,   102,  -113,    80,
-      98,    99,   100,   588,   361,   101,   113,   367,   114,   361,
-     361,   242,   243,   244,   245,   246,   247,   248,   249,   122,
-     197,   361,   201,   202,   368,    30,    31,    32,    33,    34,
-      35,    36,   440,   388,   442,   443,   444,   203,   225,   226,
-     231,   237,   450,    88,   389,   235,   -76,   -82,   -75,    20,
-     -74,    21,   -73,   347,   361,   313,   -79,   -80,     6,   -82,
-     -82,   314,   339,   348,   361,   361,   361,   341,   -82,   -82,
-     -82,   -82,   -82,   -82,   -82,   369,   371,   -82,    22,   461,
-     462,   463,   464,   465,   374,    23,   375,   376,   377,    24,
-     378,   387,   473,   474,   475,   476,   477,   391,   379,   380,
-     410,   381,   419,   382,   425,    81,   386,   392,    82,   422,
-     398,    83,   399,    84,   118,   400,   439,   401,   402,   235,
-     441,   235,   235,   235,   445,   446,   469,   411,   412,   235,
-     451,   420,   363,   364,   413,   361,   361,   361,   414,   428,
-     507,   508,   415,   361,   365,   423,   429,   514,   436,   459,
-     447,   448,   537,   538,   539,   460,   449,   361,   361,   454,
-     455,   482,   484,   485,   486,   343,   490,   487,   488,   494,
-     496,   504,   497,   498,   505,   510,   502,   373,   511,   235,
-     521,   512,   513,   517,   265,   266,   518,   383,   384,   385,
-     560,   545,   546,   547,   548,   515,   519,   503,   550,   551,
-     552,   553,   361,   522,   361,   520,   524,   555,   361,   531,
-     250,   251,   534,   536,   542,   543,   361,   361,   361,   544,
-     556,   557,   558,   564,   565,   549,   559,   563,   434,   235,
-     250,   251,   566,   561,   567,   568,   569,   570,   575,   235,
-     235,   235,   571,   572,   573,   235,   574,   583,   579,   584,
-     585,   580,   581,   361,   361,   582,   361,   361,   430,   431,
-     432,   590,   591,   361,   554,   592,   438,   593,   594,   597,
-     598,   601,   361,   602,   186,   187,   188,   235,   189,   190,
-     452,   453,   267,   268,   269,   270,   271,   272,   273,   274,
-     275,   276,   277,   278,   279,   280,   396,    96,    57,   397,
-     480,   104,   334,   224,   479,   361,    27,    45,   599,   493,
-     540,     0,   509,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   489,     0,   491,     0,     0,
-       0,   495,     0,     0,     0,     0,     0,     0,     0,   499,
-     500,   501,     0,     0,   361,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   361,
-       0,     0,     0,     0,    65,    66,   361,     0,     0,     0,
-     361,   361,     0,     0,     0,     0,   525,   526,     0,   529,
-     530,    20,     0,    21,     0,   315,   535,     0,     0,     0,
-       0,     0,     0,     0,     0,   541,     0,   316,   317,     0,
+      97,   241,   227,   110,   242,   230,   223,   361,   197,    31,
+     111,    26,   449,     4,   244,   204,    34,   578,    97,   201,
+      74,    75,   426,   199,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,   428,    88,    20,   590,    21,
+     275,    26,    31,   279,   280,   281,   282,   283,   284,   285,
+     588,   233,   234,   235,   236,   237,   238,   239,   240,   205,
+     206,   207,   596,    89,   427,    43,   289,   290,   390,   391,
+     226,   463,   300,   226,   403,   405,   291,   427,   452,   468,
+      74,    75,   301,   199,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,   420,    88,    20,   412,    21,
+     448,   453,    38,    39,    40,   204,   273,   274,   226,   276,
+     277,   226,   226,   226,   226,   226,   226,   226,   225,   463,
+      20,    41,    21,    89,   201,   231,   300,   480,  -139,   201,
+    -112,   286,   287,   288,   226,   226,   384,   232,  -139,   204,
+     294,   352,   353,   112,    29,   463,   295,   299,    44,    35,
+     467,   464,   303,   354,   233,   234,   235,   236,   237,   238,
+     239,   240,  -179,   463,   463,    54,   198,  -112,    51,    90,
+      52,    71,    91,   469,   513,    92,   204,    93,   200,    50,
+     379,   105,   106,   107,   355,    67,   362,     5,   102,   103,
+     188,   189,    68,     6,   292,   293,   372,   373,   374,    97,
+     577,   308,   309,     7,     8,     9,    10,    11,    12,    13,
+     356,   -72,   -72,   -71,   -71,   -70,   -70,   503,    69,   531,
+      70,   532,   381,   382,    14,   109,   385,   357,   187,    90,
+     191,   377,    91,   -69,   -69,    92,  -113,    93,   298,    56,
+      57,    58,    59,    60,    61,    62,    97,   378,   226,   310,
+     311,   192,   433,    45,   435,   436,   437,   123,   124,   193,
+     195,   196,   443,   203,   228,   423,   424,   425,   296,   297,
+     -76,   -75,   -74,   431,     7,     8,     9,    10,    46,    12,
+      47,   -73,   -79,    48,   313,   -80,   314,   445,   446,   363,
+     358,   337,   414,   458,   459,   460,   461,   462,   360,   364,
+     365,   366,   367,   589,   368,   369,   470,   471,   472,   473,
+     474,   370,   385,   371,   375,   380,   383,   376,   386,   387,
+     226,   434,   226,   226,   226,   438,   439,   394,   466,   388,
+     226,   444,   395,   396,   397,   406,   486,   398,   488,   407,
+     408,   409,   492,   410,   411,   418,   421,   422,   429,   432,
+     496,   497,   498,   440,   441,   504,   505,   450,   456,   442,
+     447,   479,   511,   481,   335,   478,   457,   477,   350,   482,
+     483,   484,   485,   350,   350,   487,   491,   493,   494,   502,
+     536,   537,   538,   499,   226,   350,   501,   495,   518,   507,
+     508,   524,   525,   509,   528,   529,   510,   514,   515,   512,
+     516,   534,   500,   517,   452,   523,   544,   545,   546,   547,
+     540,   530,   533,   549,   550,   551,   552,   535,   350,   543,
+     560,   548,   475,   541,   542,   554,   556,   557,   350,   350,
+     350,   427,   414,   558,   575,   576,   566,   568,   226,   241,
+     564,   565,   242,   559,   561,   562,   563,   569,   226,   226,
+     226,   567,   570,   571,   226,   572,   256,   257,   573,   574,
+     241,   580,   582,   242,   581,   584,   583,   585,   586,   591,
+     592,   593,   594,   553,   245,   246,   247,   248,   249,   250,
+     251,   252,   253,   254,   595,   598,   587,   599,   226,   233,
+     234,   235,   236,   237,   238,   239,   240,   350,   350,   350,
+     176,   597,   602,   603,   177,   350,   178,   179,   601,   392,
+     180,    65,   604,   605,    49,   521,   393,    73,   224,   350,
+     350,    27,   334,   520,    37,   600,   490,   539,   506,     0,
+       0,     0,     0,     0,    74,    75,     0,   199,   208,   209,
+     210,   211,   212,   213,   214,   215,   216,   217,   218,     0,
+      88,    20,     0,    21,   258,   259,   260,   261,   262,   263,
+     264,   265,   266,   267,   268,   269,   270,   271,   350,     0,
+     350,    74,    75,     0,   350,     0,     0,    89,     0,     0,
+       0,     0,   350,   350,   350,     0,     0,   -82,    20,    20,
+      21,    21,   315,     0,     0,     0,     0,     0,     6,   -82,
+     -82,     0,     0,     0,   316,   317,     0,     0,   -82,   -82,
+     -82,   -82,   -82,   -82,   -82,     0,     0,   -82,    22,     0,
+       0,     0,     0,   350,   350,    23,   350,   350,     0,    24,
+       0,     0,     0,   350,     0,     0,     0,     0,     0,     0,
+       0,     0,   350,     0,     0,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   318,
+     319,     0,     0,     0,     0,     0,   320,   350,   321,     0,
+     322,   323,   324,    90,     0,     0,    91,     0,     0,    92,
+       0,    93,   404,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   163,   164,   165,   166,   167,
+     168,   169,   170,   171,   172,   173,   174,   175,   350,     0,
+       0,     0,     0,   325,     0,     0,   326,     0,   327,     0,
+       0,   328,     0,   350,     0,     0,     0,     0,     0,     0,
+     350,     0,     0,     0,   350,   350,    74,    75,     0,   199,
+     208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
+     218,     0,    88,    20,     0,    21,     0,     0,     0,   338,
+     339,    74,    75,   340,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,    20,    89,
+      21,     0,   341,   342,   343,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   344,   345,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   346,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   562,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   135,   136,
-     137,   138,   139,   140,   141,   142,   143,   144,   145,   146,
-     147,   148,   149,   150,   151,   152,   153,   154,   155,   156,
-     157,   158,   318,   319,     0,     0,     0,   586,     0,   320,
-       0,   321,     0,   322,   323,   324,     0,     0,     0,     0,
-       0,     0,   596,     0,     0,     0,     0,     0,     0,   600,
-       0,     0,     0,   603,   604,     0,     0,     0,   173,   174,
-     175,   176,   177,   178,   179,   180,   181,   182,   183,   184,
-     185,     0,     0,     0,     0,     0,   325,     0,     0,   326,
-       0,   327,    65,    66,   328,   117,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,     0,    79,    20,
-       0,    21,    65,    66,     0,   117,   208,   209,   210,   211,
-     212,   213,   214,   215,   216,   217,   218,     0,    79,    20,
-       0,    21,     0,    65,    66,    80,   117,   208,   209,   210,
-     211,   212,   213,   214,   215,   216,   217,   218,     0,    79,
-      20,     0,    21,     0,     0,    80,     0,     0,    65,    66,
-       0,   117,    68,    69,    70,    71,    72,    73,    74,    75,
-      76,    77,    78,     0,    79,    20,    80,    21,     0,     0,
+       0,     0,     0,     0,     0,   125,   126,   127,   128,   129,
+     130,   131,   132,   133,   134,   135,   136,   137,   138,   139,
+     140,   141,   142,   143,   144,   145,   146,   147,   148,   318,
+     319,     0,     0,     0,     0,     0,   320,     0,   321,     0,
+     322,   323,   324,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,    90,   338,   339,    91,     0,
+     340,    92,     0,    93,   465,   163,   164,   165,   166,   167,
+     168,   169,   170,   171,   172,   173,   174,   175,     0,   341,
+     342,   343,     0,     0,     0,     0,   347,     0,     0,     0,
+       0,   344,   345,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     232,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    80,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   346,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   125,   126,   127,   128,   129,   130,   131,   132,
+     133,   134,   135,   136,   137,   138,   139,   140,   141,   142,
+     143,   144,   145,   146,   147,   148,   318,   319,     0,     0,
+       0,     0,     0,   320,     0,   321,     0,   322,   323,   324,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    81,     0,     0,    82,     0,     0,    83,     0,    84,
-     227,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,    81,     0,     0,    82,     0,     0,    83,     0,    84,
-     408,     0,     0,   349,   350,    65,    66,   351,     0,     0,
-       0,     0,    81,     0,     0,    82,     0,     0,    83,     0,
-      84,   468,    20,     0,    21,     0,   352,   353,   354,     0,
-       0,     0,     0,     0,     0,     0,     0,    81,   355,   356,
-      82,     0,     0,    83,     0,    84,     0,     0,     0,     0,
+       0,     0,   163,   164,   165,   166,   167,   168,   169,   170,
+     171,   172,   173,   174,   175,     0,     0,     0,     0,     0,
+       0,    74,    75,   347,   199,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,     0,    88,    20,     0,
+      21,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,   302,     0,     0,     0,     0,     0,     0,
+       0,     0,    74,    75,    89,   199,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,     0,    88,    20,
+       0,    21,    74,    75,     0,   199,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,     0,    88,    20,
+       0,    21,     0,     0,     0,    89,     0,     0,     0,     0,
+       0,     0,     0,     0,   413,     0,     0,     0,     0,     0,
+       0,     0,     0,    74,    75,    89,   199,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,     0,    88,
+      20,     0,    21,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   451,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,    89,     0,     0,     0,
+      90,     0,     0,    91,     0,     0,    92,     0,    93,     0,
+      74,    75,     0,   199,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,     0,    88,    20,     0,    21,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   357,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   135,
-     136,   137,   138,   139,   140,   141,   142,   143,   144,   145,
-     146,   147,   148,   149,   150,   151,   152,   153,   154,   155,
-     156,   157,   158,   318,   319,     0,     0,     0,     0,     0,
-     320,     0,   321,     0,   322,   323,   324,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   349,
-     350,     0,     0,   351,     0,     0,     0,     0,     0,   173,
-     174,   175,   176,   177,   178,   179,   180,   181,   182,   183,
-     184,   185,   352,   353,   354,     0,     0,     0,     0,     0,
-     358,     0,     0,     0,   355,   356,     0,     0,     0,     0,
+       0,    90,   519,     0,    91,     0,   399,    92,     0,    93,
+       0,     0,     0,    89,     0,     0,     0,     0,     0,     0,
+       0,    90,     0,     0,    91,     0,     0,    92,     0,    93,
+      74,    75,     0,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,     0,    88,    20,     0,    21,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   357,     0,     0,
+       0,     0,    90,     0,     0,    91,     0,     0,    92,     0,
+      93,    74,    75,    89,   199,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,     0,    88,    20,     0,
+      21,    74,    75,     0,   199,   208,   209,   210,   211,   212,
+     213,   214,   215,   216,   217,   218,     0,    88,    20,     0,
+      21,     0,     0,     0,    89,     0,     0,     0,     0,    90,
+       0,     0,    91,     0,     0,    92,     0,    93,     0,     0,
+       0,     0,    74,    75,    89,   229,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,     0,    88,    20,
+       0,    21,    74,    75,     0,   199,   208,   209,   210,   211,
+     212,   213,   214,   215,   216,   217,   218,     0,    88,    20,
+       0,    21,     0,     0,     0,    89,     0,     0,     0,    90,
+       0,     0,    91,     0,     0,    92,     0,    93,     0,     0,
+       0,     0,     0,     0,     0,    89,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   135,   136,   137,   138,   139,
-     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
-     150,   151,   152,   153,   154,   155,   156,   157,   158,   318,
-     319,     0,     0,     0,     0,     0,   320,     0,   321,     0,
-     322,   323,   324,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,   185,     0,     0,
-       0,     0,     0,     0,    65,    66,   358,   117,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,     0,
-      79,    20,     0,    21,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   342,     0,     0,     0,
-       0,     0,     0,     0,     0,    65,    66,    80,   117,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-       0,    79,    20,     0,    21,    65,    66,     0,   117,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-       0,    79,    20,     0,    21,     0,     0,     0,    80,     0,
-       0,     0,     0,     0,     0,     0,     0,   424,     0,     0,
-       0,     0,     0,     0,     0,     0,    65,    66,    80,   117,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,     0,    79,    20,     0,    21,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   478,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    80,
-       0,     0,     0,    81,     0,     0,    82,     0,     0,    83,
-       0,    84,    65,    66,     0,    67,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,     0,    79,    20,
-       0,    21,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,    81,     0,     0,    82,     0,   403,
-      83,     0,    84,     0,     0,    80,     0,     0,     0,     0,
-       0,     0,     0,     0,    81,     0,     0,    82,     0,     0,
-      83,     0,    84,    65,    66,     0,   117,    68,    69,    70,
-      71,    72,    73,    74,    75,    76,    77,    78,     0,    79,
-      20,     0,    21,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    81,     0,     0,    82,     0,
-       0,    83,     0,    84,    65,    66,    80,   117,   208,   209,
-     210,   211,   212,   213,   214,   215,   216,   217,   218,     0,
-      79,    20,     0,    21,    65,    66,     0,   238,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,     0,
-      79,    20,     0,    21,     0,     0,     0,    80,     0,     0,
-       0,    81,     0,     0,    82,     0,     0,    83,     0,    84,
-       0,     0,     0,     0,     0,    65,    66,    80,   117,   208,
-     209,   210,   211,   212,   213,   214,   215,   216,   217,   218,
-       0,    79,    20,     0,    21,     0,     0,     0,     0,     0,
+      90,     0,     0,    91,     0,     0,    92,     0,    93,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    80,     0,
-       0,     0,    81,     0,     0,    82,     0,     0,    83,     0,
-      84,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+      90,     0,     0,    91,     0,     0,    92,     0,    93,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    81,     0,     0,    82,     0,     0,    83,
-       0,    84,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    81,     0,     0,    82,     0,     0,    83,
-       0,    84,     0,     0,     0,     0,   124,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     125,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     126,   127,     0,     0,    81,     0,     0,    82,     0,     0,
-      83,     0,   406,   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,   162,   163,     0,
-       0,   164,   165,   166,   167,   168,   169,   170,   171,   172,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   114,     0,     0,     0,     0,     0,
+       0,    90,     0,     0,    91,     0,     0,    92,   115,    93,
+       0,     0,     0,     0,     0,     0,     0,     0,   116,   117,
+       0,    90,     0,     0,    91,     0,     0,    92,     0,   402,
+       0,   118,   119,   120,   121,   122,   123,   124,   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,     0,     0,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,   182,
-     183,   184,   185
+       0,     0,     0,     0,     0,     0,     0,     0,   163,   164,
+     165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
+     175
 };
 
 static const short int yycheck[] =
 {
-      37,   125,   130,   130,   128,     4,    53,   283,   306,   307,
-      29,     3,   111,    15,    23,    15,    53,    34,   326,   327,
-     131,    30,     9,   577,    84,    10,    11,    12,    13,    14,
-      15,    16,    17,   558,    21,   589,    32,    33,   336,   163,
-      57,   153,   166,   167,   168,   169,   170,   171,   172,    41,
-     358,   163,   155,   578,   116,    57,   116,    57,     0,   153,
-     122,   164,   122,    27,    28,   189,   190,   161,    52,    53,
-      54,   108,   109,   110,    10,    11,    12,    13,    14,    15,
-      16,    17,   193,    25,   153,    20,   153,    71,   125,    31,
-     161,   128,   161,   164,    86,    45,   163,    47,   406,    41,
-      42,    43,    44,    45,    46,    47,    41,    42,    43,    44,
-      45,    46,    47,   153,   159,    50,    55,    56,    57,   164,
-      62,    55,    56,   163,   161,   162,   163,   164,   165,   166,
-     167,   168,   169,   170,   171,   172,     0,   153,   153,   155,
-     153,   108,   109,   162,   159,   153,   159,   163,   164,   186,
-     187,   188,   189,   190,   163,   163,    22,    61,    24,   152,
-     458,     3,     4,   162,    23,   225,   226,     3,     4,   229,
-       3,     4,     3,     4,   159,    61,     5,     6,   302,     8,
+      45,   120,   115,    63,   120,   118,   107,   274,     4,    23,
+      29,     3,   161,     0,   121,   164,    30,   558,    63,    93,
+       5,     6,    15,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    15,    21,    22,   579,    24,
+     153,    33,    23,   156,   157,   158,   159,   160,   161,   162,
+     578,    10,    11,    12,    13,    14,    15,    16,    17,   104,
+     105,   106,   590,    48,    57,   152,   179,   180,   306,   307,
+     115,   153,   153,   118,   326,   327,   183,    57,    34,   161,
+       5,     6,   163,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,   347,    21,    22,   336,    24,
+     159,    57,    52,    53,    54,   164,   151,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   110,   153,
+      22,    71,    24,    48,   198,     9,   153,   161,   153,   203,
+     155,   176,   177,   178,   179,   180,   163,    21,   163,   164,
+     153,   231,   232,   162,    61,   153,   159,   198,    61,   163,
+     402,   159,   203,   243,    10,    11,    12,    13,    14,    15,
+      16,    17,     0,   153,   153,    24,   162,   155,    45,   154,
+      47,   157,   157,   163,   163,   160,   164,   162,   163,   152,
+     293,    47,    48,    49,   244,   152,   276,    25,    32,    33,
+      55,    56,   152,    31,   108,   109,   286,   287,   288,   244,
+     159,    27,    28,    41,    42,    43,    44,    45,    46,    47,
+     255,     3,     4,     3,     4,     3,     4,   455,   152,   486,
+     152,   488,   296,   297,    62,     4,   300,   272,    24,   154,
+       4,   291,   157,     3,     4,   160,   155,   162,   163,    64,
+      65,    66,    67,    68,    69,    70,   291,   292,   293,     3,
+       4,    24,   365,    20,   367,   368,   369,    77,    78,    24,
+       4,     4,   375,   155,    59,   355,   356,   357,   158,   158,
+       4,     4,     4,   363,    41,    42,    43,    44,    45,    46,
+      47,     4,     7,    50,     4,     7,     7,   377,   378,   157,
+     153,   155,   337,   394,   395,   396,   397,   398,   153,   153,
+     153,   153,   153,   159,   153,   153,   407,   408,   409,   410,
+     411,   153,   386,   153,   153,    24,   161,    36,   153,   156,
+     365,   366,   367,   368,   369,   370,   371,   155,   402,   153,
+     375,   376,   155,   155,   155,    24,   426,   155,   428,   155,
+     155,   155,   432,   155,   155,    63,   153,   153,   153,   157,
+     440,   441,   442,   153,   153,   456,   457,   161,   155,   153,
+     153,    24,   463,    21,   222,   156,   155,   153,   226,    21,
+     155,   153,   153,   231,   232,     4,   153,   153,   153,     4,
+     493,   494,   495,   155,   429,   243,    24,   153,    36,   153,
+     153,   481,   482,   153,   484,   485,   153,   153,   153,   161,
+     153,   491,   447,   153,    34,   153,   507,   508,   509,   510,
+     500,   153,   153,   514,   515,   516,   517,   153,   276,   156,
+     533,   161,   414,   153,   153,    57,    24,   153,   286,   287,
+     288,    57,   477,   157,     4,    21,   153,   153,   483,   558,
+     541,   542,   558,   156,   159,   535,   156,   153,   493,   494,
+     495,   156,   156,   156,   499,   156,    27,    28,   156,   156,
+     579,    36,   156,   579,   159,   566,   156,   568,   569,    21,
+     156,   156,   156,   518,   119,   120,   121,   122,   123,   124,
+     125,   126,   127,   128,   153,    21,   576,   153,   533,    10,
+      11,    12,    13,    14,    15,    16,    17,   355,   356,   357,
+      65,   591,    21,    21,    65,   363,    65,    65,   598,   318,
+      65,    33,   602,   603,    25,   478,   319,    44,   108,   377,
+     378,     3,   222,   477,    19,   597,   429,   499,   458,    -1,
+      -1,    -1,    -1,    -1,     5,     6,    -1,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    -1,
+      21,    22,    -1,    24,   125,   126,   127,   128,   129,   130,
+     131,   132,   133,   134,   135,   136,   137,   138,   426,    -1,
+     428,     5,     6,    -1,   432,    -1,    -1,    48,    -1,    -1,
+      -1,    -1,   440,   441,   442,    -1,    -1,    20,    22,    22,
+      24,    24,    26,    -1,    -1,    -1,    -1,    -1,    31,    32,
+      33,    -1,    -1,    -1,    38,    39,    -1,    -1,    41,    42,
+      43,    44,    45,    46,    47,    -1,    -1,    50,    51,    -1,
+      -1,    -1,    -1,   481,   482,    58,   484,   485,    -1,    62,
+      -1,    -1,    -1,   491,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   500,    -1,    -1,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,    -1,    -1,    -1,    -1,    -1,   110,   535,   112,    -1,
+     114,   115,   116,   154,    -1,    -1,   157,    -1,    -1,   160,
+      -1,   162,   163,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,   576,    -1,
+      -1,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,
+      -1,   165,    -1,   591,    -1,    -1,    -1,    -1,    -1,    -1,
+     598,    -1,    -1,    -1,   602,   603,     5,     6,    -1,     8,
        9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,   152,    21,    22,   231,    24,   119,   120,   121,   122,
-     123,   124,   125,   126,   127,   128,   253,     3,     4,    77,
-      78,   222,    24,   489,     4,   491,   253,   157,   155,    48,
-     152,   152,   152,   159,   235,   152,     4,   264,     4,   240,
-     241,    10,    11,    12,    13,    14,    15,    16,    17,   155,
-      24,   252,     4,    24,   281,    64,    65,    66,    67,    68,
-      69,    70,   376,   300,   378,   379,   380,    24,   158,   158,
-     155,    59,   386,   300,   301,   302,     4,    20,     4,    22,
-       4,    24,     4,   153,   285,     4,     7,     7,    31,    32,
-      33,     7,   161,   156,   295,   296,   297,   347,    41,    42,
-      43,    44,    45,    46,    47,   153,   153,    50,    51,   398,
-     399,   400,   401,   402,   157,    58,   153,   153,   153,    62,
-     153,    36,   411,   412,   413,   414,   415,    24,   153,   153,
-      24,   153,   161,   153,    63,   154,   153,   153,   157,   153,
-     155,   160,   155,   162,   163,   155,   157,   155,   155,   376,
-     377,   378,   379,   380,   381,   382,   406,   155,   155,   386,
-     387,   343,   240,   241,   155,   366,   367,   368,   155,   153,
-     459,   460,   155,   374,   252,   156,   153,   466,   153,   155,
-     153,   153,   496,   497,   498,   155,   153,   388,   389,   153,
-      34,    24,    21,    21,   155,   422,     4,   153,   153,   153,
-     153,    24,   153,   153,     4,   153,   155,   285,   153,   436,
-      36,   153,   153,   153,    27,    28,   153,   295,   296,   297,
-     534,   510,   511,   512,   513,   161,   153,   454,   517,   518,
-     519,   520,   433,    57,   435,   153,   153,     4,   439,   153,
-     558,   558,   153,   153,   153,   153,   447,   448,   449,   156,
-      24,   153,   157,   542,   543,   161,   156,   156,    57,   486,
-     578,   578,   153,   159,   156,   153,   153,   156,    21,   496,
-     497,   498,   156,   156,   156,   502,   156,   566,    36,   568,
-     569,   159,   156,   484,   485,   156,   487,   488,   366,   367,
-     368,    21,   156,   494,   521,   156,   374,   156,   153,    21,
-     153,    21,   503,    21,    96,    96,    96,   534,    96,    96,
-     388,   389,   125,   126,   127,   128,   129,   130,   131,   132,
-     133,   134,   135,   136,   137,   138,   318,    41,    25,   319,
-     423,    52,   222,   112,   422,   536,     3,    19,   596,   436,
-     502,    -1,   461,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   433,    -1,   435,    -1,    -1,
-      -1,   439,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   447,
-     448,   449,    -1,    -1,   575,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   590,
-      -1,    -1,    -1,    -1,     5,     6,   597,    -1,    -1,    -1,
-     601,   602,    -1,    -1,    -1,    -1,   484,   485,    -1,   487,
-     488,    22,    -1,    24,    -1,    26,   494,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   503,    -1,    38,    39,    -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,   536,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,   102,   103,   104,    -1,    -1,    -1,   575,    -1,   110,
-      -1,   112,    -1,   114,   115,   116,    -1,    -1,    -1,    -1,
-      -1,    -1,   590,    -1,    -1,    -1,    -1,    -1,    -1,   597,
-      -1,    -1,    -1,   601,   602,    -1,    -1,    -1,   139,   140,
-     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
-     151,    -1,    -1,    -1,    -1,    -1,   157,    -1,    -1,   160,
-      -1,   162,     5,     6,   165,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
-      -1,    24,     5,     6,    -1,     8,     9,    10,    11,    12,
-      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
-      -1,    24,    -1,     5,     6,    48,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    -1,    21,
-      22,    -1,    24,    -1,    -1,    48,    -1,    -1,     5,     6,
-      -1,     8,     9,    10,    11,    12,    13,    14,    15,    16,
-      17,    18,    19,    -1,    21,    22,    48,    24,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      37,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    48,    -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,    -1,    -1,    -1,    -1,
-      -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,
-     163,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,
-     163,    -1,    -1,     3,     4,     5,     6,     7,    -1,    -1,
-      -1,    -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,
-     162,   163,    22,    -1,    24,    -1,    26,    27,    28,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   154,    38,    39,
-     157,    -1,    -1,   160,    -1,   162,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    61,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    79,
-      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,   101,   102,   103,   104,    -1,    -1,    -1,    -1,    -1,
-     110,    -1,   112,    -1,   114,   115,   116,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     3,
-       4,    -1,    -1,     7,    -1,    -1,    -1,    -1,    -1,   139,
-     140,   141,   142,   143,   144,   145,   146,   147,   148,   149,
-     150,   151,    26,    27,    28,    -1,    -1,    -1,    -1,    -1,
-     160,    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,
+      19,    -1,    21,    22,    -1,    24,    -1,    -1,    -1,     3,
+       4,     5,     6,     7,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    22,    48,
+      24,    -1,    26,    27,    28,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    38,    39,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    61,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -3129,66 +3094,81 @@
       94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
      104,    -1,    -1,    -1,    -1,    -1,   110,    -1,   112,    -1,
      114,   115,   116,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   154,     3,     4,   157,    -1,
+       7,   160,    -1,   162,   163,   139,   140,   141,   142,   143,
+     144,   145,   146,   147,   148,   149,   150,   151,    -1,    26,
+      27,    28,    -1,    -1,    -1,    -1,   160,    -1,    -1,    -1,
+      -1,    38,    39,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   139,   140,   141,   142,   143,
-     144,   145,   146,   147,   148,   149,   150,   151,    -1,    -1,
-      -1,    -1,    -1,    -1,     5,     6,   160,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    -1,
-      21,    22,    -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      -1,    21,    22,    -1,    24,     5,     6,    -1,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      -1,    21,    22,    -1,    24,    -1,    -1,    -1,    48,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    -1,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    37,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,
-      -1,    -1,    -1,   154,    -1,    -1,   157,    -1,    -1,   160,
-      -1,   162,     5,     6,    -1,     8,     9,    10,    11,    12,
+      -1,    -1,    -1,    -1,    61,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    79,    80,    81,    82,    83,    84,    85,    86,
+      87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
+      97,    98,    99,   100,   101,   102,   103,   104,    -1,    -1,
+      -1,    -1,    -1,   110,    -1,   112,    -1,   114,   115,   116,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   139,   140,   141,   142,   143,   144,   145,   146,
+     147,   148,   149,   150,   151,    -1,    -1,    -1,    -1,    -1,
+      -1,     5,     6,   160,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    -1,    21,    22,    -1,
+      24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     5,     6,    48,     8,     9,    10,    11,    12,
       13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
-      -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   154,    -1,    -1,   157,    -1,   159,
-     160,    -1,   162,    -1,    -1,    48,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   154,    -1,    -1,   157,    -1,    -1,
-     160,    -1,   162,     5,     6,    -1,     8,     9,    10,    11,
+      -1,    24,     5,     6,    -1,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
+      -1,    24,    -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,     5,     6,    48,     8,     9,    10,    11,
       12,    13,    14,    15,    16,    17,    18,    19,    -1,    21,
       22,    -1,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   154,    -1,    -1,   157,    -1,
-      -1,   160,    -1,   162,     5,     6,    48,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    -1,
-      21,    22,    -1,    24,     5,     6,    -1,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    -1,
-      21,    22,    -1,    24,    -1,    -1,    -1,    48,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    37,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    48,    -1,    -1,    -1,
+     154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,
+       5,     6,    -1,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    -1,    21,    22,    -1,    24,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   154,    37,    -1,   157,    -1,   159,   160,    -1,   162,
+      -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,
-      -1,    -1,    -1,    -1,    -1,     5,     6,    48,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      -1,    21,    22,    -1,    24,    -1,    -1,    -1,    -1,    -1,
+       5,     6,    -1,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,    -1,    21,    22,    -1,    24,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    48,    -1,
       -1,    -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,
-     162,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     162,     5,     6,    48,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    -1,    21,    22,    -1,
+      24,     5,     6,    -1,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    -1,    21,    22,    -1,
+      24,    -1,    -1,    -1,    48,    -1,    -1,    -1,    -1,   154,
+      -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,    -1,
+      -1,    -1,     5,     6,    48,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
+      -1,    24,     5,     6,    -1,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    -1,    21,    22,
+      -1,    24,    -1,    -1,    -1,    48,    -1,    -1,    -1,   154,
+      -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    48,    -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,   154,    -1,    -1,   157,    -1,    -1,   160,
-      -1,   162,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   154,    -1,    -1,   157,    -1,    -1,   160,
-      -1,   162,    -1,    -1,    -1,    -1,    35,    -1,    -1,    -1,
+     154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      49,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      59,    60,    -1,    -1,   154,    -1,    -1,   157,    -1,    -1,
-     160,    -1,   162,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,    -1,
-      -1,   110,   111,   112,   113,   114,   115,   116,   117,   118,
+     154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     139,   140,   141,   142,   143,   144,   145,   146,   147,   148,
-     149,   150,   151
+      -1,    -1,    -1,    -1,    35,    -1,    -1,    -1,    -1,    -1,
+      -1,   154,    -1,    -1,   157,    -1,    -1,   160,    49,   162,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    59,    60,
+      -1,   154,    -1,    -1,   157,    -1,    -1,   160,    -1,   162,
+      -1,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
+     101,   102,   103,   104,   105,   106,   107,    -1,    -1,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   139,   140,
+     141,   142,   143,   144,   145,   146,   147,   148,   149,   150,
+     151
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -3196,66 +3176,66 @@
 static const unsigned char yystos[] =
 {
        0,   200,   201,   202,     0,    25,    31,    41,    42,    43,
-      44,    45,    46,    47,    62,   181,   219,   221,   223,   231,
-      22,    24,    51,    58,    62,   180,   212,   223,   224,    61,
-      64,    65,    66,    67,    68,    69,    70,   182,   217,    23,
-     232,   233,    30,   163,   220,   232,    52,    53,    54,    71,
-     209,   152,    61,    20,    45,    47,    50,   181,   152,    45,
-      47,   222,    24,   207,     4,     5,     6,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    21,
-      48,   154,   157,   160,   162,   167,   189,   190,   191,   192,
-     193,   212,   228,    29,   162,   218,   180,   237,   152,   152,
-     152,   152,   157,   210,   207,   189,    32,    33,   199,   199,
-     199,   199,   225,     4,     4,     4,   162,     8,   163,   193,
-     194,   212,   155,   164,    35,    49,    59,    60,    72,    73,
+      44,    45,    46,    47,    62,   181,   219,   222,   224,   232,
+      22,    24,    51,    58,    62,   180,   212,   224,   225,    61,
+     220,    23,   233,   234,    30,   163,   221,   233,    52,    53,
+      54,    71,   209,   152,    61,    20,    45,    47,    50,   181,
+     152,    45,    47,   223,    24,   207,    64,    65,    66,    67,
+      68,    69,    70,   182,   217,   180,   238,   152,   152,   152,
+     152,   157,   210,   207,     5,     6,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    21,    48,
+     154,   157,   160,   162,   167,   189,   190,   191,   192,   193,
+     212,   229,    32,    33,   199,   199,   199,   199,   226,     4,
+     189,    29,   162,   218,    35,    49,    59,    60,    72,    73,
       74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
       84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
       94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
      104,   105,   106,   107,   110,   111,   112,   113,   114,   115,
      116,   117,   118,   139,   140,   141,   142,   143,   144,   145,
      146,   147,   148,   149,   150,   151,   169,   170,   171,   174,
-     175,   234,   235,   241,   242,   244,   245,    24,    55,    56,
-     208,     4,    24,    24,   211,   191,   191,   191,     9,    10,
+     175,   235,   236,   242,   243,   245,   246,    24,    55,    56,
+     208,     4,    24,    24,   211,     4,     4,     4,   162,     8,
+     163,   193,   194,   155,   164,   191,   191,   191,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,   176,
-     177,   179,   191,   196,   217,   158,   158,   163,   194,   153,
-     163,   155,    37,   194,   195,   191,   230,    59,     8,   230,
-       9,    21,    10,    11,    12,    13,    14,    15,    16,    17,
-     176,   177,   178,   182,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   172,    27,    28,   125,   126,   127,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   173,   191,   191,   230,   191,   191,   238,   230,   230,
-     230,   230,   230,   230,   230,   191,   191,   191,   230,   230,
-     182,   108,   109,   153,   159,   205,   206,   204,    27,    28,
+     177,   179,   191,   196,   217,   212,   191,   231,    59,     8,
+     231,     9,    21,    10,    11,    12,    13,    14,    15,    16,
+      17,   176,   177,   178,   182,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   172,    27,    28,   125,   126,
+     127,   128,   129,   130,   131,   132,   133,   134,   135,   136,
+     137,   138,   173,   191,   191,   231,   191,   191,   239,   231,
+     231,   231,   231,   231,   231,   231,   191,   191,   191,   231,
+     231,   182,   108,   109,   153,   159,   158,   158,   163,   194,
+     153,   163,    37,   194,   195,   205,   206,   204,    27,    28,
        3,     4,   168,     4,     7,    26,    38,    39,   103,   104,
      110,   112,   114,   115,   116,   157,   160,   162,   165,   169,
-     170,   171,   174,   175,   197,   228,   203,   193,   193,   161,
-     163,   193,    37,   191,   214,   215,   216,   153,   156,     3,
-       4,     7,    26,    27,    28,    38,    39,    61,   160,   197,
-     227,   228,   229,   229,   229,   229,   189,   191,   191,   153,
-     184,   153,   184,   229,   157,   153,   153,   153,   153,   153,
-     153,   153,   153,   229,   229,   229,   153,    36,   189,   191,
-     230,    24,   153,   187,   187,   187,   172,   173,   155,   155,
-     155,   155,   155,   159,   196,   198,   162,   198,   163,   198,
-      24,   155,   155,   155,   155,   155,   187,   159,   161,   161,
-     212,   213,   153,   156,    37,    63,   226,   198,   153,   153,
-     229,   229,   229,    15,    57,    15,   153,   243,   229,   157,
-     230,   191,   230,   230,   230,   191,   191,   153,   153,   153,
-     230,   191,   229,   229,   153,    34,    57,   185,   188,   155,
-     155,   196,   196,   196,   196,   196,   153,   159,   163,   193,
-     198,   161,   163,   196,   196,   196,   196,   196,    37,   214,
-     185,   186,    24,   161,    21,    21,   155,   153,   153,   229,
-       4,   229,   230,   239,   153,   229,   153,   153,   153,   229,
-     229,   229,   155,   191,    24,     4,   187,   196,   196,   243,
-     153,   153,   153,   153,   196,   161,   163,   153,   153,   153,
-     153,    36,    57,   183,   153,   229,   229,   239,   240,   229,
-     229,   153,   184,   184,   153,   229,   153,   230,   230,   230,
-     240,   229,   153,   153,   156,   196,   196,   196,   196,   161,
-     196,   196,   196,   196,   191,     4,    24,   153,   157,   156,
-     230,   159,   229,   156,   196,   196,   153,   156,   153,   153,
-     156,   156,   156,   156,   156,    21,   159,   178,   236,    36,
-     159,   156,   156,   196,   196,   196,   229,   227,   159,   178,
-      21,   156,   156,   156,   153,   227,   229,    21,   153,   234,
-     229,    21,    21,   229,   229
+     170,   171,   174,   175,   197,   229,   203,   155,     3,     4,
+       7,    26,    27,    28,    38,    39,    61,   160,   197,   228,
+     229,   230,   230,   230,   230,   189,   191,   191,   153,   184,
+     153,   184,   230,   157,   153,   153,   153,   153,   153,   153,
+     153,   153,   230,   230,   230,   153,    36,   189,   191,   231,
+      24,   193,   193,   161,   163,   193,   153,   156,   153,   187,
+     187,   187,   172,   173,   155,   155,   155,   155,   155,   159,
+     196,   198,   162,   198,   163,   198,    24,   155,   155,   155,
+     155,   155,   187,    37,   191,   214,   215,   216,    63,   227,
+     198,   153,   153,   230,   230,   230,    15,    57,    15,   153,
+     244,   230,   157,   231,   191,   231,   231,   231,   191,   191,
+     153,   153,   153,   231,   191,   230,   230,   153,   159,   161,
+     161,    37,    34,    57,   185,   188,   155,   155,   196,   196,
+     196,   196,   196,   153,   159,   163,   193,   198,   161,   163,
+     196,   196,   196,   196,   196,   212,   213,   153,   156,    24,
+     161,    21,    21,   155,   153,   153,   230,     4,   230,   231,
+     240,   153,   230,   153,   153,   153,   230,   230,   230,   155,
+     191,    24,     4,   187,   196,   196,   244,   153,   153,   153,
+     153,   196,   161,   163,   153,   153,   153,   153,    36,    37,
+     214,   185,   186,   153,   230,   230,   240,   241,   230,   230,
+     153,   184,   184,   153,   230,   153,   231,   231,   231,   241,
+     230,   153,   153,   156,   196,   196,   196,   196,   161,   196,
+     196,   196,   196,   191,    57,   183,    24,   153,   157,   156,
+     231,   159,   230,   156,   196,   196,   153,   156,   153,   153,
+     156,   156,   156,   156,   156,     4,    21,   159,   178,   237,
+      36,   159,   156,   156,   196,   196,   196,   230,   228,   159,
+     178,    21,   156,   156,   156,   153,   228,   230,    21,   153,
+     235,   230,    21,    21,   230,   230
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -5441,25 +5421,21 @@
           CurModule.RenameMap[Key] = Conflict->getName();
           Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
           InsertValue(Fn, CurModule.Values);
-        } else if (CurFun.Linkage == GlobalValue::InternalLinkage) {
-          // We can safely rename the function we're defining
-          std::string NewName = makeNameUnique(FunctionName);
-          Fn = new Function(FT, CurFun.Linkage, NewName, M);
-          InsertValue(Fn, CurModule.Values);
-          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
-          CurModule.RenameMap[Key] = NewName;
-        } else {
+        } else { 
           // We can't quietly rename either of these things, but we must
-          // rename one of them. Generate a warning about the renaming and
-          // elect to rename the thing we're now defining.
+          // rename one of them. Only if the function's linkage is internal can
+          // we forgo a warning message about the renamed function. 
           std::string NewName = makeNameUnique(FunctionName);
-          warning("Renaming function '" + FunctionName + "' as '" + NewName +
-                  "' may cause linkage errors");
+          if (CurFun.Linkage != GlobalValue::InternalLinkage) {
+            warning("Renaming function '" + FunctionName + "' as '" + NewName +
+                    "' may cause linkage errors");
+          }
+          // Elect to rename the thing we're now defining.
           Fn = new Function(FT, CurFun.Linkage, NewName, M);
           InsertValue(Fn, CurModule.Values);
           RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
           CurModule.RenameMap[Key] = NewName;
-        }
+        } 
       } else {
         // There's no conflict, just define the function
         Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
@@ -5506,50 +5482,55 @@
     break;
 
   case 224:
-#line 3008 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3004 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+    { CurFun.Linkage = (yyvsp[0].Linkage); ;}
+    break;
+
+  case 225:
+#line 3004 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.FunctionVal) = CurFun.CurrentFunction;
 
     // Make sure that we keep track of the linkage type even if there was a
     // previous "declare".
-    (yyval.FunctionVal)->setLinkage((yyvsp[-2].Linkage));
+    (yyval.FunctionVal)->setLinkage((yyvsp[-3].Linkage));
   ;}
     break;
 
-  case 227:
-#line 3022 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 228:
+#line 3018 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   ;}
     break;
 
-  case 228:
-#line 3027 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 229:
+#line 3023 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
     break;
 
-  case 229:
-#line 3028 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 230:
+#line 3024 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
     break;
 
-  case 230:
-#line 3029 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 231:
+#line 3025 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
     break;
 
-  case 231:
-#line 3033 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 232:
+#line 3029 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
-  case 232:
-#line 3034 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 233:
+#line 3030 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { CurFun.Linkage = (yyvsp[0].Linkage); ;}
     break;
 
-  case 233:
-#line 3034 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 234:
+#line 3030 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.FunctionVal) = CurFun.CurrentFunction;
     CurFun.FunctionDone();
@@ -5557,64 +5538,64 @@
   ;}
     break;
 
-  case 234:
-#line 3046 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 235:
+#line 3042 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 235:
-#line 3047 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 236:
+#line 3043 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 236:
-#line 3052 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 237:
+#line 3048 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val)); ;}
     break;
 
-  case 237:
-#line 3053 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 238:
+#line 3049 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val)); ;}
     break;
 
-  case 238:
-#line 3054 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 239:
+#line 3050 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal)); ;}
     break;
 
-  case 239:
-#line 3055 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 240:
+#line 3051 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, true));
     (yyval.ValIDVal).S.makeUnsigned();
   ;}
     break;
 
-  case 240:
-#line 3059 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 241:
+#line 3055 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     (yyval.ValIDVal) = ValID::create(ConstantInt::get(Type::Int1Ty, false)); 
     (yyval.ValIDVal).S.makeUnsigned();
   ;}
     break;
 
-  case 241:
-#line 3063 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 242:
+#line 3059 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::createNull(); ;}
     break;
 
-  case 242:
-#line 3064 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 243:
+#line 3060 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::createUndef(); ;}
     break;
 
-  case 243:
-#line 3065 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 244:
+#line 3061 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValIDVal) = ValID::createZeroInit(); ;}
     break;
 
-  case 244:
-#line 3066 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 245:
+#line 3062 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[-1].ConstVector))[0].C->getType();
     int NumElements = (yyvsp[-1].ConstVector)->size(); 
@@ -5638,16 +5619,16 @@
   ;}
     break;
 
-  case 245:
-#line 3087 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 246:
+#line 3083 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal).C);
     (yyval.ValIDVal).S.copy((yyvsp[0].ConstVal).S);
   ;}
     break;
 
-  case 246:
-#line 3091 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 247:
+#line 3087 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
     std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
@@ -5659,18 +5640,18 @@
   ;}
     break;
 
-  case 247:
-#line 3105 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 248:
+#line 3101 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {  (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal)); (yyval.ValIDVal).S.makeSignless(); ;}
     break;
 
-  case 248:
-#line 3106 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 249:
+#line 3102 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {  (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal)); (yyval.ValIDVal).S.makeSignless(); ;}
     break;
 
-  case 251:
-#line 3119 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 252:
+#line 3115 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { 
     const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
@@ -5680,22 +5661,22 @@
   ;}
     break;
 
-  case 252:
-#line 3129 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 253:
+#line 3125 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   ;}
     break;
 
-  case 253:
-#line 3132 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 254:
+#line 3128 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   ;}
     break;
 
-  case 254:
-#line 3141 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 255:
+#line 3137 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     ValueInfo VI; VI.V = (yyvsp[0].TermInstVal).TI; VI.S.copy((yyvsp[0].TermInstVal).S);
     setValueName(VI, (yyvsp[-1].StrVal));
@@ -5706,8 +5687,8 @@
   ;}
     break;
 
-  case 255:
-#line 3152 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 256:
+#line 3148 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if ((yyvsp[0].InstVal).I)
       (yyvsp[-1].BasicBlockVal)->getInstList().push_back((yyvsp[0].InstVal).I);
@@ -5715,8 +5696,8 @@
   ;}
     break;
 
-  case 256:
-#line 3157 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 257:
+#line 3153 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++),true);
     // Make sure to move the basic block to the correct location in the
@@ -5728,8 +5709,8 @@
   ;}
     break;
 
-  case 257:
-#line 3166 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 258:
+#line 3162 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp[0].StrVal)), true);
     // Make sure to move the basic block to the correct location in the
@@ -5741,24 +5722,24 @@
   ;}
     break;
 
-  case 260:
-#line 3180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 261:
+#line 3176 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {              // Return with a result...
     (yyval.TermInstVal).TI = new ReturnInst((yyvsp[0].ValueVal).V);
     (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
-  case 261:
-#line 3184 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 262:
+#line 3180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                                       // Return with no result...
     (yyval.TermInstVal).TI = new ReturnInst();
     (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
-  case 262:
-#line 3188 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 263:
+#line 3184 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {                         // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     (yyval.TermInstVal).TI = new BranchInst(tmpBB);
@@ -5766,8 +5747,8 @@
   ;}
     break;
 
-  case 263:
-#line 3193 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 264:
+#line 3189 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {  
     (yyvsp[-3].ValIDVal).S.makeSignless();
     (yyvsp[0].ValIDVal).S.makeSignless();
@@ -5780,8 +5761,8 @@
   ;}
     break;
 
-  case 264:
-#line 3203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 265:
+#line 3199 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-6].ValIDVal).S.copy((yyvsp[-7].PrimType).S);
     Value* tmpVal = getVal((yyvsp[-7].PrimType).T, (yyvsp[-6].ValIDVal));
@@ -5802,8 +5783,8 @@
   ;}
     break;
 
-  case 265:
-#line 3221 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 266:
+#line 3217 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-5].ValIDVal).S.copy((yyvsp[-6].PrimType).S);
     Value* tmpVal = getVal((yyvsp[-6].PrimType).T, (yyvsp[-5].ValIDVal));
@@ -5815,8 +5796,8 @@
   ;}
     break;
 
-  case 266:
-#line 3231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 267:
+#line 3227 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const PointerType *PFTy;
     const FunctionType *Ty;
@@ -5883,24 +5864,24 @@
   ;}
     break;
 
-  case 267:
-#line 3295 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 268:
+#line 3291 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.TermInstVal).TI = new UnwindInst();
     (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
-  case 268:
-#line 3299 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 269:
+#line 3295 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.TermInstVal).TI = new UnreachableInst();
     (yyval.TermInstVal).S.makeSignless();
   ;}
     break;
 
-  case 269:
-#line 3306 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 270:
+#line 3302 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.JumpTable) = (yyvsp[-5].JumpTable);
     (yyvsp[-3].ValIDVal).S.copy((yyvsp[-4].PrimType).S);
@@ -5915,8 +5896,8 @@
   ;}
     break;
 
-  case 270:
-#line 3318 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 271:
+#line 3314 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     (yyvsp[-3].ValIDVal).S.copy((yyvsp[-4].PrimType).S);
@@ -5931,8 +5912,8 @@
   ;}
     break;
 
-  case 271:
-#line 3333 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 272:
+#line 3329 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     bool omit = false;
     if ((yyvsp[-1].StrVal))
@@ -5964,8 +5945,8 @@
   ;}
     break;
 
-  case 272:
-#line 3363 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 273:
+#line 3359 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {    // Used for PHI nodes
     (yyval.PHIList).P = new std::list<std::pair<Value*, BasicBlock*> >();
     (yyval.PHIList).S.copy((yyvsp[-5].TypeVal).S);
@@ -5978,8 +5959,8 @@
   ;}
     break;
 
-  case 273:
-#line 3373 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 274:
+#line 3369 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.PHIList) = (yyvsp[-6].PHIList);
     (yyvsp[-3].ValIDVal).S.copy((yyvsp[-6].PHIList).S);
@@ -5990,43 +5971,43 @@
   ;}
     break;
 
-  case 274:
-#line 3383 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 275:
+#line 3379 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {    // Used for call statements, and memory insts...
     (yyval.ValueList) = new std::vector<ValueInfo>();
     (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
   ;}
     break;
 
-  case 275:
-#line 3387 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 276:
+#line 3383 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.ValueList) = (yyvsp[-2].ValueList);
     (yyvsp[-2].ValueList)->push_back((yyvsp[0].ValueVal));
   ;}
     break;
 
-  case 277:
-#line 3395 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 278:
+#line 3391 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValueList) = 0; ;}
     break;
 
-  case 278:
-#line 3399 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 279:
+#line 3395 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.BoolVal) = true;
   ;}
     break;
 
-  case 279:
-#line 3402 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 280:
+#line 3398 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.BoolVal) = false;
   ;}
     break;
 
-  case 280:
-#line 3408 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 281:
+#line 3404 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
@@ -6048,8 +6029,8 @@
   ;}
     break;
 
-  case 281:
-#line 3427 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 282:
+#line 3423 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
@@ -6070,8 +6051,8 @@
   ;}
     break;
 
-  case 282:
-#line 3445 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 283:
+#line 3441 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
@@ -6090,8 +6071,8 @@
   ;}
     break;
 
-  case 283:
-#line 3461 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 284:
+#line 3457 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
@@ -6108,8 +6089,8 @@
   ;}
     break;
 
-  case 284:
-#line 3475 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 285:
+#line 3471 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
@@ -6126,8 +6107,8 @@
   ;}
     break;
 
-  case 285:
-#line 3489 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 286:
+#line 3485 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     warning("Use of obsolete 'not' instruction: Replacing with 'xor");
     const Type *Ty = (yyvsp[0].ValueVal).V->getType();
@@ -6141,8 +6122,8 @@
   ;}
     break;
 
-  case 286:
-#line 3500 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 287:
+#line 3496 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[0].ValueVal).V->getType()->isInteger() ||
         cast<IntegerType>((yyvsp[0].ValueVal).V->getType())->getBitWidth() != 8)
@@ -6163,8 +6144,8 @@
   ;}
     break;
 
-  case 287:
-#line 3518 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 288:
+#line 3514 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *DstTy = (yyvsp[0].TypeVal).PAT->get();
     if (!DstTy->isFirstClassType())
@@ -6176,8 +6157,8 @@
   ;}
     break;
 
-  case 288:
-#line 3527 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 289:
+#line 3523 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!(yyvsp[-4].ValueVal).V->getType()->isInteger() ||
         cast<IntegerType>((yyvsp[-4].ValueVal).V->getType())->getBitWidth() != 1)
@@ -6189,8 +6170,8 @@
   ;}
     break;
 
-  case 289:
-#line 3536 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 290:
+#line 3532 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
     NewVarArgs = true;
@@ -6200,8 +6181,8 @@
   ;}
     break;
 
-  case 290:
-#line 3543 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 291:
+#line 3539 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type* ArgTy = (yyvsp[-2].ValueVal).V->getType();
     const Type* DstTy = (yyvsp[0].TypeVal).PAT->get();
@@ -6225,8 +6206,8 @@
   ;}
     break;
 
-  case 291:
-#line 3564 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 292:
+#line 3560 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type* ArgTy = (yyvsp[-2].ValueVal).V->getType();
     const Type* DstTy = (yyvsp[0].TypeVal).PAT->get();
@@ -6253,8 +6234,8 @@
   ;}
     break;
 
-  case 292:
-#line 3588 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 293:
+#line 3584 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
       error("Invalid extractelement operands");
@@ -6263,8 +6244,8 @@
   ;}
     break;
 
-  case 293:
-#line 3594 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 294:
+#line 3590 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
       error("Invalid insertelement operands");
@@ -6273,8 +6254,8 @@
   ;}
     break;
 
-  case 294:
-#line 3600 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 295:
+#line 3596 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
       error("Invalid shufflevector operands");
@@ -6283,8 +6264,8 @@
   ;}
     break;
 
-  case 295:
-#line 3606 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 296:
+#line 3602 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[0].PHIList).P->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -6303,8 +6284,8 @@
   ;}
     break;
 
-  case 296:
-#line 3622 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 297:
+#line 3618 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     // Handle the short call syntax
     const PointerType *PFTy;
@@ -6391,35 +6372,35 @@
   ;}
     break;
 
-  case 297:
-#line 3706 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 298:
+#line 3702 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyval.InstVal) = (yyvsp[0].InstVal);
   ;}
     break;
 
-  case 298:
-#line 3714 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 299:
+#line 3710 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValueList) = (yyvsp[0].ValueList); ;}
     break;
 
-  case 299:
-#line 3715 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 300:
+#line 3711 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.ValueList) = new std::vector<ValueInfo>(); ;}
     break;
 
-  case 300:
-#line 3719 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 301:
+#line 3715 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 301:
-#line 3720 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 302:
+#line 3716 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 302:
-#line 3724 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 303:
+#line 3720 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
     (yyval.InstVal).S.makeComposite((yyvsp[-1].TypeVal).S);
@@ -6428,8 +6409,8 @@
   ;}
     break;
 
-  case 303:
-#line 3730 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 304:
+#line 3726 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-4].TypeVal).PAT->get();
     (yyvsp[-1].ValIDVal).S.makeUnsigned();
@@ -6439,8 +6420,8 @@
   ;}
     break;
 
-  case 304:
-#line 3737 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 305:
+#line 3733 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
     (yyval.InstVal).S.makeComposite((yyvsp[-1].TypeVal).S);
@@ -6449,8 +6430,8 @@
   ;}
     break;
 
-  case 305:
-#line 3743 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 306:
+#line 3739 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *Ty = (yyvsp[-4].TypeVal).PAT->get();
     (yyvsp[-1].ValIDVal).S.makeUnsigned();
@@ -6460,8 +6441,8 @@
   ;}
     break;
 
-  case 306:
-#line 3750 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 307:
+#line 3746 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type *PTy = (yyvsp[0].ValueVal).V->getType();
     if (!isa<PointerType>(PTy))
@@ -6471,8 +6452,8 @@
   ;}
     break;
 
-  case 307:
-#line 3757 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 308:
+#line 3753 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     const Type* Ty = (yyvsp[-1].TypeVal).PAT->get();
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
@@ -6488,8 +6469,8 @@
   ;}
     break;
 
-  case 308:
-#line 3770 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 309:
+#line 3766 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
     const PointerType *PTy = dyn_cast<PointerType>((yyvsp[-1].TypeVal).PAT->get());
@@ -6518,8 +6499,8 @@
   ;}
     break;
 
-  case 309:
-#line 3796 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+  case 310:
+#line 3792 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
     {
     (yyvsp[-1].ValIDVal).S.copy((yyvsp[-2].TypeVal).S);
     const Type* Ty = (yyvsp[-2].TypeVal).PAT->get();
@@ -6543,7 +6524,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 6547 "UpgradeParser.tab.c"
+#line 6528 "UpgradeParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -6811,7 +6792,7 @@
 }
 
 
-#line 3814 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
+#line 3810 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
 
 
 int yyerror(const char *ErrorMsg) {


Index: llvm/tools/llvm-upgrade/UpgradeParser.y.cvs
diff -u llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.66 llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.67
--- llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.66	Wed Mar 21 12:15:50 2007
+++ llvm/tools/llvm-upgrade/UpgradeParser.y.cvs	Wed Mar 21 12:27:53 2007
@@ -2936,25 +2936,21 @@
           CurModule.RenameMap[Key] = Conflict->getName();
           Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
           InsertValue(Fn, CurModule.Values);
-        } else if (CurFun.Linkage == GlobalValue::InternalLinkage) {
-          // We can safely rename the function we're defining
-          std::string NewName = makeNameUnique(FunctionName);
-          Fn = new Function(FT, CurFun.Linkage, NewName, M);
-          InsertValue(Fn, CurModule.Values);
-          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
-          CurModule.RenameMap[Key] = NewName;
-        } else {
+        } else { 
           // We can't quietly rename either of these things, but we must
-          // rename one of them. Generate a warning about the renaming and
-          // elect to rename the thing we're now defining.
+          // rename one of them. Only if the function's linkage is internal can
+          // we forgo a warning message about the renamed function. 
           std::string NewName = makeNameUnique(FunctionName);
-          warning("Renaming function '" + FunctionName + "' as '" + NewName +
-                  "' may cause linkage errors");
+          if (CurFun.Linkage != GlobalValue::InternalLinkage) {
+            warning("Renaming function '" + FunctionName + "' as '" + NewName +
+                    "' may cause linkage errors");
+          }
+          // Elect to rename the thing we're now defining.
           Fn = new Function(FT, CurFun.Linkage, NewName, M);
           InsertValue(Fn, CurModule.Values);
           RenameMapKey Key = makeRenameMapKey(FunctionName, PFT, ID.S);
           CurModule.RenameMap[Key] = NewName;
-        }
+        } 
       } else {
         // There's no conflict, just define the function
         Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
@@ -3005,7 +3001,7 @@
   ;
 
 FunctionHeader 
-  : OptLinkage FunctionHeaderH BEGIN {
+  : OptLinkage { CurFun.Linkage = $1; } FunctionHeaderH BEGIN {
     $$ = CurFun.CurrentFunction;
 
     // Make sure that we keep track of the linkage type even if there was a





From evan.cheng at apple.com  Wed Mar 21 14:59:22 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 21 Mar 2007 14:59:22 -0500
Subject: [llvm-commits] CVS: llvm-test/TEST.nightly.Makefile
	TEST.llc.Makefile
Message-ID: <200703211959.l2LJxM4e004139@zion.cs.uiuc.edu>



Changes in directory llvm-test:

TEST.nightly.Makefile updated: 1.45 -> 1.46
TEST.llc.Makefile updated: 1.5 -> 1.6
---
Log message:

Pass  to llc to get accurate timing info.

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

 TEST.llc.Makefile     |    2 +-
 TEST.nightly.Makefile |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


Index: llvm-test/TEST.nightly.Makefile
diff -u llvm-test/TEST.nightly.Makefile:1.45 llvm-test/TEST.nightly.Makefile:1.46
--- llvm-test/TEST.nightly.Makefile:1.45	Fri Feb  2 22:30:17 2007
+++ llvm-test/TEST.nightly.Makefile	Wed Mar 21 14:58:59 2007
@@ -61,7 +61,7 @@
 	-head -n 100 Output/$*.exe-llc >> $@
 	@-if test -f Output/$*.exe-llc; then \
 	  echo "TEST-PASS: llc $(RELDIR)/$*" >> $@;\
-	  $(LLC) $< -o /dev/null -f $(TIMEOPT) >> $@ 2>&1; \
+	  $(LLC) $< $(LLCFLAGS) -o /dev/null -f $(TIMEOPT) >> $@ 2>&1; \
 	  printf "TEST-RESULT-llc: " >> $@;\
 	  grep "Total Execution Time" $@.info >> $@;\
 	  printf "TEST-RESULT-llc-time: " >> $@;\
@@ -78,7 +78,7 @@
 	-head -n 100 Output/$*.exe-llc-beta >> $@
 	@-if test -f Output/$*.exe-llc-beta; then \
 	  echo "TEST-PASS: llc-beta $(RELDIR)/$*" >> $@;\
-	  $(LLC) $< $(LLCBETAOPTION) -o /dev/null -f $(TIMEOPT) >> $@ 2>&1; \
+	  $(LLC) $< $(LLCFLAGS) $(LLCBETAOPTION) -o /dev/null -f $(TIMEOPT) >> $@ 2>&1; \
 	  printf "TEST-RESULT-llc-beta: " >> $@;\
 	  grep "Total Execution Time" $@.info >> $@;\
 	  printf "TEST-RESULT-llc-beta-time: " >> $@;\


Index: llvm-test/TEST.llc.Makefile
diff -u llvm-test/TEST.llc.Makefile:1.5 llvm-test/TEST.llc.Makefile:1.6
--- llvm-test/TEST.llc.Makefile:1.5	Sat Jan 15 21:16:09 2005
+++ llvm-test/TEST.llc.Makefile	Wed Mar 21 14:58:59 2007
@@ -6,7 +6,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-LLC_OPTS = -f -o=/dev/null -stats -time-passes -regalloc=linearscan
+LLC_OPTS = $(LLCFLAGS) -f -o=/dev/null -stats -time-passes -regalloc=linearscan
 CURDIR  := $(shell cd .; pwd)
 PROGDIR := $(PROJ_SRC_ROOT)
 RELDIR  := $(subst $(PROGDIR),,$(CURDIR))





From evan.cheng at apple.com  Wed Mar 21 15:14:22 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 21 Mar 2007 15:14:22 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
Message-ID: <200703212014.l2LKEMZ7004599@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

DAGCombiner.cpp updated: 1.275 -> 1.276
---
Log message:

fold (truncate (srl (load x), c)) -> (smaller load (x+c/vt bits))

---
Diffs of the changes:  (+24 -6)

 DAGCombiner.cpp |   30 ++++++++++++++++++++++++------
 1 files changed, 24 insertions(+), 6 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.275 llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.276
--- llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.275	Wed Mar  7 02:07:03 2007
+++ llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp	Wed Mar 21 15:14:05 2007
@@ -2298,6 +2298,7 @@
 SDOperand DAGCombiner::visitTRUNCATE(SDNode *N) {
   SDOperand N0 = N->getOperand(0);
   MVT::ValueType VT = N->getValueType(0);
+  unsigned VTBits = MVT::getSizeInBits(VT);
 
   // noop truncate
   if (N0.getValueType() == N->getValueType(0))
@@ -2322,30 +2323,47 @@
       // and the truncate
       return N0.getOperand(0);
   }
+
   // fold (truncate (load x)) -> (smaller load x)
+  // fold (truncate (srl (load x), c)) -> (smaller load (x+c/evtbits))
+  unsigned ShAmt = 0;
+  if (N0.getOpcode() == ISD::SRL && N0.hasOneUse()) {
+    if (ConstantSDNode *N01 = dyn_cast<ConstantSDNode>(N0.getOperand(1))) {
+      ShAmt = N01->getValue();
+      // Is the shift amount a multiple of size of VT?
+      if ((ShAmt & (VTBits-1)) == 0) {
+        N0 = N0.getOperand(0);
+        if (MVT::getSizeInBits(N0.getValueType()) <= VTBits)
+          return SDOperand();
+        ShAmt /= VTBits;
+      }
+    }
+  }
   if (ISD::isNON_EXTLoad(N0.Val) && N0.hasOneUse() &&
       // Do not allow folding to i1 here.  i1 is implicitly stored in memory in
       // zero extended form: by shrinking the load, we lose track of the fact
       // that it is already zero extended.
       // FIXME: This should be reevaluated.
       VT != MVT::i1) {
-    assert(MVT::getSizeInBits(N0.getValueType()) > MVT::getSizeInBits(VT) &&
+    assert(MVT::getSizeInBits(N0.getValueType()) > VTBits &&
            "Cannot truncate to larger type!");
     LoadSDNode *LN0 = cast<LoadSDNode>(N0);
     MVT::ValueType PtrType = N0.getOperand(1).getValueType();
     // For big endian targets, we need to add an offset to the pointer to load
     // the correct bytes.  For little endian systems, we merely need to read
     // fewer bytes from the same pointer.
-    uint64_t PtrOff = 
-      (MVT::getSizeInBits(N0.getValueType()) - MVT::getSizeInBits(VT)) / 8;
-    SDOperand NewPtr = TLI.isLittleEndian() ? LN0->getBasePtr() : 
-      DAG.getNode(ISD::ADD, PtrType, LN0->getBasePtr(),
-                  DAG.getConstant(PtrOff, PtrType));
+    uint64_t PtrOff =  ShAmt
+      ? ShAmt : (TLI.isLittleEndian() ? 0
+                 : (MVT::getSizeInBits(N0.getValueType()) - VTBits) / 8);
+    SDOperand NewPtr = DAG.getNode(ISD::ADD, PtrType, LN0->getBasePtr(),
+                                   DAG.getConstant(PtrOff, PtrType));
     AddToWorkList(NewPtr.Val);
     SDOperand Load = DAG.getLoad(VT, LN0->getChain(), NewPtr,
                                  LN0->getSrcValue(), LN0->getSrcValueOffset());
     AddToWorkList(N);
     CombineTo(N0.Val, Load, Load.getValue(1));
+    if (ShAmt)
+      return DAG.getNode(ISD::TRUNCATE, VT, Load);
     return SDOperand(N, 0);   // Return N so it doesn't get rechecked!
   }
   return SDOperand();





From evan.cheng at apple.com  Wed Mar 21 15:15:28 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 21 Mar 2007 15:15:28 -0500
Subject: [llvm-commits] CVS: llvm/test/CodeGen/ARM/trunc_ldr.ll
Message-ID: <200703212015.l2LKFSNK004631@zion.cs.uiuc.edu>



Changes in directory llvm/test/CodeGen/ARM:

trunc_ldr.ll added (r1.1)
---
Log message:

New test case.

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

 trunc_ldr.ll |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+)


Index: llvm/test/CodeGen/ARM/trunc_ldr.ll
diff -c /dev/null llvm/test/CodeGen/ARM/trunc_ldr.ll:1.1
*** /dev/null	Wed Mar 21 15:15:06 2007
--- llvm/test/CodeGen/ARM/trunc_ldr.ll	Wed Mar 21 15:14:56 2007
***************
*** 0 ****
--- 1,27 ----
+ ; RUN: llvm-as < %s | llc -march=arm &&
+ ; RUN: llvm-as < %s | llc -march=arm | grep "ldrb.*7"
+ 
+ 	%struct.A = type { i8, i8, i8, i8, i16, i8, i8, %struct.B** }
+ 	%struct.B = type { float, float, i32, i32, i32, [0 x i8] }
+ 
+ implementation   ; Functions:
+ 
+ define i32 @f1(%struct.A* %d) {
+ entry:
+ 	%tmp2 = getelementptr %struct.A* %d, i32 0, i32 4
+ 	%tmp23 = bitcast i16* %tmp2 to i32*
+ 	%tmp4 = load i32* %tmp23
+ 	%tmp512 = lshr i32 %tmp4, 24
+ 	%tmp56 = trunc i32 %tmp512 to i8
+ 	icmp eq i8 %tmp56, 0
+ 	br i1 %0, label %UnifiedReturnBlock, label %conArue
+ 
+ conArue:
+ 	%tmp8 = tail call i32 @f( %struct.A* %d )
+ 	ret i32 %tmp8
+ 
+ UnifiedReturnBlock:
+ 	ret i32 0
+ }
+ 
+ declare i32 @f(%struct.A*)





From lauro.venancio at gmail.com  Wed Mar 21 15:52:03 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Wed, 21 Mar 2007 17:52:03 -0300
Subject: [llvm-commits] [125160] Better support for variable size struct
	fields.
In-Reply-To: <20070319205502.57CDCA51EA27@src>
References: <20070319205502.57CDCA51EA27@src>
Message-ID: <9c10c9f0703211352u1cb00168s3a029fd8f1ed9ba6@mail.gmail.com>

Something in this patch broke the llvm-gcc compilation on arm-linux:

 /home/laurov/llvm/llvm-gcc/build/gcc/xgcc
-B/home/laurov/llvm/llvm-gcc/build/gcc/
-B/usr/local/arm-linux-gnueabi/bin/
-B/usr/local/arm-linux-gnueabi/lib/ -isystem
/usr/local/arm-linux-gnueabi/include -isystem
/usr/local/arm-linux-gnueabi/sys-include -O2  -DIN_GCC    -W -Wall
-Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes
-Wold-style-definition  -isystem ./include  -fPIC -g
-DHAVE_GTHR_DEFAULT -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED  -I. -I.
-I/home/laurov/llvm/llvm-gcc/gcc -I/home/laurov/llvm/llvm-gcc/gcc/.
-I/home/laurov/llvm/llvm-gcc/gcc/../include
-I/home/laurov/llvm/llvm-gcc/gcc/../libcpp/include
-I/home/laurov/llvm/llvm/include
-I/home/laurov/llvm/llvm/build//include -fexceptions  -c
/home/laurov/llvm/llvm-gcc/gcc/config/arm/unwind-arm.c -o
libgcc/./unwind-arm.o
cc1: /home/laurov/llvm/llvm-gcc/gcc/llvm-types.cpp:968: unsigned int
StructTypeConversionInfo::getLLVMFieldFor(uint64_t, unsigned int&,
bool): Assertion `0 && "Could not find field!"' failed.
/home/laurov/llvm/llvm-gcc/gcc/config/arm/unwind-arm.c: In function
'_Unwind_Complete':
/home/laurov/llvm/llvm-gcc/gcc/config/arm/unwind-arm.c:582: internal
compiler error: Aborted
Please submit a full bug report,
with preprocessed source if appropriate.
See <URL:http://llvm.org/bugs> for instructions.
make[2]: *** [libgcc/./unwind-arm.o] Error 1



This bug can be reproduced using llvm-gcc for i386:

laurov at edgy-laptop:/tmp$ llvm-gcc unwind-arm.c
cc1: ../../gcc/llvm-types.cpp:968: unsigned int
StructTypeConversionInfo::getLLVMFieldFor(uint64_t, unsigned int&,
bool): Assertion `0 && "Could not find field!"' failed.
unwind-arm.c: In function 'get_eit_entry':
unwind-arm.c:382: internal compiler error: Aborted
Please submit a full bug report,
with preprocessed source if appropriate.
See <URL:http://llvm.org/bugs> for instructions.

Lauro


2007/3/19, dpatel at apple.com <dpatel at apple.com>:
> Revision: 125160
> Author:   dpatel
> Date:     2007-03-19 13:55:02 -0700 (Mon, 19 Mar 2007)
>
> Log Message:
> -----------
> Better support for variable size struct fields.
> Patch by Duncan Sands.
>
> Modified Paths:
> --------------
>     apple-local/branches/llvm/gcc/llvm-convert.cpp
>     apple-local/branches/llvm/gcc/llvm-types.cpp
>
> Modified: apple-local/branches/llvm/gcc/llvm-convert.cpp
> ===================================================================
> --- apple-local/branches/llvm/gcc/llvm-convert.cpp      2007-03-19 19:06:59 UTC (rev 125159)
> +++ apple-local/branches/llvm/gcc/llvm-convert.cpp      2007-03-19 20:55:02 UTC (rev 125160)
> @@ -4660,12 +4660,6 @@
>      assert(DECL_LLVM_SET_P(FieldDecl) && "Struct not laid out for LLVM?");
>      ConstantInt *CI = cast<ConstantInt>(DECL_LLVM(FieldDecl));
>      uint32_t MemberIndex = CI->getZExtValue();
> -    if (MemberIndex == ~0U) {
> -      assert(isStructWithVarSizeArrayAtEnd(StructTy) &&
> -             "Isn't var sized array access!");
> -      CI = ConstantInt::get(Type::Int32Ty, StructTy->getNumContainedTypes()-1);
> -      MemberIndex = CI->getZExtValue();
> -    }
>      assert(MemberIndex < StructTy->getNumContainedTypes() &&
>             "Field Idx out of range!");
>      FieldPtr = new GetElementPtrInst(StructAddrLV.Ptr,
> @@ -5476,35 +5470,32 @@
>        // If not, things are much simpler.
>        assert(DECL_LLVM_SET_P(Field) && "Struct not laid out for LLVM?");
>        unsigned FieldNo = cast<ConstantInt>(DECL_LLVM(Field))->getZExtValue();
> -
> +      assert(FieldNo < ResultElts.size() && "Invalid struct field number!");
> +
> +      // Example: struct X { int A; char C[]; } x = { 4, "foo" };
> +      assert(TYPE_SIZE(TREE_TYPE(Field)) ||
> +             (FieldNo == ResultElts.size()-1 &&
> +              isStructWithVarSizeArrayAtEnd(STy))
> +             && "field with no size is not array at end of struct!");
> +
>        // If this is an initialization of a global that ends with a variable
>        // sized array at its end, and the initializer has a non-zero number of
> -      // elements, we must handle this case now.  In this case, FieldNo is ~0U
> -      // and Val contains the actual type for the array.
> -      if (FieldNo == ~0U) {
> -        // Handle: struct X { int A; char C[]; } x = { 4, "foo" };
> -        assert(isStructWithVarSizeArrayAtEnd(STy) &&
> -               "Struct doesn't end with variable sized array!");
> -        FieldNo = STy->getNumElements()-1;
> -        ResultElts[FieldNo] = Val;
> -      } else {
> -        assert(FieldNo < ResultElts.size() && "Invalid struct field number!");
> -
> -        // Otherwise, we know that the initializer has to match the element type
> -        // of the LLVM structure field.  If not, then there is something that is
> -        // not straight-forward going on.  For example, we could be initializing
> -        // an unaligned integer field (e.g. due to attribute packed) with an
> -        // integer.  The struct field will have type [4 x ubyte] instead of
> -        // "int" for example.  If we ignored this, we would lay out the
> -        // initializer wrong.
> -        if (Val->getType() != STy->getElementType(FieldNo))
> -          Val = ConvertStructFieldInitializerToType(Val,
> +      // elements, then Val contains the actual type for the array.  Otherwise,
> +      // we know that the initializer has to match the element type of the LLVM
> +      // structure field.  If not, then there is something that is not
> +      // straight-forward going on.  For example, we could be initializing an
> +      // unaligned integer field (e.g. due to attribute packed) with an
> +      // integer.  The struct field will have type [4 x ubyte] instead of
> +      // "int" for example.  If we ignored this, we would lay out the
> +      // initializer wrong.
> +      if (TYPE_SIZE(TREE_TYPE(Field)) &&
> +          Val->getType() != STy->getElementType(FieldNo))
> +        Val = ConvertStructFieldInitializerToType(Val,
>                                                    STy->getElementType(FieldNo));
>
> -        ResultElts[FieldNo] = Val;
> -      }
> +      ResultElts[FieldNo] = Val;
>      }
> -
> +
>      NextField = TREE_CHAIN(Field);
>    }
>
> @@ -5716,31 +5707,18 @@
>      ConstantInt *CI = cast<ConstantInt>(DECL_LLVM(FieldDecl));
>      uint64_t MemberIndex = CI->getZExtValue();
>
> -    if (MemberIndex  != ~0U) {
> -      std::vector<Value*> Idxs;
> -      Idxs.push_back(Constant::getNullValue(Type::Int32Ty));
> -      Idxs.push_back(CI);
> -      FieldPtr = ConstantExpr::getGetElementPtr(StructAddrLV, &Idxs[0],
> -                                                Idxs.size());
> -
> -      // Now that we did an offset from the start of the struct, subtract off
> -      // the offset from BitStart.
> -      if (MemberIndex) {
> -        const StructLayout *SL = TD.getStructLayout(cast<StructType>(StructTy));
> -        BitStart -= SL->getElementOffset(MemberIndex) * 8;
> -      }
> -    } else {
> -      // We were unable to make a nice offset, emit an ugly one.
> -      Constant *Offset = Convert(field_offset);
> -      FieldPtr = ConstantExpr::getPtrToInt(StructAddrLV, Offset->getType());
> -      FieldPtr = ConstantExpr::getAdd(FieldPtr, Offset);
> -      FieldPtr = ConstantExpr::getIntToPtr(FieldPtr, PointerType::get(FieldTy));
> -
> -      // Do horrible pointer arithmetic to get the address of the field.
> -      unsigned ByteOffset = TREE_INT_CST_LOW(field_offset);
> -      BitStart -= ByteOffset * 8;
> -    }
> +    std::vector<Value*> Idxs;
> +    Idxs.push_back(Constant::getNullValue(Type::Int32Ty));
> +    Idxs.push_back(CI);
> +    FieldPtr = ConstantExpr::getGetElementPtr(StructAddrLV, &Idxs[0],
> +                                              Idxs.size());
>
> +    // Now that we did an offset from the start of the struct, subtract off
> +    // the offset from BitStart.
> +    if (MemberIndex) {
> +      const StructLayout *SL = TD.getStructLayout(cast<StructType>(StructTy));
> +      BitStart -= SL->getElementOffset(MemberIndex) * 8;
> +    }
>    } else {
>      Constant *Offset = Convert(field_offset);
>      Constant *Ptr = ConstantExpr::getPtrToInt(StructAddrLV, Offset->getType());
>
> Modified: apple-local/branches/llvm/gcc/llvm-types.cpp
> ===================================================================
> --- apple-local/branches/llvm/gcc/llvm-types.cpp        2007-03-19 19:06:59 UTC (rev 125159)
> +++ apple-local/branches/llvm/gcc/llvm-types.cpp        2007-03-19 20:55:02 UTC (rev 125160)
> @@ -962,8 +962,11 @@
>        while (CurFieldNo < ElementOffsetInBytes.size() &&
>               getFieldEndOffsetInBytes(CurFieldNo)*8 <= FieldOffsetInBits)
>          ++CurFieldNo;
> -      if (CurFieldNo >= ElementOffsetInBytes.size()) return ~0U;
> -      return CurFieldNo;
> +      if (CurFieldNo < ElementOffsetInBytes.size())
> +        return CurFieldNo;
> +      // Otherwise, we couldn't find the field!
> +      assert(0 && "Could not find field!");
> +      return ~0U;
>      }
>
>      // Handle zero sized fields now.  If the next field is zero sized, return
> @@ -1009,28 +1012,15 @@
>    return Result;
>  }
>
> -/// isNotLastField - Return true if this is not the last field in its record.
> -///
> -static bool isNotLastField(tree Field) {
> -  for (Field = TREE_CHAIN(Field); Field; Field = TREE_CHAIN(Field))
> -    if (TREE_CODE(Field) == FIELD_DECL)
> -      return true;
> -  return false;
> -}
> -
> -
>  /// DecodeStructFields - This method decodes the specified field, if it is a
>  /// FIELD_DECL, adding or updating the specified StructTypeConversionInfo to
>  /// reflect it.
>  void TypeConverter::DecodeStructFields(tree Field,
>                                         StructTypeConversionInfo &Info) {
>    if (TREE_CODE(Field) != FIELD_DECL ||
> -      // Don't include variable sized fields, doing so would break anything
> -      // after them... unless this is the last field.
> -      ((TYPE_SIZE(TREE_TYPE(Field)) == 0 ||
> -        TREE_CODE(TYPE_SIZE(TREE_TYPE(Field))) != INTEGER_CST) &&
> -       isNotLastField(Field))) return;
> -
> +      TREE_CODE(DECL_FIELD_OFFSET(Field)) != INTEGER_CST)
> +    return;
> +
>    // Handle bit-fields specially.
>    if (DECL_BIT_FIELD_TYPE(Field)) {
>      DecodeStructBitField(Field, Info);
> @@ -1218,12 +1208,8 @@
>    // variable offset.
>    unsigned CurFieldNo = 0;
>    for (tree Field = TYPE_FIELDS(type); Field; Field = TREE_CHAIN(Field))
> -    if (TREE_CODE(Field) == FIELD_DECL) {
> -      // If this field comes after a variable sized element, stop trying to
> -      // assign DECL_LLVM's.
> -      if (TREE_CODE(DECL_FIELD_OFFSET(Field)) != INTEGER_CST)
> -        break;
> -
> +    if (TREE_CODE(Field) == FIELD_DECL &&
> +        TREE_CODE(DECL_FIELD_OFFSET(Field)) == INTEGER_CST) {
>        unsigned FieldOffsetInBits = getFieldOffsetInBits(Field);
>        tree FieldType = TREE_TYPE(Field);
>
> @@ -1241,10 +1227,9 @@
>
>        // Figure out if this field is zero bits wide, e.g. {} or [0 x int].  Do
>        // not include variable sized fields here.
> -      bool isZeroSizeField =
> -        TYPE_SIZE(FieldType) && TREE_CODE(TYPE_SIZE(FieldType)) == INTEGER_CST&&
> -        TREE_INT_CST_LOW(TYPE_SIZE(FieldType)) == 0;
> -
> +      bool isZeroSizeField = !TYPE_SIZE(FieldType) ||
> +        integer_zerop(TYPE_SIZE(FieldType));
> +
>        unsigned FieldNo =
>          Info.getLLVMFieldFor(FieldOffsetInBits, CurFieldNo, isZeroSizeField);
>        SET_DECL_LLVM(Field, ConstantInt::get(Type::Int32Ty, FieldNo));
>
>
> _______________________________________________
> 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: unwind-arm.tar.bz2
Type: application/x-bzip2
Size: 8023 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070321/1319a4ff/attachment.bz2 

From dalej at apple.com  Wed Mar 21 16:16:56 2007
From: dalej at apple.com (Dale Johannesen)
Date: Wed, 21 Mar 2007 16:16:56 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/README.txt
Message-ID: <200703212116.l2LLGusp005780@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

README.txt updated: 1.158 -> 1.159
---
Log message:

add generation of unnecessary push/pop around calls


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

 README.txt |   42 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 42 insertions(+)


Index: llvm/lib/Target/X86/README.txt
diff -u llvm/lib/Target/X86/README.txt:1.158 llvm/lib/Target/X86/README.txt:1.159
--- llvm/lib/Target/X86/README.txt:1.158	Wed Mar 14 16:03:53 2007
+++ llvm/lib/Target/X86/README.txt	Wed Mar 21 16:16:39 2007
@@ -989,3 +989,45 @@
         ret
 
 //===---------------------------------------------------------------------===//
+
+We use push/pop of stack space around calls in situations where we don't have to.
+Call to f below produces:
+        subl $16, %esp      <<<<<
+        movl %eax, (%esp)
+        call L_f$stub
+        addl $16, %esp     <<<<<
+The stack push/pop can be moved into the prolog/epilog.  It does this because it's
+building the frame pointer, but this should not be sufficient, only the use of alloca
+should cause it to do this.
+(There are other issues shown by this code, but this is one.)
+
+typedef struct _range_t {
+    float fbias;
+    float fscale;
+    int ibias;
+    int iscale;
+    int ishift;
+    unsigned char lut[];
+} range_t;
+
+struct _decode_t {
+    int type:4;
+    int unit:4;
+    int alpha:8;
+    int N:8;
+    int bpc:8;
+    int bpp:16;
+    int skip:8;
+    int swap:8;
+    const range_t*const*range;
+};
+
+typedef struct _decode_t decode_t;
+
+extern int f(const decode_t* decode);
+
+int decode_byte (const decode_t* decode) {
+  if (decode->swap != 0)
+    return f(decode);
+  return 0;
+}





From llvm at cs.uiuc.edu  Wed Mar 21 16:35:51 2007
From: llvm at cs.uiuc.edu (LLVM)
Date: Wed, 21 Mar 2007 16:35:51 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/MSIL/
Message-ID: <200703212135.l2LLZpp1006080@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/MSIL:

---
Log message:

Directory /var/cvs/llvm/llvm/lib/Target/MSIL added to the repository


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

 0 files changed





From asl at math.spbu.ru  Wed Mar 21 16:38:48 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 21 Mar 2007 16:38:48 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/MSIL/MSILWriter.cpp
	MSILWriter.h Makefile
Message-ID: <200703212138.l2LLclGa006160@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/MSIL:

MSILWriter.cpp added (r1.1)
MSILWriter.h added (r1.1)
Makefile added (r1.1)
---
Log message:

Let the new backend begin!


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

 MSILWriter.cpp | 1350 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 MSILWriter.h   |  230 +++++++++
 Makefile       |   14 
 3 files changed, 1594 insertions(+)


Index: llvm/lib/Target/MSIL/MSILWriter.cpp
diff -c /dev/null llvm/lib/Target/MSIL/MSILWriter.cpp:1.1
*** /dev/null	Wed Mar 21 16:38:36 2007
--- llvm/lib/Target/MSIL/MSILWriter.cpp	Wed Mar 21 16:38:25 2007
***************
*** 0 ****
--- 1,1350 ----
+ //===-- MSILWriter.cpp - Library for converting LLVM code to MSIL ---------===//
+ //
+ //		       The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Roman Samoilov and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ //
+ //===----------------------------------------------------------------------===//
+ //
+ // This library converts LLVM code to MSIL code.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "MSILWriter.h"
+ #include "llvm/CallingConv.h"
+ #include "llvm/DerivedTypes.h"
+ #include "llvm/Intrinsics.h"
+ #include "llvm/IntrinsicInst.h"
+ #include "llvm/TypeSymbolTable.h"
+ #include "llvm/Analysis/ConstantsScanner.h"
+ #include "llvm/Support/CallSite.h"
+ #include "llvm/Support/InstVisitor.h"
+ #include "llvm/Transforms/Scalar.h"
+ #include "llvm/ADT/StringExtras.h"
+ 
+ namespace {
+   // TargetMachine for the MSIL 
+   struct VISIBILITY_HIDDEN MSILTarget : public TargetMachine {
+     const TargetData DataLayout;       // Calculates type size & alignment
+ 
+     MSILTarget(const Module &M, const std::string &FS)
+       : DataLayout(&M) {}
+ 
+     virtual bool WantsWholeFile() const { return true; }
+     virtual bool addPassesToEmitWholeFile(PassManager &PM, std::ostream &Out,
+                                          CodeGenFileType FileType, bool Fast);
+ 
+     // This class always works, but shouldn't be the default in most cases.
+     static unsigned getModuleMatchQuality(const Module &M) { return 1; }
+ 
+     virtual const TargetData *getTargetData() const { return &DataLayout; }
+   };
+ }
+ 
+ 
+ RegisterTarget<MSILTarget> X("msil", "  MSIL backend");
+ 
+ bool MSILModule::runOnModule(Module &M) {
+   ModulePtr = &M;
+   TD = &getAnalysis<TargetData>();
+   bool Changed = false;
+   // Find named types.  
+   TypeSymbolTable& Table = M.getTypeSymbolTable();
+   std::set<const Type *> Types = getAnalysis<FindUsedTypes>().getTypes();
+   for (TypeSymbolTable::iterator I = Table.begin(), E = Table.end(); I!=E; ) {
+     if (!isa<StructType>(I->second) && !isa<OpaqueType>(I->second))
+       Table.remove(I++);
+     else {
+       std::set<const Type *>::iterator T = Types.find(I->second);
+       if (T==Types.end())
+         Table.remove(I++);
+       else {
+         Types.erase(T);
+         ++I;
+       }
+     }
+   }
+   // Find unnamed types.
+   unsigned RenameCounter = 0;
+   for (std::set<const Type *>::const_iterator I = Types.begin(),
+        E = Types.end(); I!=E; ++I)
+     if (const StructType *STy = dyn_cast<StructType>(*I)) {
+       while (ModulePtr->addTypeName("unnamed$"+utostr(RenameCounter), STy))
+         ++RenameCounter;
+       Changed = true;
+     }
+   // Pointer for FunctionPass.
+   UsedTypes = &getAnalysis<FindUsedTypes>().getTypes();
+   return Changed;
+ }
+ 
+ 
+ bool MSILWriter::runOnFunction(Function &F) {
+   if (F.isDeclaration()) return false;
+   LInfo = &getAnalysis<LoopInfo>();
+   printFunction(F);
+   return false;
+ }
+ 
+ 
+ bool MSILWriter::doInitialization(Module &M) {
+   ModulePtr = &M;
+   Mang = new Mangler(M); 
+   Out << ".assembly extern mscorlib {}\n";
+   Out << ".assembly MSIL {}\n\n";
+   Out << "// External\n";
+   printExternals();
+   Out << "// Declarations\n";
+   printDeclarations(M.getTypeSymbolTable());
+   Out << "// Definitions\n";
+   printGlobalVariables();
+   return false;
+ }
+ 
+ 
+ bool MSILWriter::doFinalization(Module &M) {
+   delete Mang;
+   return false;
+ }
+ 
+ 
+ bool MSILWriter::isZeroValue(const Value* V) {
+   if (const Constant *C = dyn_cast<Constant>(V))
+     return C->isNullValue();
+   return false;
+ }
+ 
+ 
+ std::string MSILWriter::getValueName(const Value* V) {
+   // Name into the quotes allow control and space characters.
+   return "'"+Mang->getValueName(V)+"'";
+ }
+ 
+ 
+ std::string MSILWriter::getLabelName(const std::string& Name) {
+   if (Name.find('.')!=std::string::npos) {
+     std::string Tmp(Name);
+     // Replace unaccepable characters in the label name.
+     for (std::string::iterator I = Tmp.begin(), E = Tmp.end(); I!=E; ++I)
+       if (*I=='.') *I = '@';
+     return Tmp;
+   }
+   return Name;
+ }
+ 
+ 
+ std::string MSILWriter::getLabelName(const Value* V) {
+   return getLabelName(Mang->getValueName(V));
+ }
+ 
+ 
+ std::string MSILWriter::getConvModopt(unsigned CallingConvID) {
+   switch (CallingConvID) {
+   case CallingConv::C:
+   case CallingConv::Cold:
+   case CallingConv::Fast:
+     return "modopt([mscorlib]System.Runtime.CompilerServices.CallConvCdecl) ";
+   case CallingConv::X86_FastCall:
+     return "modopt([mscorlib]System.Runtime.CompilerServices.CallConvFastcall) ";
+   case CallingConv::X86_StdCall:
+     return "modopt([mscorlib]System.Runtime.CompilerServices.CallConvStdcall) ";
+   default:
+     cerr << "CallingConvID = " << CallingConvID << '\n';
+     assert(0 && "Unsupported calling convention");
+   }
+ }
+ 
+ 
+ std::string MSILWriter::getArrayTypeName(Type::TypeID TyID, const Type* Ty) {
+   std::string Tmp = "";
+   const Type* ElemTy = Ty;
+   assert(Ty->getTypeID()==TyID && "Invalid type passed");
+   // Walk trought array element types.
+   for (;;) {
+     // Multidimensional array.
+     if (ElemTy->getTypeID()==TyID) {
+       if (const ArrayType* ATy = dyn_cast<ArrayType>(ElemTy))
+         Tmp += utostr(ATy->getNumElements());
+       else if (const VectorType* VTy = dyn_cast<VectorType>(ElemTy))
+         Tmp += utostr(VTy->getNumElements());
+       ElemTy = cast<SequentialType>(ElemTy)->getElementType();
+     }
+     // Base element type found.
+     if (ElemTy->getTypeID()!=TyID) break;
+     Tmp += ",";
+   }
+   return getTypeName(ElemTy)+"["+Tmp+"]";
+ }
+ 
+ 
+ std::string MSILWriter::getPrimitiveTypeName(const Type* Ty, bool isSigned) {
+   unsigned NumBits = 0;
+   switch (Ty->getTypeID()) {
+   case Type::VoidTyID:
+     return "void ";
+   case Type::IntegerTyID:
+     NumBits = getBitWidth(Ty);
+     if(NumBits==1)
+       return "bool ";
+     if (!isSigned)
+       return "unsigned int"+utostr(NumBits)+" ";
+     return "int"+utostr(NumBits)+" ";
+   case Type::FloatTyID:
+     return "float32 ";
+   case Type::DoubleTyID:
+     return "float64 "; 
+   default:
+     cerr << "Type = " << *Ty << '\n';
+     assert(0 && "Invalid primitive type");
+   }
+ }
+ 
+ 
+ std::string MSILWriter::getTypeName(const Type* Ty, bool isSigned) {
+   if (Ty->isPrimitiveType() || Ty->isInteger())
+     return getPrimitiveTypeName(Ty,isSigned);
+   // FIXME: "OpaqueType" support
+   switch (Ty->getTypeID()) {
+   case Type::PointerTyID:
+     return "void* ";
+   case Type::StructTyID:
+     return "valuetype '"+ModulePtr->getTypeName(Ty)+"' ";
+   case Type::ArrayTyID:
+     return "valuetype '"+getArrayTypeName(Ty->getTypeID(),Ty)+"' ";
+   case Type::VectorTyID:
+     return "valuetype '"+getArrayTypeName(Ty->getTypeID(),Ty)+"' ";
+   default:
+     cerr << "Type = " << *Ty << '\n';
+     assert(0 && "Invalid type in getTypeName()");
+   }
+ }
+ 
+ 
+ MSILWriter::ValueType MSILWriter::getValueLocation(const Value* V) {
+   // Function argument
+   if (isa<Argument>(V))
+     return ArgumentVT;
+   // Function
+   else if (const Function* F = dyn_cast<Function>(V))
+     return F->hasInternalLinkage() ? InternalVT : GlobalVT;
+   // Variable
+   else if (const GlobalVariable* G = dyn_cast<GlobalVariable>(V))
+     return G->hasInternalLinkage() ? InternalVT : GlobalVT;
+   // Constant
+   else if (isa<Constant>(V))
+     return isa<ConstantExpr>(V) ? ConstExprVT : ConstVT;
+   // Local variable
+   return LocalVT;
+ }
+ 
+ 
+ std::string MSILWriter::getTypePostfix(const Type* Ty, bool Expand,
+                                        bool isSigned) {
+   unsigned NumBits = 0;
+   switch (Ty->getTypeID()) {
+   // Integer constant, expanding for stack operations.
+   case Type::IntegerTyID:
+     NumBits = getBitWidth(Ty);
+     // Expand integer value to "int32" or "int64".
+     if (Expand) return (NumBits<=32 ? "i4" : "i8");
+     if (NumBits==1) return "i1";
+     return (isSigned ? "i" : "u")+utostr(NumBits/8);
+   // Float constant.
+   case Type::FloatTyID:
+     return "r4";
+   case Type::DoubleTyID:
+     return "r8";
+   case Type::PointerTyID:
+     return "i"+utostr(TD->getTypeSize(Ty));
+   default:
+     cerr << "TypeID = " << Ty->getTypeID() << '\n';
+     assert(0 && "Invalid type in TypeToPostfix()");
+   }
+ }
+ 
+ 
+ void MSILWriter::printPtrLoad(uint64_t N) {
+   switch (ModulePtr->getPointerSize()) {
+   case Module::Pointer32:
+     printSimpleInstruction("ldc.i4",utostr(N).c_str());
+     // FIXME: Need overflow test?
+     assert(N<0xFFFFFFFF && "32-bit pointer overflowed");
+     break;
+   case Module::Pointer64:
+     printSimpleInstruction("ldc.i8",utostr(N).c_str());
+     break;
+   default:
+     assert(0 && "Module use not supporting pointer size");
+   }
+ }
+ 
+ 
+ void MSILWriter::printConstLoad(const Constant* C) {
+   if (const ConstantInt* CInt = dyn_cast<ConstantInt>(C)) {
+     // Integer constant
+     Out << "\tldc." << getTypePostfix(C->getType(),true) << '\t';
+     if (CInt->isMinValue(true))
+       Out << CInt->getSExtValue();
+     else
+       Out << CInt->getZExtValue();
+   } else if (const ConstantFP* CFp = dyn_cast<ConstantFP>(C)) {
+     // Float constant
+     Out << "\tldc." << getTypePostfix(C->getType(),true) << '\t' <<
+       CFp->getValue();
+   } else {
+     cerr << "Constant = " << *C << '\n';
+     assert(0 && "Invalid constant value");
+   }
+   Out << '\n';
+ }
+ 
+ 
+ void MSILWriter::printValueLoad(const Value* V) {
+   switch (getValueLocation(V)) {
+   // Global variable or function address.
+   case GlobalVT:
+   case InternalVT:
+     if (const Function* F = dyn_cast<Function>(V)) {
+       std::string Name = getConvModopt(F->getCallingConv())+getValueName(F);
+       printSimpleInstruction("ldftn",
+         getCallSignature(F->getFunctionType(),NULL,Name).c_str());
+     } else {
+       const Type* ElemTy = cast<PointerType>(V->getType())->getElementType();
+       std::string Tmp = getTypeName(ElemTy)+getValueName(V);
+       printSimpleInstruction("ldsflda",Tmp.c_str());
+     }
+     break;
+   // Function argument.
+   case ArgumentVT:
+     printSimpleInstruction("ldarg",getValueName(V).c_str());
+     break;
+   // Local function variable.
+   case LocalVT:
+     printSimpleInstruction("ldloc",getValueName(V).c_str());
+     break;
+   // Constant value.
+   case ConstVT:
+     if (isa<ConstantPointerNull>(V))
+       printPtrLoad(0);
+     else
+       printConstLoad(cast<Constant>(V));
+     break;
+   // Constant expression.
+   case ConstExprVT:
+     printConstantExpr(cast<ConstantExpr>(V));
+     break;
+   default:
+     cerr << "Value = " << *V << '\n';
+     assert(0 && "Invalid value location");
+   }
+ }
+ 
+ 
+ void MSILWriter::printValueSave(const Value* V) {
+   switch (getValueLocation(V)) {
+   case ArgumentVT:
+     printSimpleInstruction("starg",getValueName(V).c_str());
+     break;
+   case LocalVT:
+     printSimpleInstruction("stloc",getValueName(V).c_str());
+     break;
+   default:
+     cerr << "Value  = " << *V << '\n';
+     assert(0 && "Invalid value location");
+   }
+ }
+ 
+ 
+ void MSILWriter::printBinaryInstruction(const char* Name, const Value* Left,
+                                         const Value* Right) {
+   printValueLoad(Left);
+   printValueLoad(Right);
+   Out << '\t' << Name << '\n';
+ }
+ 
+ 
+ void MSILWriter::printSimpleInstruction(const char* Inst, const char* Operand) {
+   if(Operand) 
+     Out << '\t' << Inst << '\t' << Operand << '\n';
+   else
+     Out << '\t' << Inst << '\n';
+ }
+ 
+ 
+ void MSILWriter::printPHICopy(const BasicBlock* Src, const BasicBlock* Dst) {
+   for (BasicBlock::const_iterator I = Dst->begin(), E = Dst->end();
+        isa<PHINode>(I); ++I) {
+     const PHINode* Phi = cast<PHINode>(I);
+     const Value* Val = Phi->getIncomingValueForBlock(Src);
+     if (isa<UndefValue>(Val)) continue;
+     printValueLoad(Val);
+     printValueSave(Phi);
+   }
+ }
+ 
+ 
+ void MSILWriter::printBranchToBlock(const BasicBlock* CurrBB,
+                                     const BasicBlock* TrueBB,
+                                     const BasicBlock* FalseBB) {
+   if (TrueBB==FalseBB) {
+     // "TrueBB" and "FalseBB" destination equals
+     printPHICopy(CurrBB,TrueBB);
+     printSimpleInstruction("pop");
+     printSimpleInstruction("br",getLabelName(TrueBB).c_str());
+   } else if (FalseBB==NULL) {
+     // If "FalseBB" not used the jump have condition
+     printPHICopy(CurrBB,TrueBB);
+     printSimpleInstruction("brtrue",getLabelName(TrueBB).c_str());
+   } else if (TrueBB==NULL) {
+     // If "TrueBB" not used the jump is unconditional
+     printPHICopy(CurrBB,FalseBB);
+     printSimpleInstruction("br",getLabelName(FalseBB).c_str());
+   } else {
+     // Copy PHI instructions for each block
+     std::string TmpLabel;
+     // Print PHI instructions for "TrueBB"
+     if (isa<PHINode>(TrueBB->begin())) {
+       TmpLabel = getLabelName(TrueBB)+"$phi_"+utostr(getUniqID());
+       printSimpleInstruction("brtrue",TmpLabel.c_str());
+     } else {
+       printSimpleInstruction("brtrue",getLabelName(TrueBB).c_str());
+     }
+     // Print PHI instructions for "FalseBB"
+     if (isa<PHINode>(FalseBB->begin())) {
+       printPHICopy(CurrBB,FalseBB);
+       printSimpleInstruction("br",getLabelName(FalseBB).c_str());
+     } else {
+       printSimpleInstruction("br",getLabelName(FalseBB).c_str());
+     }
+     if (isa<PHINode>(TrueBB->begin())) {
+       // Handle "TrueBB" PHI Copy
+       Out << TmpLabel << ":\n";
+       printPHICopy(CurrBB,TrueBB);
+       printSimpleInstruction("br",getLabelName(TrueBB).c_str());
+     }
+   }
+ }
+ 
+ 
+ void MSILWriter::printBranchInstruction(const BranchInst* Inst) {
+   if (Inst->isUnconditional()) {
+     printBranchToBlock(Inst->getParent(),NULL,Inst->getSuccessor(0));
+   } else {
+     printValueLoad(Inst->getCondition());
+     printBranchToBlock(Inst->getParent(),Inst->getSuccessor(0),
+                        Inst->getSuccessor(1));
+   }
+ }
+ 
+ 
+ void MSILWriter::printSelectInstruction(const Value* Cond, const Value* VTrue,
+                                         const Value* VFalse) {
+   std::string TmpLabel = std::string("select$true_")+utostr(getUniqID());
+   printValueLoad(VTrue);
+   printValueLoad(Cond);
+   printSimpleInstruction("brtrue",TmpLabel.c_str());
+   printSimpleInstruction("pop");
+   printValueLoad(VFalse);
+   Out << TmpLabel << ":\n";
+ }
+ 
+ 
+ void MSILWriter::printIndirectLoad(const Value* V) {
+   printValueLoad(V);
+   std::string Tmp = "ldind."+getTypePostfix(V->getType(),false);
+   printSimpleInstruction(Tmp.c_str());
+ }
+ 
+ 
+ void MSILWriter::printStoreInstruction(const Instruction* Inst) {
+   const Value* Val = Inst->getOperand(0);
+   const Value* Ptr = Inst->getOperand(1);
+   // Load destination address.
+   printValueLoad(Ptr);
+   // Load value.
+   printValueLoad(Val);
+   // Instruction need signed postfix for any type.
+   std::string postfix = getTypePostfix(Val->getType(),false);
+   if (*postfix.begin()=='u') *postfix.begin() = 'i';
+   postfix = "stind."+postfix;
+   printSimpleInstruction(postfix.c_str());
+ }
+ 
+ 
+ void MSILWriter::printCastInstruction(unsigned int Op, const Value* V,
+                                       const Type* Ty) {
+   std::string Tmp("");
+   printValueLoad(V);
+   switch (Op) {
+   // Signed
+   case Instruction::SExt:
+   case Instruction::SIToFP:
+   case Instruction::FPToSI:
+     Tmp = "conv."+getTypePostfix(Ty,false,true);
+     printSimpleInstruction(Tmp.c_str());
+     break;
+   // Unsigned
+   case Instruction::FPTrunc:
+   case Instruction::FPExt:
+   case Instruction::UIToFP:
+   case Instruction::Trunc:
+   case Instruction::ZExt:
+   case Instruction::FPToUI:
+   case Instruction::PtrToInt:
+   case Instruction::IntToPtr:
+     Tmp = "conv."+getTypePostfix(Ty,false);
+     printSimpleInstruction(Tmp.c_str());
+     break;
+   // Do nothing
+   case Instruction::BitCast:
+     // FIXME: meaning that ld*/st* instruction do not change data format.
+     break;
+   default:
+     cerr << "Opcode = " << Op << '\n';
+     assert(0 && "Invalid conversion instruction");
+   }
+ }
+ 
+ 
+ void MSILWriter::printGepInstruction(const Value* V, gep_type_iterator I,
+                                      gep_type_iterator E) {
+   // Load address
+   printValueLoad(V);
+   // Calculate element offset.
+   unsigned TySize;
+   for (++I; I!=E; ++I){
+     const Type* Ty = I.getIndexedType();
+     const Value* Idx = I.getOperand();
+     // Get size of type.
+     switch (Ty->getTypeID()) {
+     case Type::IntegerTyID:
+     case Type::FloatTyID:
+     case Type::DoubleTyID:
+     case Type::PointerTyID:
+       TySize = TD->getTypeSize(Ty);
+       break;
+     case Type::StructTyID:
+       TySize = 0;
+       break;
+     case Type::ArrayTyID:
+       TySize = TD->getTypeSize(cast<ArrayType>(Ty)->getElementType());
+       break;
+     case Type::VectorTyID:
+       TySize = TD->getTypeSize(cast<VectorType>(Ty)->getElementType());
+       break;
+     default:
+       cerr << "Type = " << *Ty << '\n';
+       assert(0 && "Invalid index type in printGepInstruction()");
+     }
+     // Calculate offset to structure field.
+     if (const StructType* STy = dyn_cast<StructType>(Ty)) {
+       TySize = 0;
+       uint64_t FieldIdx = cast<ConstantInt>(Idx)->getZExtValue();
+       // Offset is the summ of all previous structure fields.
+       for (uint64_t F = 0; F<FieldIdx; ++F)
+         TySize += TD->getTypeSize(STy->getContainedType(unsigned(F)));
+       // Add field offset to stack top.
+       printPtrLoad(TySize);
+       printSimpleInstruction("add");
+       continue;
+     }
+     // Add offset of current element to stack top.
+     if (!isZeroValue(Idx)) {
+       uint64_t TySize = TD->getTypeSize(I.getIndexedType());
+       // Constant optimization
+       if (const ConstantInt* CInt = dyn_cast<ConstantInt>(Idx)) {
+         printPtrLoad(CInt->getZExtValue()*TySize);
+       } else {
+         printPtrLoad(TySize);
+         printValueLoad(Idx);
+         printSimpleInstruction("mul");
+       }
+       printSimpleInstruction("add");
+     }
+   }
+ }
+ 
+ 
+ std::string MSILWriter::getCallSignature(const FunctionType* Ty,
+                                          const Instruction* Inst,
+                                          std::string Name) {
+   std::string Tmp = "";
+   if (Ty->isVarArg()) Tmp += "vararg ";
+   // Name and return type.
+   Tmp += getTypeName(Ty->getReturnType())+Name+"(";
+   // Function argument type list.
+   unsigned NumParams = Ty->getNumParams();
+   for (unsigned I = 0; I!=NumParams; ++I) {
+     if (I!=0) Tmp += ",";
+     Tmp += getTypeName(Ty->getParamType(I));
+   }
+   // CLR needs to know the exact amount of parameters received by vararg
+   // function, because caller cleans the stack.
+   if (Ty->isVarArg() && Inst) {
+     // Origin to function arguments in "CallInst" or "InvokeInst"
+     unsigned Org = isa<InvokeInst>(Inst) ? 3 : 1;
+     // Print variable argument types.
+     unsigned NumOperands = Inst->getNumOperands()-Org;
+     if (NumParams<NumOperands) {
+       if (NumParams!=0) Tmp += ", ";
+       Tmp += "... , ";
+       for (unsigned J = NumParams; J!=NumOperands; ++J) {
+         if (J!=NumParams) Tmp += ", ";
+         Tmp += getTypeName(Inst->getOperand(J+Org)->getType());
+       }
+     }
+   }
+   return Tmp+")";
+ }
+ 
+ 
+ void MSILWriter::printFunctionCall(const Value* FnVal,
+                                    const Instruction* Inst) {
+   // Get function calling convention
+   std::string Name = "";
+   if (const CallInst* Call = dyn_cast<CallInst>(Inst))
+     Name = getConvModopt(Call->getCallingConv());
+   else if (const InvokeInst* Invoke = dyn_cast<InvokeInst>(Inst))
+     Name = getConvModopt(Invoke->getCallingConv());
+   else {
+     cerr << "Instruction = " << Inst->getName() << '\n';
+     assert(0 && "Need \"Invoke\" or \"Call\" instruction only");
+   }
+   
+   if (const Function* F = dyn_cast<Function>(FnVal)) {
+     // Direct call
+     Name += getValueName(F);
+     printSimpleInstruction("call",
+       getCallSignature(F->getFunctionType(),Inst,Name).c_str());
+   } else {
+     // Indirect function call
+     const PointerType* PTy = cast<PointerType>(FnVal->getType());
+     const FunctionType* FTy = cast<FunctionType>(PTy->getElementType());
+     // Load function address
+     printValueLoad(FnVal);
+     printSimpleInstruction("calli",getCallSignature(FTy,Inst,Name).c_str());
+   }
+ }
+ 
+ 
+ void MSILWriter::printCallInstruction(const Instruction* Inst) {
+   // Load arguments to stack
+   for (int I = 1, E = Inst->getNumOperands(); I!=E; ++I)
+     printValueLoad(Inst->getOperand(I));
+   printFunctionCall(Inst->getOperand(0),Inst);
+ }
+ 
+ 
+ void MSILWriter::printICmpInstruction(unsigned Predicate, const Value* Left,
+                                       const Value* Right) {
+   switch (Predicate) {
+   case ICmpInst::ICMP_EQ:
+     printBinaryInstruction("ceq",Left,Right);
+     break;
+   case ICmpInst::ICMP_NE:
+     // Emulate = not (Op1 eq Op2)
+     printBinaryInstruction("ceq",Left,Right);
+     printSimpleInstruction("not");
+     break;
+   case ICmpInst::ICMP_ULE:
+   case ICmpInst::ICMP_SLE:
+     // Emulate = (Op1 eq Op2) or (Op1 lt Op2)
+     printBinaryInstruction("ceq",Left,Right);
+     if (Predicate==ICmpInst::ICMP_ULE)
+       printBinaryInstruction("clt.un",Left,Right);
+     else
+       printBinaryInstruction("clt",Left,Right);
+     printSimpleInstruction("or");
+     break;
+   case ICmpInst::ICMP_UGE:
+   case ICmpInst::ICMP_SGE:
+     // Emulate = (Op1 eq Op2) or (Op1 gt Op2)
+     printBinaryInstruction("ceq",Left,Right);
+     if (Predicate==ICmpInst::ICMP_UGE)
+       printBinaryInstruction("cgt.un",Left,Right);
+     else
+       printBinaryInstruction("cgt",Left,Right);
+     printSimpleInstruction("or");
+     break;
+   case ICmpInst::ICMP_ULT:
+     printBinaryInstruction("clt.un",Left,Right);
+     break;
+   case ICmpInst::ICMP_SLT:
+     printBinaryInstruction("clt",Left,Right);
+     break;
+   case ICmpInst::ICMP_UGT:
+     printBinaryInstruction("cgt.un",Left,Right);
+   case ICmpInst::ICMP_SGT:
+     printBinaryInstruction("cgt",Left,Right);
+     break;
+   default:
+     cerr << "Predicate = " << Predicate << '\n';
+     assert(0 && "Invalid icmp predicate");
+   }
+ }
+ 
+ 
+ void MSILWriter::printFCmpInstruction(unsigned Predicate, const Value* Left,
+                                       const Value* Right) {
+   // FIXME: Correct comparison
+   std::string NanFunc = "bool [mscorlib]System.Double::IsNaN(float64)";
+   switch (Predicate) {
+   case FCmpInst::FCMP_UGT:
+     // X >  Y || llvm_fcmp_uno(X, Y)
+     printBinaryInstruction("cgt",Left,Right);
+     printFCmpInstruction(FCmpInst::FCMP_UNO,Left,Right);
+     printSimpleInstruction("or");
+     break;
+   case FCmpInst::FCMP_OGT:
+     // X >  Y
+     printBinaryInstruction("cgt",Left,Right);
+     break;
+   case FCmpInst::FCMP_UGE:
+     // X >= Y || llvm_fcmp_uno(X, Y)
+     printBinaryInstruction("ceq",Left,Right);
+     printBinaryInstruction("cgt",Left,Right);
+     printSimpleInstruction("or");
+     printFCmpInstruction(FCmpInst::FCMP_UNO,Left,Right);
+     printSimpleInstruction("or");
+     break;
+   case FCmpInst::FCMP_OGE:
+     // X >= Y
+     printBinaryInstruction("ceq",Left,Right);
+     printBinaryInstruction("cgt",Left,Right);
+     printSimpleInstruction("or");
+     break;
+   case FCmpInst::FCMP_ULT:
+     // X <  Y || llvm_fcmp_uno(X, Y)
+     printBinaryInstruction("clt",Left,Right);
+     printFCmpInstruction(FCmpInst::FCMP_UNO,Left,Right);
+     printSimpleInstruction("or");
+     break;
+   case FCmpInst::FCMP_OLT:
+     // X <  Y
+     printBinaryInstruction("clt",Left,Right);
+     break;
+   case FCmpInst::FCMP_ULE:
+     // X <= Y || llvm_fcmp_uno(X, Y)
+     printBinaryInstruction("ceq",Left,Right);
+     printBinaryInstruction("clt",Left,Right);
+     printSimpleInstruction("or");
+     printFCmpInstruction(FCmpInst::FCMP_UNO,Left,Right);
+     printSimpleInstruction("or");
+     break;
+   case FCmpInst::FCMP_OLE:
+     // X <= Y
+     printBinaryInstruction("ceq",Left,Right);
+     printBinaryInstruction("clt",Left,Right);
+     printSimpleInstruction("or");
+     break;
+   case FCmpInst::FCMP_UEQ:
+     // X == Y || llvm_fcmp_uno(X, Y)
+     printBinaryInstruction("ceq",Left,Right);
+     printFCmpInstruction(FCmpInst::FCMP_UNO,Left,Right);
+     printSimpleInstruction("or");
+     break;
+   case FCmpInst::FCMP_OEQ:
+     // X == Y
+     printBinaryInstruction("ceq",Left,Right);
+     break;
+   case FCmpInst::FCMP_UNE:
+     // X != Y
+     printBinaryInstruction("ceq",Left,Right);
+     printSimpleInstruction("not");
+     break;
+   case FCmpInst::FCMP_ONE:
+     // X != Y && llvm_fcmp_ord(X, Y)
+     printBinaryInstruction("ceq",Left,Right);
+     printSimpleInstruction("not");
+     break;
+   case FCmpInst::FCMP_ORD:
+     // return X == X && Y == Y
+     printBinaryInstruction("ceq",Left,Left);
+     printBinaryInstruction("ceq",Right,Right);
+     printSimpleInstruction("or");
+     break;
+   case FCmpInst::FCMP_UNO:
+     // X != X || Y != Y
+     printBinaryInstruction("ceq",Left,Left);
+     printSimpleInstruction("not");
+     printBinaryInstruction("ceq",Right,Right);
+     printSimpleInstruction("not");
+     printSimpleInstruction("or");
+     break;
+   default:
+     assert(0 && "Illegal FCmp predicate");
+   }
+ }
+ 
+ 
+ void MSILWriter::printInvokeInstruction(const InvokeInst* Inst) {
+   std::string Label = "leave$normal_"+utostr(getUniqID());
+   Out << ".try {\n";
+   // Load arguments
+   for (int I = 3, E = Inst->getNumOperands(); I!=E; ++I)
+     printValueLoad(Inst->getOperand(I));
+   // Print call instruction
+   printFunctionCall(Inst->getOperand(0),Inst);
+   // Save function result and leave "try" block
+   printValueSave(Inst);
+   printSimpleInstruction("leave",Label.c_str());
+   Out << "}\n";
+   Out << "catch [mscorlib]System.Exception {\n";
+   // Redirect to unwind block
+   printSimpleInstruction("pop");
+   printBranchToBlock(Inst->getParent(),NULL,Inst->getUnwindDest());
+   Out << "}\n" << Label << ":\n";
+   // Redirect to continue block
+   printBranchToBlock(Inst->getParent(),NULL,Inst->getNormalDest());
+ }
+ 
+ 
+ void MSILWriter::printSwitchInstruction(const SwitchInst* Inst) {
+   // FIXME: Emulate with IL "switch" instruction
+   // Emulate = if () else if () else if () else ...
+   for (unsigned int I = 1, E = Inst->getNumCases(); I!=E; ++I) {
+     printValueLoad(Inst->getCondition());
+     printValueLoad(Inst->getCaseValue(I));
+     printSimpleInstruction("ceq");
+     // Condition jump to successor block
+     printBranchToBlock(Inst->getParent(),Inst->getSuccessor(I),NULL);
+   }
+   // Jump to default block
+   printBranchToBlock(Inst->getParent(),NULL,Inst->getDefaultDest());
+ }
+ 
+ 
+ void MSILWriter::printInstruction(const Instruction* Inst) {
+   const Value *Left = 0, *Right = 0;
+   if (Inst->getNumOperands()>=1) Left = Inst->getOperand(0);
+   if (Inst->getNumOperands()>=2) Right = Inst->getOperand(1);
+   // Print instruction
+   // FIXME: "ShuffleVector","ExtractElement","InsertElement","VAArg" support.
+   switch (Inst->getOpcode()) {
+   // Terminator
+   case Instruction::Ret:
+     if (Inst->getNumOperands()) {
+       printValueLoad(Left);
+       printSimpleInstruction("ret");
+     } else
+       printSimpleInstruction("ret");
+     break;
+   case Instruction::Br:
+     printBranchInstruction(cast<BranchInst>(Inst));
+     break;
+   // Binary
+   case Instruction::Add:
+     printBinaryInstruction("add",Left,Right);
+     break;
+   case Instruction::Sub:
+     printBinaryInstruction("sub",Left,Right);
+     break;
+   case Instruction::Mul:  
+     printBinaryInstruction("mul",Left,Right);
+     break;
+   case Instruction::UDiv:
+     printBinaryInstruction("div.un",Left,Right);
+     break;
+   case Instruction::SDiv:
+   case Instruction::FDiv:
+     printBinaryInstruction("div",Left,Right);
+     break;
+   case Instruction::URem:
+     printBinaryInstruction("rem.un",Left,Right);
+     break;
+   case Instruction::SRem:
+   case Instruction::FRem:
+     printBinaryInstruction("rem",Left,Right);
+     break;
+   // Binary Condition
+   case Instruction::ICmp:
+     printICmpInstruction(cast<ICmpInst>(Inst)->getPredicate(),Left,Right);
+     break;
+   case Instruction::FCmp:
+     printFCmpInstruction(cast<FCmpInst>(Inst)->getPredicate(),Left,Right);
+     break;
+   // Bitwise Binary
+   case Instruction::And:
+     printBinaryInstruction("and",Left,Right);
+     break;
+   case Instruction::Or:
+     printBinaryInstruction("or",Left,Right);
+     break;
+   case Instruction::Xor:
+     printBinaryInstruction("xor",Left,Right);
+     break;
+   case Instruction::Shl:
+     printBinaryInstruction("shl",Left,Right);
+     break;
+   case Instruction::LShr:
+     printBinaryInstruction("shr.un",Left,Right);
+     break;
+   case Instruction::AShr:
+     printBinaryInstruction("shr",Left,Right);
+     break;
+   case Instruction::Select:
+     printSelectInstruction(Inst->getOperand(0),Inst->getOperand(1),Inst->getOperand(2));
+     break;
+   case Instruction::Load:
+     printIndirectLoad(Inst->getOperand(0));
+     break;
+   case Instruction::Store:
+     printStoreInstruction(Inst);
+     break;
+   case Instruction::Trunc:
+   case Instruction::ZExt:
+   case Instruction::SExt:
+   case Instruction::FPTrunc:
+   case Instruction::FPExt:
+   case Instruction::UIToFP:
+   case Instruction::SIToFP:
+   case Instruction::FPToUI:
+   case Instruction::FPToSI:
+   case Instruction::PtrToInt:
+   case Instruction::IntToPtr:
+   case Instruction::BitCast:
+     printCastInstruction(Inst->getOpcode(),Left,
+                          cast<CastInst>(Inst)->getDestTy());
+     break;
+   case Instruction::GetElementPtr:
+     printGepInstruction(Inst->getOperand(0),gep_type_begin(Inst),
+                         gep_type_end(Inst));
+     break;
+   case Instruction::Call:
+     printCallInstruction(cast<CallInst>(Inst));
+     break;
+   case Instruction::Invoke:
+     printInvokeInstruction(cast<InvokeInst>(Inst));
+     break;
+   case Instruction::Unwind: {
+     std::string Class = "instance void [mscorlib]System.Exception::.ctor()";
+     printSimpleInstruction("newobj",Class.c_str());
+     printSimpleInstruction("throw");
+     break;
+   }
+   case Instruction::Switch:
+     printSwitchInstruction(cast<SwitchInst>(Inst));
+     break;
+   case Instruction::Alloca:
+     printValueLoad(Inst->getOperand(0));
+     printSimpleInstruction("localloc");
+     break;
+   case Instruction::Malloc:
+     assert(0 && "LowerAllocationsPass used");
+     break;
+   case Instruction::Free:
+     assert(0 && "LowerAllocationsPass used");
+     break;
+   case Instruction::Unreachable:
+     printSimpleInstruction("ldnull");
+     printSimpleInstruction("throw");
+     break;
+   default:
+     cerr << "Instruction = " << Inst->getName() << '\n';
+     assert(0 && "Unsupported instruction");
+   }
+ }
+ 
+ 
+ void MSILWriter::printLoop(const Loop* L) {
+   Out << getLabelName(L->getHeader()->getName()) << ":\n";
+   const std::vector<BasicBlock*>& blocks = L->getBlocks();
+   for (unsigned I = 0, E = blocks.size(); I!=E; I++) {
+     BasicBlock* BB = blocks[I];
+     Loop* BBLoop = LInfo->getLoopFor(BB);
+     if (BBLoop == L)
+       printBasicBlock(BB);
+     else if (BB==BBLoop->getHeader() && BBLoop->getParentLoop()==L)
+       printLoop(BBLoop);
+   }
+   printSimpleInstruction("br",getLabelName(L->getHeader()->getName()).c_str());
+ }
+ 
+ 
+ void MSILWriter::printBasicBlock(const BasicBlock* BB) {
+   Out << getLabelName(BB) << ":\n";
+   for (BasicBlock::const_iterator I = BB->begin(), E = BB->end(); I!=E; ++I) {
+     const Instruction* Inst = I;
+     // Comment llvm original instruction
+     Out << "\n//" << *Inst << "\n";
+     // Do not handle PHI instruction in current block
+     if (Inst->getOpcode()==Instruction::PHI) continue;
+     // Print instruction
+     printInstruction(Inst);
+     // Save result
+     if (Inst->getType()!=Type::VoidTy) {
+       // Do not save value after invoke, it done in "try" block
+       if (Inst->getOpcode()==Instruction::Invoke) continue;
+       printValueSave(Inst);
+     }
+   }
+ }
+ 
+ 
+ void MSILWriter::printLocalVariables(const Function& F) {
+   std::string Name;
+   const Type* Ty = NULL;
+   // Find variables
+   for (const_inst_iterator I = inst_begin(&F), E = inst_end(&F); I!=E; ++I) {
+     const AllocaInst* AI = dyn_cast<AllocaInst>(&*I);
+     if (AI && !isa<GlobalVariable>(AI)) {
+       Ty = PointerType::get(AI->getAllocatedType());
+       Name = getValueName(AI);
+     } else if (I->getType()!=Type::VoidTy) {
+       Ty = I->getType();
+       Name = getValueName(&*I);
+     } else continue;
+     Out << "\t.locals (" << getTypeName(Ty) << Name << ")\n";
+   }
+ }
+ 
+ 
+ void MSILWriter::printFunctionBody(const Function& F) {
+   // Print body
+   for (Function::const_iterator I = F.begin(), E = F.end(); I!=E; ++I) {
+     if (Loop *L = LInfo->getLoopFor(I)) {
+       if (L->getHeader()==I && L->getParentLoop()==0)
+         printLoop(L);
+     } else {
+       printBasicBlock(I);
+     }
+   }
+ }
+ 
+ 
+ void MSILWriter::printConstantExpr(const ConstantExpr* CE) {
+   const Value *left = 0, *right = 0;
+   if (CE->getNumOperands()>=1) left = CE->getOperand(0);
+   if (CE->getNumOperands()>=2) right = CE->getOperand(1);
+   // Print instruction
+   switch (CE->getOpcode()) {
+   case Instruction::Trunc:
+   case Instruction::ZExt:
+   case Instruction::SExt:
+   case Instruction::FPTrunc:
+   case Instruction::FPExt:
+   case Instruction::UIToFP:
+   case Instruction::SIToFP:
+   case Instruction::FPToUI:
+   case Instruction::FPToSI:
+   case Instruction::PtrToInt:
+   case Instruction::IntToPtr:
+   case Instruction::BitCast:
+     printCastInstruction(CE->getOpcode(),left,CE->getType());
+     break;
+   case Instruction::GetElementPtr:
+     printGepInstruction(CE->getOperand(0),gep_type_begin(CE),gep_type_end(CE));
+     break;
+   case Instruction::ICmp:
+     printICmpInstruction(CE->getPredicate(),left,right);
+     break;
+   case Instruction::FCmp:
+     printFCmpInstruction(CE->getPredicate(),left,right);
+     break;
+   case Instruction::Select:
+     printSelectInstruction(CE->getOperand(0),CE->getOperand(1),CE->getOperand(2));
+     break;
+   case Instruction::Add:
+     printBinaryInstruction("add",left,right);
+     break;
+   case Instruction::Sub:
+     printBinaryInstruction("sub",left,right);
+     break;
+   case Instruction::Mul:
+     printBinaryInstruction("mul",left,right);
+     break;
+   case Instruction::UDiv:
+     printBinaryInstruction("div.un",left,right);
+     break;
+   case Instruction::SDiv:
+   case Instruction::FDiv:
+     printBinaryInstruction("div",left,right);
+     break;
+   case Instruction::URem:
+     printBinaryInstruction("rem.un",left,right);
+     break;
+   case Instruction::SRem:
+   case Instruction::FRem:
+     printBinaryInstruction("rem",left,right);
+     break;
+   case Instruction::And:
+     printBinaryInstruction("and",left,right);
+     break;
+   case Instruction::Or:
+     printBinaryInstruction("or",left,right);
+     break;
+   case Instruction::Xor:
+     printBinaryInstruction("xor",left,right);
+     break;
+   case Instruction::Shl:
+     printBinaryInstruction("shl",left,right);
+     break;
+   case Instruction::LShr:
+     printBinaryInstruction("shr.un",left,right);
+     break;
+   case Instruction::AShr:
+     printBinaryInstruction("shr",left,right);
+     break;
+   default:
+     cerr << "Expression = " << *CE << "\n";
+     assert(0 && "Invalid constant expression");
+   }
+ }
+ 
+ 
+ void MSILWriter::printStaticInitializerList() {
+   // List of global variables with uninitialized fields.
+   for (std::map<const GlobalVariable*,std::vector<StaticInitializer> >::iterator
+        VarI = StaticInitList.begin(), VarE = StaticInitList.end(); VarI!=VarE;
+        ++VarI) {
+     const std::vector<StaticInitializer>& InitList = VarI->second;
+     if (InitList.empty()) continue;
+     // For each uninitialized field.
+     for (std::vector<StaticInitializer>::const_iterator I = InitList.begin(),
+          E = InitList.end(); I!=E; ++I) {
+       if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(I->constant)) {
+         Out << "\n// Init " << getValueName(VarI->first) << ", offset " <<
+           utostr(I->offset) << ", type "<< *I->constant->getType() << "\n\n";
+         // Load variable address
+         printValueLoad(VarI->first);
+         // Add offset
+         if (I->offset!=0) {
+           printPtrLoad(I->offset);
+           printSimpleInstruction("add");
+         }
+         // Load value
+         printConstantExpr(CE);
+         // Save result at offset
+         std::string postfix = getTypePostfix(CE->getType(),true);
+         if (*postfix.begin()=='u') *postfix.begin() = 'i';
+         postfix = "stind."+postfix;
+         printSimpleInstruction(postfix.c_str());
+       } else {
+         cerr << "Constant = " << *I->constant << '\n';
+         assert(0 && "Invalid static initializer");
+       }
+     }
+   }
+ }
+ 
+ 
+ void MSILWriter::printFunction(const Function& F) {
+   const FunctionType* FTy = F.getFunctionType();
+   bool isSigned = FTy->paramHasAttr(0,FunctionType::SExtAttribute);
+   Out << "\n.method static ";
+   Out << (F.hasInternalLinkage() ? "private " : "public ");
+   if (F.isVarArg()) Out << "vararg ";
+   Out << getTypeName(F.getReturnType(),isSigned) << 
+     getConvModopt(F.getCallingConv()) << getValueName(&F) << '\n';
+   // Arguments
+   Out << "\t(";
+   unsigned ArgIdx = 1;
+   for (Function::const_arg_iterator I = F.arg_begin(), E = F.arg_end(); I!=E;
+        ++I, ++ArgIdx) {
+     isSigned = FTy->paramHasAttr(ArgIdx,FunctionType::SExtAttribute);
+     if (I!=F.arg_begin()) Out << ", ";
+     Out << getTypeName(I->getType(),isSigned) << getValueName(I);
+   }
+   Out << ") cil managed\n";
+   // Body
+   Out << "{\n";
+   // FIXME: Convert "string[]" to "argc,argv"
+   if (F.getName()=="main") {
+     printSimpleInstruction(".entrypoint");
+     printLocalVariables(F);
+     printStaticInitializerList();
+   } else {
+     printLocalVariables(F);  
+   }
+   printFunctionBody(F);
+   Out << "}\n";
+ }
+ 
+ 
+ void MSILWriter::printDeclarations(const TypeSymbolTable& ST) {
+   std::string Name;
+   std::set<const Type*> Printed;
+   //cerr << "UsedTypes = " << UsedTypes << '\n';
+   for (std::set<const Type*>::const_iterator
+        UI = UsedTypes->begin(), UE = UsedTypes->end(); UI!=UE; ++UI) {
+     const Type* Ty = *UI;
+     if (isa<ArrayType>(Ty))
+       Name = getArrayTypeName(Ty->getTypeID(),Ty);
+     else if (isa<VectorType>(Ty))
+       Name = getArrayTypeName(Ty->getTypeID(),Ty);
+     else if (isa<StructType>(Ty))
+       Name = ModulePtr->getTypeName(Ty);
+     // Type with no need to declare.
+     else continue;
+     // Print not duplicated type
+     if (Printed.insert(Ty).second) {
+       Out << ".class value explicit ansi sealed '" << Name << "'";
+       Out << " { .pack " << 1 << " .size " << TD->getTypeSize(Ty) << " }\n\n";
+     }
+   }
+ }
+ 
+ 
+ unsigned int MSILWriter::getBitWidth(const Type* Ty) {
+   unsigned int N = Ty->getPrimitiveSizeInBits();
+   assert(N!=0 && "Invalid type in getBitWidth()");
+   switch (N) {
+   case 1:
+   case 8:
+   case 16:
+   case 32:
+   case 64:
+     return N;
+   default:
+     cerr << "Bits = " << N << '\n';
+     assert(0 && "Unsupported integer width");
+   }
+ }
+ 
+ 
+ void MSILWriter::printStaticConstant(const Constant* C, uint64_t& Offset) {
+   uint64_t TySize = 0;
+   const Type* Ty = C->getType();
+   // Print zero initialized constant.
+   if (isa<ConstantAggregateZero>(C) || C->isNullValue()) {
+     TySize = TD->getTypeSize(C->getType());
+     Offset += TySize;
+     Out << "int8 (0) [" << TySize << "]";
+     return;
+   }
+   // Print constant initializer
+   switch (Ty->getTypeID()) {
+   case Type::IntegerTyID: {
+     TySize = TD->getTypeSize(Ty);
+     const ConstantInt* Int = cast<ConstantInt>(C);
+     Out << getPrimitiveTypeName(Ty,true) << "(" << Int->getSExtValue() << ")";
+     break;
+   }
+   case Type::FloatTyID:
+   case Type::DoubleTyID: {
+     TySize = TD->getTypeSize(Ty);
+     const ConstantFP* CFp = cast<ConstantFP>(C);
+     Out << getPrimitiveTypeName(Ty,true) << "(" << CFp->getValue() << ")";
+     break;
+   }
+   case Type::ArrayTyID:
+   case Type::VectorTyID:
+   case Type::StructTyID:
+     for (unsigned I = 0, E = C->getNumOperands(); I<E; I++) {
+       if (I!=0) Out << ",\n";
+       printStaticConstant(C->getOperand(I),Offset);
+     }
+     break;
+   case Type::PointerTyID:
+     TySize = TD->getTypeSize(C->getType());
+     // Initialize with global variable address
+     if (const GlobalVariable *G = dyn_cast<GlobalVariable>(C)) {
+       std::string name = getValueName(G);
+       Out << "&(" << name.insert(name.length()-1,"$data") << ")";
+     } else {
+       // Dynamic initialization
+       if (!isa<ConstantPointerNull>(C) && !C->isNullValue())
+         InitListPtr->push_back(StaticInitializer(C,Offset));
+       // Null pointer initialization
+       if (TySize==4) Out << "int32 (0)";
+       else if (TySize==8) Out << "int64 (0)";
+       else assert(0 && "Invalid pointer size");
+     }
+     break;
+   default:
+     cerr << "TypeID = " << Ty->getTypeID() << '\n';
+     assert(0 && "Invalid type in printStaticConstant()");
+   }
+   // Increase offset.
+   Offset += TySize;
+ }
+ 
+ 
+ void MSILWriter::printStaticInitializer(const Constant* C,
+                                         const std::string& Name) {
+   switch (C->getType()->getTypeID()) {
+   case Type::IntegerTyID:
+   case Type::FloatTyID:
+   case Type::DoubleTyID: 
+     Out << getPrimitiveTypeName(C->getType(),true);
+     break;
+   case Type::ArrayTyID:
+   case Type::VectorTyID:
+   case Type::StructTyID:
+   case Type::PointerTyID:
+     Out << getTypeName(C->getType());
+     break;
+   default:
+     cerr << "Type = " << *C << "\n";
+     assert(0 && "Invalid constant type");
+   }
+   // Print initializer
+   std::string label = Name;
+   label.insert(label.length()-1,"$data");
+   Out << Name << " at " << label << '\n';
+   Out << ".data " << label << " = {\n";
+   uint64_t offset = 0;
+   printStaticConstant(C,offset);
+   Out << "\n}\n\n";
+ }
+ 
+ 
+ void MSILWriter::printVariableDefinition(const GlobalVariable* G) {
+   const Constant* C = G->getInitializer();
+   if (C->isNullValue() || isa<ConstantAggregateZero>(C) || isa<UndefValue>(C))
+     InitListPtr = 0;
+   else
+     InitListPtr = &StaticInitList[G];
+   printStaticInitializer(C,getValueName(G));
+ }
+ 
+ 
+ void MSILWriter::printGlobalVariables() {
+   if (ModulePtr->global_empty()) return;
+   Module::global_iterator I,E;
+   for (I = ModulePtr->global_begin(), E = ModulePtr->global_end(); I!=E; ++I) {
+     // Variable definition
+     if (I->isDeclaration()) continue;
+     Out << ".field static " << (I->hasExternalLinkage() ? "public " :
+                                                           "private ");
+     printVariableDefinition(&*I);
+   }
+ }
+ 
+ 
+ void MSILWriter::printExternals() {
+   Module::const_iterator I,E;
+   for (I=ModulePtr->begin(),E=ModulePtr->end(); I!=E; ++I) {
+     // Skip intrisics
+     if (I->getIntrinsicID()) continue;
+     // FIXME: Treat as standard library function
+     if (I->isDeclaration()) {
+       const Function* F = &*I; 
+       const FunctionType* FTy = F->getFunctionType();
+       std::string Name = getConvModopt(F->getCallingConv())+getValueName(F);
+       std::string Sig = getCallSignature(FTy,NULL,Name);
+       Out << ".method static hidebysig pinvokeimpl(\"msvcrt.dll\" cdecl)\n\t" 
+         << Sig << " preservesig {}\n\n";
+     }
+   }
+ }
+ 
+ //===----------------------------------------------------------------------===//
+ //			 External Interface declaration
+ //===----------------------------------------------------------------------===//
+ 
+ bool MSILTarget::addPassesToEmitWholeFile(PassManager &PM, std::ostream &o,
+                                           CodeGenFileType FileType, bool Fast)
+ {
+   if (FileType != TargetMachine::AssemblyFile) return true;
+   MSILWriter* Writer = new MSILWriter(o);
+   PM.add(createLowerGCPass());
+   PM.add(createLowerAllocationsPass(true));
+   // FIXME: Handle switch trougth native IL instruction "switch"
+   PM.add(createLowerSwitchPass());
+   PM.add(createCFGSimplificationPass());
+   PM.add(new MSILModule(Writer->UsedTypes,Writer->TD));
+   PM.add(Writer);
+   return false;
+ }


Index: llvm/lib/Target/MSIL/MSILWriter.h
diff -c /dev/null llvm/lib/Target/MSIL/MSILWriter.h:1.1
*** /dev/null	Wed Mar 21 16:38:47 2007
--- llvm/lib/Target/MSIL/MSILWriter.h	Wed Mar 21 16:38:25 2007
***************
*** 0 ****
--- 1,230 ----
+ //===-- MSILWriter.h - TargetMachine for the MSIL ---------------*- C++ -*-===//
+ //
+ //		       The LLVM Compiler Infrastructure
+ //
+ // This file was developed by Roman Samoilov and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ //
+ //===----------------------------------------------------------------------===//
+ //
+ // This file declares the MSILWriter that is used by the MSIL.
+ //
+ //===----------------------------------------------------------------------===//
+ #ifndef MSILWRITER_H
+ #define MSILWRITER_H
+ 
+ #include "llvm/Constants.h"
+ #include "llvm/Module.h"
+ #include "llvm/Instructions.h"
+ #include "llvm/Pass.h"
+ #include "llvm/PassManager.h"
+ #include "llvm/Analysis/FindUsedTypes.h"
+ #include "llvm/Analysis/LoopInfo.h"
+ #include "llvm/Support/GetElementPtrTypeIterator.h"
+ #include "llvm/Target/TargetData.h"
+ #include "llvm/Target/TargetMachine.h"
+ #include "llvm/Target/TargetMachineRegistry.h"
+ #include "llvm/Support/Mangler.h"
+ #include <algorithm>
+ #include <ios>
+ using namespace llvm;
+ 
+ namespace {
+ 
+   class MSILModule : public ModulePass {
+     Module *ModulePtr;
+     const std::set<const Type *>*& UsedTypes;
+     const TargetData*& TD;
+ 
+   public:
+     MSILModule(const std::set<const Type *>*& _UsedTypes,
+                const TargetData*& _TD)
+       : UsedTypes(_UsedTypes), TD(_TD) {}
+ 
+     void getAnalysisUsage(AnalysisUsage &AU) const {
+       AU.addRequired<FindUsedTypes>();
+       AU.addRequired<TargetData>();
+     }
+ 
+     virtual const char *getPassName() const {
+       return "MSIL backend definitions";
+     }
+ 
+     virtual bool runOnModule(Module &M);
+ 
+   };
+ 
+   class MSILWriter  : public FunctionPass {
+     struct StaticInitializer {
+       const Constant* constant;
+       uint64_t offset;
+       
+       StaticInitializer()
+         : constant(0), offset(0) {}
+ 
+       StaticInitializer(const Constant* _constant, uint64_t _offset)
+         : constant(_constant), offset(_offset) {} 
+     };
+ 
+     uint64_t UniqID;    
+ 
+     uint64_t getUniqID() {
+       return ++UniqID;
+     }
+ 
+   public:
+     std::ostream &Out;
+     Module* ModulePtr;
+     const TargetData* TD;
+     Mangler* Mang;
+     LoopInfo *LInfo;
+     std::vector<StaticInitializer>* InitListPtr;
+     std::map<const GlobalVariable*,std::vector<StaticInitializer> >
+       StaticInitList;
+     const std::set<const Type *>* UsedTypes;
+ 
+     MSILWriter(std::ostream &o) : Out(o) {
+       UniqID = 0;
+     }
+ 
+     enum ValueType {
+       UndefVT,
+       GlobalVT,
+       InternalVT,
+       ArgumentVT,
+       LocalVT,
+       ConstVT,
+       ConstExprVT
+     };
+ 
+     bool isVariable(ValueType V) {
+       return V==GlobalVT || V==InternalVT || V==ArgumentVT || V==LocalVT;
+     }
+ 
+     bool isConstValue(ValueType V) {
+       return V==ConstVT || V==ConstExprVT;
+     }
+ 
+     virtual const char *getPassName() const { return "MSIL backend"; }
+ 
+     void getAnalysisUsage(AnalysisUsage &AU) const {
+       AU.addRequired<LoopInfo>();
+       AU.setPreservesAll();
+     }
+ 
+     bool runOnFunction(Function &F);
+ 
+     virtual bool doInitialization(Module &M);
+ 
+     virtual bool doFinalization(Module &M);
+ 
+     bool isZeroValue(const Value* V);
+ 
+     std::string getValueName(const Value* V);
+ 
+     std::string getLabelName(const Value* V);
+ 
+     std::string getLabelName(const std::string& Name);
+ 
+     std::string getConvModopt(unsigned CallingConvID);
+ 
+     std::string getArrayTypeName(Type::TypeID TyID, const Type* Ty);
+ 
+     std::string getPrimitiveTypeName(const Type* Ty, bool isSigned);
+ 
+     std::string getFunctionTypeName(const Type* Ty);
+ 
+     std::string getPointerTypeName(const Type* Ty);
+ 
+     std::string getTypeName(const Type* Ty, bool isSigned = false);
+ 
+     ValueType getValueLocation(const Value* V);
+ 
+     std::string getTypePostfix(const Type* Ty, bool Expand,
+                                bool isSigned = false);
+ 
+     void printPtrLoad(uint64_t N);
+ 
+     void printConstLoad(const Constant* C);
+ 
+     void printValueLoad(const Value* V);
+ 
+     void printValueSave(const Value* V);
+ 
+     void printBinaryInstruction(const char* Name, const Value* Left,
+                                 const Value* Right);
+ 
+     void printSimpleInstruction(const char* Inst, const char* Operand = NULL);
+ 
+     void printPHICopy(const BasicBlock* Src, const BasicBlock* Dst);
+ 
+     void printBranchToBlock(const BasicBlock* CurrBB,
+                             const BasicBlock* TrueBB,
+                             const BasicBlock* FalseBB);
+ 
+     void printBranchInstruction(const BranchInst* Inst);
+ 
+     void printSelectInstruction(const Value* Cond, const Value* VTrue,
+                                 const Value* VFalse);
+ 
+     void printIndirectLoad(const Value* V);
+ 
+     void printStoreInstruction(const Instruction* Inst);
+ 
+     void printCastInstruction(unsigned int Op, const Value* V,
+                               const Type* Ty);
+ 
+     void printGepInstruction(const Value* V, gep_type_iterator I,
+                              gep_type_iterator E);
+ 
+     std::string getCallSignature(const FunctionType* Ty,
+                                  const Instruction* Inst,
+                                  std::string Name);
+ 
+     void printFunctionCall(const Value* FnVal, const Instruction* Inst);
+ 
+     void printCallInstruction(const Instruction* Inst);
+ 
+     void printICmpInstruction(unsigned Predicate, const Value* Left,
+                               const Value* Right);
+ 
+     void printFCmpInstruction(unsigned Predicate, const Value* Left,
+                               const Value* Right);
+ 
+     void printInvokeInstruction(const InvokeInst* Inst);
+ 
+     void printSwitchInstruction(const SwitchInst* Inst);
+ 
+     void printInstruction(const Instruction* Inst);
+ 
+     void printLoop(const Loop* L);
+ 
+     void printBasicBlock(const BasicBlock* BB);
+     
+     void printLocalVariables(const Function& F);
+ 
+     void printFunctionBody(const Function& F);
+ 
+     void printConstantExpr(const ConstantExpr* CE);
+ 
+     void printStaticInitializerList();
+ 
+     void printFunction(const Function& F);
+ 
+     void printDeclarations(const TypeSymbolTable& ST);
+ 
+     unsigned int getBitWidth(const Type* Ty);
+ 
+     void printStaticConstant(const Constant* C, uint64_t& Offset);
+ 
+     void printStaticInitializer(const Constant* C, const std::string& Name);
+ 
+     void printVariableDefinition(const GlobalVariable* G);
+ 
+     void printGlobalVariables();
+ 
+     void printExternals();
+   };
+ }
+ 
+ #endif


Index: llvm/lib/Target/MSIL/Makefile
diff -c /dev/null llvm/lib/Target/MSIL/Makefile:1.1
*** /dev/null	Wed Mar 21 16:38:47 2007
--- llvm/lib/Target/MSIL/Makefile	Wed Mar 21 16:38:25 2007
***************
*** 0 ****
--- 1,14 ----
+ ##===- lib/Target/MSIL/Makefile ----------------------------*- Makefile -*-===##
+ #
+ #		      The LLVM Compiler Infrastructure
+ #
+ # 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.
+ #
+ ##===----------------------------------------------------------------------===##
+ 
+ LEVEL = ../../..
+ LIBRARYNAME = LLVMMSIL
+ include $(LEVEL)/Makefile.common
+ 
+ CompileCommonOpts := $(CompileCommonOpts) -Wno-format





From asl at math.spbu.ru  Wed Mar 21 16:38:46 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 21 Mar 2007 16:38:46 -0500
Subject: [llvm-commits] CVS: llvm/configure
Message-ID: <200703212138.l2LLcksB006148@zion.cs.uiuc.edu>



Changes in directory llvm:

configure updated: 1.270 -> 1.271
---
Log message:

Let the new backend begin!


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

 configure |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/configure
diff -u llvm/configure:1.270 llvm/configure:1.271
--- llvm/configure:1.270	Fri Feb 16 13:17:20 2007
+++ llvm/configure	Wed Mar 21 16:38:25 2007
@@ -4730,7 +4730,7 @@
   done
   ;;
 esac
-TARGETS_TO_BUILD="CBackend $TARGETS_TO_BUILD"
+TARGETS_TO_BUILD="CBackend MSIL $TARGETS_TO_BUILD"
 TARGETS_TO_BUILD=$TARGETS_TO_BUILD
 
 





From asl at math.spbu.ru  Wed Mar 21 16:38:47 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 21 Mar 2007 16:38:47 -0500
Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac
Message-ID: <200703212138.l2LLcliM006153@zion.cs.uiuc.edu>



Changes in directory llvm/autoconf:

configure.ac updated: 1.265 -> 1.266
---
Log message:

Let the new backend begin!


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

 configure.ac |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/autoconf/configure.ac
diff -u llvm/autoconf/configure.ac:1.265 llvm/autoconf/configure.ac:1.266
--- llvm/autoconf/configure.ac:1.265	Fri Feb 16 13:11:06 2007
+++ llvm/autoconf/configure.ac	Wed Mar 21 16:38:25 2007
@@ -376,7 +376,7 @@
   done 
   ;;
 esac
-TARGETS_TO_BUILD="CBackend $TARGETS_TO_BUILD"
+TARGETS_TO_BUILD="CBackend MSIL $TARGETS_TO_BUILD"
 AC_SUBST(TARGETS_TO_BUILD,$TARGETS_TO_BUILD)
 
 dnl Prevent the CBackend from using printf("%a") for floating point so older





From asl at math.spbu.ru  Wed Mar 21 16:45:42 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 21 Mar 2007 16:45:42 -0500
Subject: [llvm-commits] CVS: llvm/CREDITS.TXT
Message-ID: <200703212145.l2LLjgBW006336@zion.cs.uiuc.edu>



Changes in directory llvm:

CREDITS.TXT updated: 1.71 -> 1.72
---
Log message:

Add Roman to credits


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

 CREDITS.TXT |    4 ++++
 1 files changed, 4 insertions(+)


Index: llvm/CREDITS.TXT
diff -u llvm/CREDITS.TXT:1.71 llvm/CREDITS.TXT:1.72
--- llvm/CREDITS.TXT:1.71	Mon Mar  5 03:21:11 2007
+++ llvm/CREDITS.TXT	Wed Mar 21 16:45:25 2007
@@ -169,6 +169,10 @@
 E: ghost at cs.msu.su
 D: Made inst_iterator behave like a proper iterator, LowerConstantExprs pass
 
+N: Roman Samoilov
+E: roman at codedgers.com
+D: MSIL backend
+
 N: Duncan Sands
 E: baldrick at free.fr
 D: Ada front-end





From asl at math.spbu.ru  Wed Mar 21 16:49:16 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 21 Mar 2007 16:49:16 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/MSIL/README.TXT
Message-ID: <200703212149.l2LLnGHr006407@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/MSIL:

README.TXT added (r1.1)
---
Log message:

Add TODO list for MSIL backend


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

 README.TXT |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 51 insertions(+)


Index: llvm/lib/Target/MSIL/README.TXT
diff -c /dev/null llvm/lib/Target/MSIL/README.TXT:1.1
*** /dev/null	Wed Mar 21 16:49:09 2007
--- llvm/lib/Target/MSIL/README.TXT	Wed Mar 21 16:48:59 2007
***************
*** 0 ****
--- 1,51 ----
+ //===---------------------------------------------------------------------===// 
+ 
+ Vector instructions support.
+ 
+ ShuffleVector
+ ExtractElement
+ InsertElement
+ 
+ //===---------------------------------------------------------------------===// 
+ 
+ Add "OpaqueType" type.
+ 
+ //===---------------------------------------------------------------------===// 
+ 
+ Variable argument functions support, "VAArg" instruction and some intrinsics.
+ CLI instruction "arglist" can get argument list descriptor for current function
+ that can be passed to other functions.
+ 
+  va_arg = Function "System.ArgIterator::GetNextArg()"
+  va_list = Class "System.ArgIterator"
+  va_start = Instruction "arglist"
+  va_end = Do nothing
+ 
+ //===---------------------------------------------------------------------===// 
+ 
+ If possible get used types inside of "MSILWriter" class, do not pass trougth
+ "MSILModule" class.
+ 
+ 	getAnalysis<FindUsedTypes>().getTypes()
+ 
+ //===---------------------------------------------------------------------===// 
+ 
+ "switch" instruction emulation with CLI "switch" instruction.
+ 
+ //===---------------------------------------------------------------------===// 
+ 
+ Write linker for external function, because function export need to know 
+ dynamic library where function located.
+ 
+ .method static hidebysig pinvokeimpl("msvcrt.dll" cdecl)
+ 	void free(void*) preservesig {}
+ 
+ //===---------------------------------------------------------------------===// 
+ 
+ DLLImport'ed variables support with the help of win32 envoronment.
+ 
+ 	"LoadLibrary" - to load dynamic library into address space.
+ 	"GetProcAddress" - to recive variable address by name.
+ 
+ 
+ 





From dalej at apple.com  Wed Mar 21 16:52:14 2007
From: dalej at apple.com (Dale Johannesen)
Date: Wed, 21 Mar 2007 16:52:14 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/ARM/ARMISelLowering.h
	ARMISelLowering.cpp
Message-ID: <200703212152.l2LLqEtJ006545@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/ARM:

ARMISelLowering.h updated: 1.6 -> 1.7
ARMISelLowering.cpp updated: 1.28 -> 1.29
---
Log message:

repair x86 performance, dejagnu problems from previous change


---
Diffs of the changes:  (+4 -3)

 ARMISelLowering.cpp |    4 ++--
 ARMISelLowering.h   |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)


Index: llvm/lib/Target/ARM/ARMISelLowering.h
diff -u llvm/lib/Target/ARM/ARMISelLowering.h:1.6 llvm/lib/Target/ARM/ARMISelLowering.h:1.7
--- llvm/lib/Target/ARM/ARMISelLowering.h:1.6	Tue Mar 20 16:54:54 2007
+++ llvm/lib/Target/ARM/ARMISelLowering.h	Wed Mar 21 16:51:52 2007
@@ -109,7 +109,8 @@
     /// isLegalAddressScaleAndImm - Return true if S works for 
     /// IsLegalAddressScale and GV works for isLegalAddressImmediate _and_
     /// both can be applied simultaneously to the same instruction.
-    virtual bool isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV) const;
+    virtual bool isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV,
+                                           const Type *Ty) const;
 
     /// getPreIndexedAddressParts - returns true by value, base pointer and
     /// offset pointer and addressing mode by reference if the node's address


Index: llvm/lib/Target/ARM/ARMISelLowering.cpp
diff -u llvm/lib/Target/ARM/ARMISelLowering.cpp:1.28 llvm/lib/Target/ARM/ARMISelLowering.cpp:1.29
--- llvm/lib/Target/ARM/ARMISelLowering.cpp:1.28	Tue Mar 20 16:54:54 2007
+++ llvm/lib/Target/ARM/ARMISelLowering.cpp	Wed Mar 21 16:51:52 2007
@@ -1392,8 +1392,8 @@
 /// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
 /// and GV works for isLegalAddressImmediate _and_ both can be applied
 /// simultaneously to the same instruction.
-bool ARMTargetLowering::isLegalAddressScaleAndImm(int64_t S, 
-                                               GlobalValue *GV) const {
+bool ARMTargetLowering::isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV,
+                                                  const Type* Ty) const {
   return false;
 }
 





From dalej at apple.com  Wed Mar 21 16:52:15 2007
From: dalej at apple.com (Dale Johannesen)
Date: Wed, 21 Mar 2007 16:52:15 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetLowering.h
Message-ID: <200703212152.l2LLqFkp006550@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Target:

TargetLowering.h updated: 1.114 -> 1.115
---
Log message:

repair x86 performance, dejagnu problems from previous change


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

 TargetLowering.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)


Index: llvm/include/llvm/Target/TargetLowering.h
diff -u llvm/include/llvm/Target/TargetLowering.h:1.114 llvm/include/llvm/Target/TargetLowering.h:1.115
--- llvm/include/llvm/Target/TargetLowering.h:1.114	Tue Mar 20 16:54:54 2007
+++ llvm/include/llvm/Target/TargetLowering.h	Wed Mar 21 16:51:52 2007
@@ -883,7 +883,8 @@
   /// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
   /// and GV works for isLegalAddressImmediate _and_ both can be applied
   /// simultaneously to the same instruction.
-  virtual bool isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV) const;
+  virtual bool isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV,
+                                                    const Type* Ty) const;
 
   //===--------------------------------------------------------------------===//
   // Div utility functions





From dalej at apple.com  Wed Mar 21 16:52:15 2007
From: dalej at apple.com (Dale Johannesen)
Date: Wed, 21 Mar 2007 16:52:15 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
Message-ID: <200703212152.l2LLqFet006555@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

TargetLowering.cpp updated: 1.98 -> 1.99
---
Log message:

repair x86 performance, dejagnu problems from previous change


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

 TargetLowering.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp:1.98 llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp:1.99
--- llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp:1.98	Tue Mar 20 16:54:54 2007
+++ llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp	Wed Mar 21 16:51:52 2007
@@ -1969,8 +1969,8 @@
 /// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
 /// and GV works for isLegalAddressImmediate _and_ both can be applied
 /// simultaneously to the same instruction.
-bool TargetLowering::isLegalAddressScaleAndImm(int64_t S, 
-                                               GlobalValue *GV) const {
+bool TargetLowering::isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV,
+                                               const Type* Ty) const {
 
   return false;
 }





From dalej at apple.com  Wed Mar 21 16:52:18 2007
From: dalej at apple.com (Dale Johannesen)
Date: Wed, 21 Mar 2007 16:52:18 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86ISelLowering.h
	X86ISelLowering.cpp
Message-ID: <200703212152.l2LLqIEi006562@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86ISelLowering.h updated: 1.92 -> 1.93
X86ISelLowering.cpp updated: 1.373 -> 1.374
---
Log message:

repair x86 performance, dejagnu problems from previous change


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

 X86ISelLowering.cpp |   16 ++++++++++++++++
 X86ISelLowering.h   |   12 ++++++++++++
 2 files changed, 28 insertions(+)


Index: llvm/lib/Target/X86/X86ISelLowering.h
diff -u llvm/lib/Target/X86/X86ISelLowering.h:1.92 llvm/lib/Target/X86/X86ISelLowering.h:1.93
--- llvm/lib/Target/X86/X86ISelLowering.h:1.92	Mon Mar 12 18:28:50 2007
+++ llvm/lib/Target/X86/X86ISelLowering.h	Wed Mar 21 16:51:52 2007
@@ -349,6 +349,18 @@
     /// type.
     virtual bool isLegalAddressScale(int64_t S, const Type *Ty) const;
 
+    /// isLegalAddressScaleAndImm - Return true if S works for 
+    /// IsLegalAddressScale and V works for isLegalAddressImmediate _and_ 
+    /// both can be applied simultaneously to the same instruction.
+    virtual bool isLegalAddressScaleAndImm(int64_t S, int64_t V, 
+                                           const Type *Ty) const;
+
+    /// isLegalAddressScaleAndImm - Return true if S works for 
+    /// IsLegalAddressScale and GV works for isLegalAddressImmediate _and_
+    /// both can be applied simultaneously to the same instruction.
+    virtual bool isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV,
+                                           const Type *Ty) const;
+
     /// isShuffleMaskLegal - Targets can use this to indicate that they only
     /// support *some* VECTOR_SHUFFLE operations, those with specific masks.
     /// By default, if a target supports the VECTOR_SHUFFLE node, all mask


Index: llvm/lib/Target/X86/X86ISelLowering.cpp
diff -u llvm/lib/Target/X86/X86ISelLowering.cpp:1.373 llvm/lib/Target/X86/X86ISelLowering.cpp:1.374
--- llvm/lib/Target/X86/X86ISelLowering.cpp:1.373	Sun Mar 18 19:39:32 2007
+++ llvm/lib/Target/X86/X86ISelLowering.cpp	Wed Mar 21 16:51:52 2007
@@ -4064,6 +4064,22 @@
   }
 }
 
+/// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
+/// and V works for isLegalAddressImmediate _and_ both can be applied
+/// simultaneously to the same instruction.
+bool X86TargetLowering::isLegalAddressScaleAndImm(int64_t S, int64_t V, 
+                                               const Type* Ty) const {
+  return isLegalAddressScale(S, Ty) && isLegalAddressImmediate(V, Ty);
+}
+
+/// isLegalAddressScaleAndImm - Return true if S works for IsLegalAddressScale
+/// and GV works for isLegalAddressImmediate _and_ both can be applied
+/// simultaneously to the same instruction.
+bool X86TargetLowering::isLegalAddressScaleAndImm(int64_t S, GlobalValue *GV,
+                                                  const Type* Ty) const {
+  return isLegalAddressScale(S, Ty) && isLegalAddressImmediate(GV);
+}
+
 /// isShuffleMaskLegal - Targets can use this to indicate that they only
 /// support *some* VECTOR_SHUFFLE operations, those with specific masks.
 /// By default, if a target supports the VECTOR_SHUFFLE node, all mask values





From lauro.venancio at gmail.com  Wed Mar 21 17:11:17 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Wed, 21 Mar 2007 19:11:17 -0300
Subject: [llvm-commits] [LLVMdev] combined arm patch
In-Reply-To: <9c10c9f0701111316p1b30503bj6b9bf8cbf44a9db6@mail.gmail.com>
References: <564d96fb0612011230v30bdeb1akad826ad7d7081ad3@mail.gmail.com>
	<892D9075-18D5-46A6-AB62-3024C8FD78A3@apple.com>
	<564d96fb0612041232g62eaa80k8f7d948aa61ea070@mail.gmail.com>
	<0A5D6DD0-FA29-4BA0-BCB8-9EE914D65653@apple.com>
	<DA791B14-5723-4E61-8BDC-2672698711FA@apple.com>
	<564d96fb0612060951v3e0fea05v5d2f819e2f1a93f6@mail.gmail.com>
	<564d96fb0612061058of3e7474n3146d8175f68eb61@mail.gmail.com>
	<9c10c9f0701111316p1b30503bj6b9bf8cbf44a9db6@mail.gmail.com>
Message-ID: <9c10c9f0703211511i2aaae027wbce2b4b5a5cd4fa7@mail.gmail.com>

The attached patch is the backport of ARM EABI. It is needed to
compile llvm-gcc on arm-linux-gnueabi. Patched by Rafael.

Important: This patch removes gcc/unwind.h file, so it must be applied
using "patch  -E -p0".

Lauro

2007/1/11, Lauro Ramos Venancio <lauro.venancio at gmail.com>:
> The following patch updates Rafael's patch to apply it on svn revision 247.
>
> Lauro
>
> 2006/12/6, Rafael Esp?ndola <rafael.espindola at gmail.com >:
> > > Could you please try to remove the empty gcc/unwind.h and try again? I
> > > am currently compiling on a powerbook. I will report as soon as it
> > > finishes.
> >
> > The build finished successfully!
> >
> > Rafael
> > _______________________________________________
> > 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: arm.patch.bz2
Type: application/x-bzip2
Size: 34589 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070321/124c9029/attachment.bz2 

From reid at x10sys.com  Wed Mar 21 17:22:36 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 17:22:36 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/ADT/APInt.h
Message-ID: <200703212222.l2LMMaQe007088@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/ADT:

APInt.h updated: 1.45 -> 1.46
---
Log message:

Fix a comment.


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

 APInt.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/include/llvm/ADT/APInt.h
diff -u llvm/include/llvm/ADT/APInt.h:1.45 llvm/include/llvm/ADT/APInt.h:1.46
--- llvm/include/llvm/ADT/APInt.h:1.45	Mon Mar 19 21:18:16 2007
+++ llvm/include/llvm/ADT/APInt.h	Wed Mar 21 17:22:19 2007
@@ -633,7 +633,7 @@
                           !isNegative() && countPopulation() == BitWidth - 1;
   }
 
-  /// This checks to see if the value of this APInt is the minimum signed
+  /// This checks to see if the value of this APInt is the minimum unsigned
   /// value for the APInt's bit width.
   /// @brief Determine if this is the smallest unsigned value.
   bool isMinValue() const {





From reid at x10sys.com  Wed Mar 21 18:20:08 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 18:20:08 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703212320.l2LNK8Bm008092@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.670 -> 1.671
---
Log message:

For PR1248: http://llvm.org/PR1248 :
* Fix some indentation and comments in InsertRangeTest
* Add an "IsSigned" parameter to AddWithOverflow and make it handle signed
  additions. Also, APIntify this function so it works with any bitwidth.
* For the icmp pred ([us]div %X, C1), C2 transforms, exit early if the
  div instruction's RHS is zero.
* Finally, for icmp pred (sdiv %X, C1), -C2, fix an off-by-one error. The
  HiBound needs to be incremented in order to get the range test correct.


---
Diffs of the changes:  (+26 -18)

 InstructionCombining.cpp |   44 ++++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 18 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.670 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.671
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.670	Tue Mar 20 07:49:06 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Wed Mar 21 18:19:50 2007
@@ -3773,7 +3773,7 @@
 
     // V >= Min && V < Hi --> V < Hi
     if (cast<ConstantInt>(Lo)->isMinValue(isSigned)) {
-    ICmpInst::Predicate pred = (isSigned ? 
+      ICmpInst::Predicate pred = (isSigned ? 
         ICmpInst::ICMP_SLT : ICmpInst::ICMP_ULT);
       return new ICmpInst(pred, V, Hi);
     }
@@ -3789,7 +3789,7 @@
   if (Lo == Hi)  // Trivially true.
     return new ICmpInst(ICmpInst::ICMP_EQ, V, V);
 
-  // V < Min || V >= Hi ->'V > Hi-1'
+  // V < Min || V >= Hi -> V > Hi-1
   Hi = SubOne(cast<ConstantInt>(Hi));
   if (cast<ConstantInt>(Lo)->isMinValue(isSigned)) {
     ICmpInst::Predicate pred = (isSigned ? 
@@ -3797,8 +3797,9 @@
     return new ICmpInst(pred, V, Hi);
   }
 
-  // Emit V-Lo > Hi-1-Lo
-  Constant *NegLo = ConstantExpr::getNeg(Lo);
+  // Emit V-Lo >u Hi-1-Lo
+  // Note that Hi has already had one subtracted from it, above.
+  ConstantInt *NegLo = cast<ConstantInt>(ConstantExpr::getNeg(Lo));
   Instruction *Add = BinaryOperator::createAdd(V, NegLo, V->getName()+".off");
   InsertNewInstBefore(Add, IB);
   Constant *LowerBound = ConstantExpr::getAdd(NegLo, Hi);
@@ -4918,11 +4919,16 @@
 /// AddWithOverflow - Compute Result = In1+In2, returning true if the result
 /// overflowed for this type.
 static bool AddWithOverflow(ConstantInt *&Result, ConstantInt *In1,
-                            ConstantInt *In2) {
+                            ConstantInt *In2, bool IsSigned = false) {
   Result = cast<ConstantInt>(ConstantExpr::getAdd(In1, In2));
 
-  return cast<ConstantInt>(Result)->getZExtValue() <
-         cast<ConstantInt>(In1)->getZExtValue();
+  if (IsSigned)
+    if (In2->getValue().isNegative())
+      return Result->getValue().sgt(In1->getValue());
+    else
+      return Result->getValue().slt(In1->getValue());
+  else
+    return Result->getValue().ult(In1->getValue());
 }
 
 /// EmitGEPOffset - Given a getelementptr instruction/constantexpr, emit the
@@ -5664,6 +5670,8 @@
           bool DivIsSigned = LHSI->getOpcode() == Instruction::SDiv;
           if (!I.isEquality() && DivIsSigned != I.isSignedPredicate())
             break;
+          if (DivRHS->isZero())
+            break; // Don't hack on div by zero
 
           // Initialize the variables that will indicate the nature of the
           // range check.
@@ -5680,19 +5688,17 @@
           // Determine if the product overflows by seeing if the product is
           // not equal to the divide. Make sure we do the same kind of divide
           // as in the LHS instruction that we're folding. 
-          bool ProdOV = !DivRHS->isNullValue() && 
-            (DivIsSigned ?  ConstantExpr::getSDiv(Prod, DivRHS) :
-              ConstantExpr::getUDiv(Prod, DivRHS)) != CI;
+          bool ProdOV = (DivIsSigned ? ConstantExpr::getSDiv(Prod, DivRHS) :
+                                     ConstantExpr::getUDiv(Prod, DivRHS)) != CI;
 
           // Get the ICmp opcode
           ICmpInst::Predicate predicate = I.getPredicate();
 
-          if (DivRHS->isNullValue()) {  
-            // Don't hack on divide by zeros!
-          } else if (!DivIsSigned) {  // udiv
+          if (!DivIsSigned) {  // udiv
             LoBound = Prod;
             LoOverflow = ProdOV;
-            HiOverflow = ProdOV || AddWithOverflow(HiBound, LoBound, DivRHS);
+            HiOverflow = ProdOV || 
+                         AddWithOverflow(HiBound, LoBound, DivRHS, false);
           } else if (DivRHS->getValue().isPositive()) { // Divisor is > 0.
             if (CI->isNullValue()) {       // (X / pos) op 0
               // Can't overflow.
@@ -5701,12 +5707,13 @@
             } else if (CI->getValue().isPositive()) {   // (X / pos) op pos
               LoBound = Prod;
               LoOverflow = ProdOV;
-              HiOverflow = ProdOV || AddWithOverflow(HiBound, Prod, DivRHS);
+              HiOverflow = ProdOV || 
+                           AddWithOverflow(HiBound, Prod, DivRHS, true);
             } else {                       // (X / pos) op neg
               Constant *DivRHSH = ConstantExpr::getNeg(SubOne(DivRHS));
               LoOverflow = AddWithOverflow(LoBound, Prod,
-                                           cast<ConstantInt>(DivRHSH));
-              HiBound = Prod;
+                                           cast<ConstantInt>(DivRHSH), true);
+              HiBound = AddOne(Prod);
               HiOverflow = ProdOV;
             }
           } else {                         // Divisor is < 0.
@@ -5718,7 +5725,8 @@
             } else if (CI->getValue().isPositive()) {   // (X / neg) op pos
               HiOverflow = LoOverflow = ProdOV;
               if (!LoOverflow)
-                LoOverflow = AddWithOverflow(LoBound, Prod, AddOne(DivRHS));
+                LoOverflow = AddWithOverflow(LoBound, Prod, AddOne(DivRHS),
+                                             true);
               HiBound = AddOne(Prod);
             } else {                       // (X / neg) op neg
               LoBound = Prod;





From asl at math.spbu.ru  Wed Mar 21 18:58:22 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 21 Mar 2007 18:58:22 -0500
Subject: [llvm-commits] CVS: llvm/docs/LangRef.html
Message-ID: <200703212358.l2LNwMFG008791@zion.cs.uiuc.edu>



Changes in directory llvm/docs:

LangRef.html updated: 1.210 -> 1.211
---
Log message:

Fixed va_arg example. Reported by Roman Samoilov


---
Diffs of the changes:  (+10 -6)

 LangRef.html |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)


Index: llvm/docs/LangRef.html
diff -u llvm/docs/LangRef.html:1.210 llvm/docs/LangRef.html:1.211
--- llvm/docs/LangRef.html:1.210	Wed Mar 14 14:31:19 2007
+++ llvm/docs/LangRef.html	Wed Mar 21 18:58:04 2007
@@ -3627,11 +3627,11 @@
 used.</p>
 
 <pre>
-define i32 %test(i32 %X, ...) {
+define i32 @test(i32 %X, ...) {
   ; Initialize variable argument processing
   %ap = alloca i8 *
   %ap2 = bitcast i8** %ap to i8*
-  call void %<a href="#i_va_start">llvm.va_start</a>(i8* %ap2)
+  call void @llvm.va_start(i8* %ap2)
 
   ; Read a single integer argument
   %tmp = va_arg i8 ** %ap, i32
@@ -3639,13 +3639,17 @@
   ; Demonstrate usage of llvm.va_copy and llvm.va_end
   %aq = alloca i8 *
   %aq2 = bitcast i8** %aq to i8*
-  call void %<a href="#i_va_copy">llvm.va_copy</a>(i8 *%aq2, i8* %ap2)
-  call void %<a href="#i_va_end">llvm.va_end</a>(i8* %aq2)
+  call void @llvm.va_copy(i8 *%aq2, i8* %ap2)
+  call void @llvm.va_end(i8* %aq2)
 
   ; Stop processing of arguments.
-  call void %<a href="#i_va_end">llvm.va_end</a>(i8* %ap2)
+  call void @llvm.va_end(i8* %ap2)
   ret i32 %tmp
 }
+
+declare void @llvm.va_start(i8*)
+declare void @llvm.va_copy(i8*, i8*)
+declare void @llvm.va_end(i8*)
 </pre>
 </div>
 
@@ -4599,7 +4603,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.org">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2007/03/14 19:31:19 $
+  Last modified: $Date: 2007/03/21 23:58:04 $
 </address>
 </body>
 </html>





From clattner at apple.com  Wed Mar 21 19:00:59 2007
From: clattner at apple.com (Chris Lattner)
Date: Wed, 21 Mar 2007 17:00:59 -0700
Subject: [llvm-commits]
	CVS:	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
In-Reply-To: <200703212320.l2LNK8Bm008092@zion.cs.uiuc.edu>
References: <200703212320.l2LNK8Bm008092@zion.cs.uiuc.edu>
Message-ID: <1CB1A4B0-E5CB-407D-98CA-1B66C7D8212F@apple.com>

> For PR1248: http://llvm.org/PR1248 :
> * Fix some indentation and comments in InsertRangeTest
> * Add an "IsSigned" parameter to AddWithOverflow and make it handle  
> signed
>   additions. Also, APIntify this function so it works with any  
> bitwidth.
> * For the icmp pred ([us]div %X, C1), C2 transforms, exit early if the
>   div instruction's RHS is zero.
> * Finally, for icmp pred (sdiv %X, C1), -C2, fix an off-by-one  
> error. The
>   HiBound needs to be incremented in order to get the range test  
> correct.

Thanks Reid, testcase please!

>  /// AddWithOverflow - Compute Result = In1+In2, returning true if  
> the result
>  /// overflowed for this type.
>  static bool AddWithOverflow(ConstantInt *&Result, ConstantInt *In1,
> -                            ConstantInt *In2) {
> +                            ConstantInt *In2, bool IsSigned =  
> false) {
>    Result = cast<ConstantInt>(ConstantExpr::getAdd(In1, In2));
>
> -  return cast<ConstantInt>(Result)->getZExtValue() <
> -         cast<ConstantInt>(In1)->getZExtValue();
> +  if (IsSigned)
> +    if (In2->getValue().isNegative())
> +      return Result->getValue().sgt(In1->getValue());
> +    else
> +      return Result->getValue().slt(In1->getValue());

I don't understand this logic.  Shouldn't it always be slt?

-Chris


From asl at math.spbu.ru  Wed Mar 21 19:02:34 2007
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Wed, 21 Mar 2007 19:02:34 -0500
Subject: [llvm-commits] CVS: llvm/docs/LangRef.html
Message-ID: <200703220002.l2M02Y7c008948@zion.cs.uiuc.edu>



Changes in directory llvm/docs:

LangRef.html updated: 1.211 -> 1.212
---
Log message:

More LangRef fixes. Corrected names of intrinsics.


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

 LangRef.html |   76 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 38 insertions(+), 38 deletions(-)


Index: llvm/docs/LangRef.html
diff -u llvm/docs/LangRef.html:1.211 llvm/docs/LangRef.html:1.212
--- llvm/docs/LangRef.html:1.211	Wed Mar 21 18:58:04 2007
+++ llvm/docs/LangRef.html	Wed Mar 21 19:02:17 2007
@@ -3689,7 +3689,7 @@
 
 <div class="doc_text">
 <h5>Syntax:</h5>
-<pre>  declare void %llvm.va_end(i8* &lt;arglist&gt;)<br></pre>
+<pre>  declare void @llvm.va_end(i8* &lt;arglist&gt;)<br></pre>
 <h5>Overview:</h5>
 
 <p>The '<tt>llvm.va_end</tt>' intrinsic destroys <tt>&lt;arglist&gt;</tt>
@@ -3720,7 +3720,7 @@
 <h5>Syntax:</h5>
 
 <pre>
-  declare void %llvm.va_copy(i8* &lt;destarglist&gt;, i8* &lt;srcarglist&gt;)
+  declare void @llvm.va_copy(i8* &lt;destarglist&gt;, i8* &lt;srcarglist&gt;)
 </pre>
 
 <h5>Overview:</h5>
@@ -3773,7 +3773,7 @@
 <h5>Syntax:</h5>
 
 <pre>
-  declare void %llvm.gcroot(&lt;ty&gt;** %ptrloc, &lt;ty2&gt;* %metadata)
+  declare void @llvm.gcroot(&lt;ty&gt;** %ptrloc, &lt;ty2&gt;* %metadata)
 </pre>
 
 <h5>Overview:</h5>
@@ -3807,7 +3807,7 @@
 <h5>Syntax:</h5>
 
 <pre>
-  declare i8 * %llvm.gcread(i8 * %ObjPtr, i8 ** %Ptr)
+  declare i8 * @llvm.gcread(i8 * %ObjPtr, i8 ** %Ptr)
 </pre>
 
 <h5>Overview:</h5>
@@ -3842,7 +3842,7 @@
 <h5>Syntax:</h5>
 
 <pre>
-  declare void %llvm.gcwrite(i8 * %P1, i8 * %Obj, i8 ** %P2)
+  declare void @llvm.gcwrite(i8 * %P1, i8 * %Obj, i8 ** %P2)
 </pre>
 
 <h5>Overview:</h5>
@@ -3890,7 +3890,7 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare i8  *%llvm.returnaddress(i32 &lt;level&gt;)
+  declare i8  *@llvm.returnaddress(i32 &lt;level&gt;)
 </pre>
 
 <h5>Overview:</h5>
@@ -3935,7 +3935,7 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare i8  *%llvm.frameaddress(i32 &lt;level&gt;)
+  declare i8  *@llvm.frameaddress(i32 &lt;level&gt;)
 </pre>
 
 <h5>Overview:</h5>
@@ -3978,7 +3978,7 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare i8  *%llvm.stacksave()
+  declare i8  *@llvm.stacksave()
 </pre>
 
 <h5>Overview:</h5>
@@ -4013,7 +4013,7 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare void %llvm.stackrestore(i8 * %ptr)
+  declare void @llvm.stackrestore(i8 * %ptr)
 </pre>
 
 <h5>Overview:</h5>
@@ -4044,7 +4044,7 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare void %llvm.prefetch(i8  * &lt;address&gt;,
+  declare void @llvm.prefetch(i8  * &lt;address&gt;,
                                 i32 &lt;rw&gt;, i32 &lt;locality&gt;)
 </pre>
 
@@ -4089,7 +4089,7 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare void %llvm.pcmarker( i32 &lt;id&gt; )
+  declare void @llvm.pcmarker( i32 &lt;id&gt; )
 </pre>
 
 <h5>Overview:</h5>
@@ -4130,7 +4130,7 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare i64 %llvm.readcyclecounter( )
+  declare i64 @llvm.readcyclecounter( )
 </pre>
 
 <h5>Overview:</h5>
@@ -4178,9 +4178,9 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare void %llvm.memcpy.i32(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
+  declare void @llvm.memcpy.i32(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
                                 i32 &lt;len&gt;, i32 &lt;align&gt;)
-  declare void %llvm.memcpy.i64(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
+  declare void @llvm.memcpy.i64(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
                                 i64 &lt;len&gt;, i32 &lt;align&gt;)
 </pre>
 
@@ -4232,9 +4232,9 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare void %llvm.memmove.i32(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
+  declare void @llvm.memmove.i32(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
                                  i32 &lt;len&gt;, i32 &lt;align&gt;)
-  declare void %llvm.memmove.i64(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
+  declare void @llvm.memmove.i64(i8 * &lt;dest&gt;, i8 * &lt;src&gt;,
                                  i64 &lt;len&gt;, i32 &lt;align&gt;)
 </pre>
 
@@ -4287,9 +4287,9 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare void %llvm.memset.i32(i8 * &lt;dest&gt;, i8 &lt;val&gt;,
+  declare void @llvm.memset.i32(i8 * &lt;dest&gt;, i8 &lt;val&gt;,
                                 i32 &lt;len&gt;, i32 &lt;align&gt;)
-  declare void %llvm.memset.i64(i8 * &lt;dest&gt;, i8 &lt;val&gt;,
+  declare void @llvm.memset.i64(i8 * &lt;dest&gt;, i8 &lt;val&gt;,
                                 i64 &lt;len&gt;, i32 &lt;align&gt;)
 </pre>
 
@@ -4340,8 +4340,8 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare float %llvm.sqrt.f32(float %Val)
-  declare double %llvm.sqrt.f64(double %Val)
+  declare float @llvm.sqrt.f32(float %Val)
+  declare double @llvm.sqrt.f64(double %Val)
 </pre>
 
 <h5>Overview:</h5>
@@ -4376,8 +4376,8 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare float  %llvm.powi.f32(float  %Val, i32 %power)
-  declare double %llvm.powi.f64(double %Val, i32 %power)
+  declare float  @llvm.powi.f32(float  %Val, i32 %power)
+  declare double @llvm.powi.f64(double %Val, i32 %power)
 </pre>
 
 <h5>Overview:</h5>
@@ -4425,9 +4425,9 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare i16 %llvm.bswap.i16(i16 &lt;id&gt;)
-  declare i32 %llvm.bswap.i32(i32 &lt;id&gt;)
-  declare i64 %llvm.bswap.i64(i64 &lt;id&gt;)
+  declare i16 @llvm.bswap.i16(i16 &lt;id&gt;)
+  declare i32 @llvm.bswap.i32(i32 &lt;id&gt;)
+  declare i64 @llvm.bswap.i64(i64 &lt;id&gt;)
 </pre>
 
 <h5>Overview:</h5>
@@ -4460,10 +4460,10 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare i8  %llvm.ctpop.i8 (i8  &lt;src&gt;)
-  declare i16 %llvm.ctpop.i16(i16 &lt;src&gt;)
-  declare i32 %llvm.ctpop.i32(i32 &lt;src&gt;)
-  declare i64 %llvm.ctpop.i64(i64 &lt;src&gt;)
+  declare i8  @llvm.ctpop.i8 (i8  &lt;src&gt;)
+  declare i16 @llvm.ctpop.i16(i16 &lt;src&gt;)
+  declare i32 @llvm.ctpop.i32(i32 &lt;src&gt;)
+  declare i64 @llvm.ctpop.i64(i64 &lt;src&gt;)
 </pre>
 
 <h5>Overview:</h5>
@@ -4496,10 +4496,10 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare i8  %llvm.ctlz.i8 (i8  &lt;src&gt;)
-  declare i16 %llvm.ctlz.i16(i16 &lt;src&gt;)
-  declare i32 %llvm.ctlz.i32(i32 &lt;src&gt;)
-  declare i64 %llvm.ctlz.i64(i64 &lt;src&gt;)
+  declare i8  @llvm.ctlz.i8 (i8  &lt;src&gt;)
+  declare i16 @llvm.ctlz.i16(i16 &lt;src&gt;)
+  declare i32 @llvm.ctlz.i32(i32 &lt;src&gt;)
+  declare i64 @llvm.ctlz.i64(i64 &lt;src&gt;)
 </pre>
 
 <h5>Overview:</h5>
@@ -4536,10 +4536,10 @@
 
 <h5>Syntax:</h5>
 <pre>
-  declare i8  %llvm.cttz.i8 (i8  &lt;src&gt;)
-  declare i16 %llvm.cttz.i16(i16 &lt;src&gt;)
-  declare i32 %llvm.cttz.i32(i32 &lt;src&gt;)
-  declare i64 %llvm.cttz.i64(i64 &lt;src&gt;)
+  declare i8  @llvm.cttz.i8 (i8  &lt;src&gt;)
+  declare i16 @llvm.cttz.i16(i16 &lt;src&gt;)
+  declare i32 @llvm.cttz.i32(i32 &lt;src&gt;)
+  declare i64 @llvm.cttz.i64(i64 &lt;src&gt;)
 </pre>
 
 <h5>Overview:</h5>
@@ -4603,7 +4603,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.org">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2007/03/21 23:58:04 $
+  Last modified: $Date: 2007/03/22 00:02:17 $
 </address>
 </body>
 </html>





From reid at x10sys.com  Wed Mar 21 19:32:19 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 19:32:19 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/DerivedTypes.h
Message-ID: <200703220032.l2M0WJgO009567@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

DerivedTypes.h updated: 1.87 -> 1.88
---
Log message:

For PR1145: http://llvm.org/PR1145 :
Add the NoUnwindAttribute to allow explicit marking of functions that do 
not unwind the stack via the unwind instruction. This is akin to gcc's
NoThrow attribute and used for optimizing exception handling.


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

 DerivedTypes.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)


Index: llvm/include/llvm/DerivedTypes.h
diff -u llvm/include/llvm/DerivedTypes.h:1.87 llvm/include/llvm/DerivedTypes.h:1.88
--- llvm/include/llvm/DerivedTypes.h:1.87	Sun Mar  4 17:33:19 2007
+++ llvm/include/llvm/DerivedTypes.h	Wed Mar 21 19:32:02 2007
@@ -148,7 +148,8 @@
     SExtAttribute     = 1 << 1, ///< sign extended before/after call
     NoReturnAttribute = 1 << 2, ///< mark the function as not returning
     InRegAttribute    = 1 << 3, ///< force argument to be passed in register
-    StructRetAttribute= 1 << 4  ///< hidden pointer to structure to return
+    StructRetAttribute= 1 << 4, ///< hidden pointer to structure to return
+    NoUnwindAttribute = 1 << 5  ///< Function doesn't unwind stack
   };
   typedef std::vector<ParameterAttributes> ParamAttrsList;
 private:





From reid at x10sys.com  Wed Mar 21 19:50:06 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 19:50:06 -0500
Subject: [llvm-commits] CVS:
	llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll
Message-ID: <200703220050.l2M0o6B5010055@zion.cs.uiuc.edu>



Changes in directory llvm/test/Transforms/InstCombine:

2007-03-21-SignedRangeTest.ll added (r1.1)
---
Log message:

Test case for PR1248: http://llvm.org/PR1248 


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

 2007-03-21-SignedRangeTest.ll |    7 +++++++
 1 files changed, 7 insertions(+)


Index: llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll:1.1
*** /dev/null	Wed Mar 21 19:49:50 2007
--- llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll	Wed Mar 21 19:49:40 2007
***************
*** 0 ****
--- 1,7 ----
+ ; For PR1248
+ ; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | grep 'ugt i32 %tmp6, 11'
+ define i1 @test(i32 %tmp6) {
+   %tmp7 = sdiv i32 %tmp6, 12     ; <i32> [#uses=1]
+   icmp ne i32 %tmp7, -6           ; <i1>:1 [#uses=1]
+   ret i1 %1
+ }





From evan.cheng at apple.com  Wed Mar 21 20:26:22 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 21 Mar 2007 20:26:22 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
Message-ID: <200703220126.l2M1QMv3010790@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen:

LiveIntervalAnalysis.cpp updated: 1.226 -> 1.227
---
Log message:

Fix for PR1257: http://llvm.org/PR1257 . Bug in live range shortening as a result of copy coalescing
where the destination is dead.

---
Diffs of the changes:  (+9 -11)

 LiveIntervalAnalysis.cpp |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)


Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.226 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.227
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.226	Tue Mar 20 03:13:50 2007
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Wed Mar 21 20:26:05 2007
@@ -924,14 +924,14 @@
   MachineOperand *mopd = CopyMI->findRegisterDefOperand(DstReg);
   bool isDead = mopd->isDead();
   bool isShorten = false;
-  unsigned SrcStart = 0;
-  unsigned SrcEnd = 0;
+  unsigned SrcStart = 0, RemoveStart = 0;
+  unsigned SrcEnd = 0, RemoveEnd = 0;
   if (isDead) {
     unsigned CopyIdx = getInstructionIndex(CopyMI);
     LiveInterval::iterator SrcLR =
       SrcInt.FindLiveRangeContaining(getUseIndex(CopyIdx));
-    SrcStart = SrcLR->start;
-    SrcEnd   = SrcLR->end;
+    RemoveStart = SrcStart = SrcLR->start;
+    RemoveEnd   = SrcEnd   = SrcLR->end;
     // The instruction which defines the src is only truly dead if there are
     // no intermediate uses and there isn't a use beyond the copy.
     // FIXME: find the last use, mark is kill and shorten the live range.
@@ -939,18 +939,16 @@
       isDead = false;
     else {
       MachineOperand *MOU;
-      MachineInstr *LastUse =
-        lastRegisterUse(repSrcReg, SrcStart, CopyIdx, MOU);
+      MachineInstr *LastUse= lastRegisterUse(repSrcReg, SrcStart, CopyIdx, MOU);
       if (LastUse) {
         // Shorten the liveinterval to the end of last use.
         MOU->setIsKill();
         isDead = false;
         isShorten = true;
-        SrcEnd = getUseIndex(getInstructionIndex(LastUse));
+        RemoveStart = getDefIndex(getInstructionIndex(LastUse));
+        RemoveEnd   = SrcEnd;
       }
     }
-    if (isDead)
-      isShorten = true;
   }
 
   // We need to be careful about coalescing a source physical register with a
@@ -1030,10 +1028,10 @@
       }
     }
 
-    if (isShorten) {
+    if (isShorten || isDead) {
       // Shorten the live interval.
       LiveInterval &LiveInInt = (repSrcReg == DestInt.reg) ? DestInt : SrcInt;
-      LiveInInt.removeRange(SrcStart, SrcEnd);
+      LiveInInt.removeRange(RemoveStart, RemoveEnd);
     }
   } else {
     // Coallescing failed.





From evan.cheng at apple.com  Wed Mar 21 20:53:24 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 21 Mar 2007 20:53:24 -0500
Subject: [llvm-commits] CVS:
	llvm/test/CodeGen/ARM/2007-03-21-JoinIntervalsCrash.ll
Message-ID: <200703220153.l2M1rOAo031586@zion.cs.uiuc.edu>



Changes in directory llvm/test/CodeGen/ARM:

2007-03-21-JoinIntervalsCrash.ll added (r1.1)
---
Log message:

Test case for PR1257: http://llvm.org/PR1257 

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

 2007-03-21-JoinIntervalsCrash.ll |   97 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 97 insertions(+)


Index: llvm/test/CodeGen/ARM/2007-03-21-JoinIntervalsCrash.ll
diff -c /dev/null llvm/test/CodeGen/ARM/2007-03-21-JoinIntervalsCrash.ll:1.1
*** /dev/null	Wed Mar 21 20:53:07 2007
--- llvm/test/CodeGen/ARM/2007-03-21-JoinIntervalsCrash.ll	Wed Mar 21 20:52:57 2007
***************
*** 0 ****
--- 1,97 ----
+ ; RUN: llvm-as < %s | llc -mtriple=arm-linux-gnueabi
+ ; PR1257
+ 
+ 	%struct.CUMULATIVE_ARGS = type { i32, i32, i32, i32, i32, i32 }
+ 	%struct.arm_stack_offsets = type { i32, i32, i32, i32, i32 }
+ 	%struct.c_arg_info = type { %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, i8 }
+ 	%struct.c_language_function = type { %struct.stmt_tree_s }
+ 	%struct.c_switch = type opaque
+ 	%struct.eh_status = type opaque
+ 	%struct.emit_status = type { i32, i32, %struct.rtx_def*, %struct.rtx_def*, %struct.sequence_stack*, i32, %struct.location_t, i32, i8*, %struct.rtx_def** }
+ 	%struct.expr_status = type { i32, i32, i32, %struct.rtx_def*, %struct.rtx_def*, %struct.rtx_def* }
+ 	%struct.function = type { %struct.eh_status*, %struct.expr_status*, %struct.emit_status*, %struct.varasm_status*, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.function*, i32, i32, i32, i32, %struct.rtx_def*, %struct.CUMULATIVE_ARGS, %struct.rtx_def*, %struct.rtx_def*, %struct.initial_value_struct*, %struct.rtx_def*, %struct.rtx_def*, %struct.rtx_def*, %struct.rtx_def*, %struct.rtx_def*, %struct.rtx_def*, i8, i32, i64, %struct.tree_node*, %struct.tree_node*, %struct.rtx_def*, %struct.varray_head_tag*, %struct.temp_slot*, i32, %struct.var_refs_queue*, i32, i32, %struct.rtvec_def*, %struct.tree_node*, i32, i32, i32, %struct.machine_function*, i32, i32, i8, i8, %struct.language_function*, %struct.rtx_def*, i32, i32, i32, i32, %struct.location_t, %struct.varray_head_tag*, %struct.tree_node*, i8, i8, i8 }
+ 	%struct.ht_identifier = type { i8*, i32, i32 }
+ 	%struct.initial_value_struct = type opaque
+ 	%struct.lang_decl = type { i8 }
+ 	%struct.language_function = type { %struct.c_language_function, %struct.tree_node*, %struct.tree_node*, %struct.c_switch*, %struct.c_arg_info*, i32, i32, i32, i32 }
+ 	%struct.location_t = type { i8*, i32 }
+ 	%struct.machine_function = type { %struct.rtx_def*, i32, i32, i32, %struct.arm_stack_offsets, i32, i32, i32, [14 x %struct.rtx_def*] }
+ 	%struct.rtvec_def = type { i32, [1 x %struct.rtx_def*] }
+ 	%struct.rtx_def = type { i16, i8, i8, %struct.u }
+ 	%struct.sequence_stack = type { %struct.rtx_def*, %struct.rtx_def*, %struct.sequence_stack* }
+ 	%struct.stmt_tree_s = type { %struct.tree_node*, i32 }
+ 	%struct.temp_slot = type opaque
+ 	%struct.tree_common = type { %struct.tree_node*, %struct.tree_node*, %union.tree_ann_d*, i8, i8, i8, i8, i8 }
+ 	%struct.tree_decl = type { %struct.tree_common, %struct.location_t, i32, %struct.tree_node*, i8, i8, i8, i8, i8, i8, i8, i8, i32, %struct.tree_decl_u1, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.tree_node*, %struct.rtx_def*, i32, %struct.tree_decl_u2, %struct.tree_node*, %struct.tree_node*, i64, %struct.lang_decl* }
+ 	%struct.tree_decl_u1 = type { i64 }
+ 	%struct.tree_decl_u2 = type { %struct.function* }
+ 	%struct.tree_identifier = type { %struct.tree_common, %struct.ht_identifier }
+ 	%struct.tree_node = type { %struct.tree_decl }
+ 	%struct.u = type { [1 x i64] }
+ 	%struct.var_refs_queue = type { %struct.rtx_def*, i32, i32, %struct.var_refs_queue* }
+ 	%struct.varasm_status = type opaque
+ 	%struct.varray_head_tag = type opaque
+ 	%union.tree_ann_d = type opaque
+ 
+ implementation   ; Functions:
+ 
+ define void @declspecs_add_type(i32 %spec.1) {
+ entry:
+ 	%spec.1961 = zext i32 %spec.1 to i64		; <i64> [#uses=1]
+ 	%spec.1961.adj = shl i64 %spec.1961, 32		; <i64> [#uses=1]
+ 	%spec.1961.adj.ins = or i64 %spec.1961.adj, 0		; <i64> [#uses=2]
+ 	%tmp10959 = lshr i64 %spec.1961.adj.ins, 32		; <i64> [#uses=2]
+ 	%tmp1920 = inttoptr i64 %tmp10959 to %struct.tree_common*		; <%struct.tree_common*> [#uses=1]
+ 	%tmp21 = getelementptr %struct.tree_common* %tmp1920, i32 0, i32 3		; <i8*> [#uses=1]
+ 	%tmp2122 = bitcast i8* %tmp21 to i32*		; <i32*> [#uses=1]
+ 	br i1 false, label %cond_next53, label %cond_true
+ 
+ cond_true:		; preds = %entry
+ 	ret void
+ 
+ cond_next53:		; preds = %entry
+ 	br i1 false, label %cond_true63, label %cond_next689
+ 
+ cond_true63:		; preds = %cond_next53
+ 	ret void
+ 
+ cond_next689:		; preds = %cond_next53
+ 	br i1 false, label %cond_false841, label %bb743
+ 
+ bb743:		; preds = %cond_next689
+ 	ret void
+ 
+ cond_false841:		; preds = %cond_next689
+ 	br i1 false, label %cond_true851, label %cond_true918
+ 
+ cond_true851:		; preds = %cond_false841
+ 	tail call void @lookup_name( )
+ 	br i1 false, label %bb866, label %cond_next856
+ 
+ cond_next856:		; preds = %cond_true851
+ 	ret void
+ 
+ bb866:		; preds = %cond_true851
+ 	%tmp874 = load i32* %tmp2122		; <i32> [#uses=1]
+ 	%tmp876877 = trunc i32 %tmp874 to i8		; <i8> [#uses=1]
+ 	icmp eq i8 %tmp876877, 1		; <i1>:0 [#uses=1]
+ 	br i1 %0, label %cond_next881, label %cond_true878
+ 
+ cond_true878:		; preds = %bb866
+ 	unreachable
+ 
+ cond_next881:		; preds = %bb866
+ 	%tmp884885 = inttoptr i64 %tmp10959 to %struct.tree_identifier*		; <%struct.tree_identifier*> [#uses=1]
+ 	%tmp887 = getelementptr %struct.tree_identifier* %tmp884885, i32 0, i32 1, i32 0		; <i8**> [#uses=1]
+ 	%tmp888 = load i8** %tmp887		; <i8*> [#uses=1]
+ 	tail call void (i32, ...)* @error( i32 undef, i8* %tmp888 )
+ 	ret void
+ 
+ cond_true918:		; preds = %cond_false841
+ 	%tmp920957 = trunc i64 %spec.1961.adj.ins to i32		; <i32> [#uses=0]
+ 	ret void
+ }
+ 
+ declare void @error(i32, ...)
+ 
+ declare void @lookup_name()





From evan.cheng at apple.com  Wed Mar 21 20:54:38 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 21 Mar 2007 20:54:38 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
Message-ID: <200703220154.l2M1scDk032040@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

DAGCombiner.cpp updated: 1.276 -> 1.277
---
Log message:

More opportunities to reduce load size.

---
Diffs of the changes:  (+101 -45)

 DAGCombiner.cpp |  146 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 101 insertions(+), 45 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.276 llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.277
--- llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.276	Wed Mar 21 15:14:05 2007
+++ llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp	Wed Mar 21 20:54:19 2007
@@ -273,6 +273,7 @@
     SDOperand BuildSDIV(SDNode *N);
     SDOperand BuildUDIV(SDNode *N);
     SDNode *MatchRotate(SDOperand LHS, SDOperand RHS);
+    SDOperand ReduceLoadWidth(SDNode *N);
     
     /// GatherAllAliases - Walk up chain skipping non-aliasing memory nodes,
     /// looking for aliasing nodes and adding them to the Aliases vector.
@@ -2012,9 +2013,17 @@
   if (N0.getOpcode() == ISD::SIGN_EXTEND || N0.getOpcode() == ISD::ANY_EXTEND)
     return DAG.getNode(ISD::SIGN_EXTEND, VT, N0.getOperand(0));
   
+  // fold (sext (truncate (load x))) -> (sext (smaller load x))
+  // fold (sext (truncate (srl (load x), c))) -> (sext (smaller load (x+c/n)))
+  if (N0.getOpcode() == ISD::TRUNCATE) {
+    SDOperand NarrowLoad = ReduceLoadWidth(N0.Val);
+    if (NarrowLoad.Val)
+      N0 = NarrowLoad;
+  }
+
+  // See if the value being truncated is already sign extended.  If so, just
+  // eliminate the trunc/sext pair.
   if (N0.getOpcode() == ISD::TRUNCATE) {
-    // See if the value being truncated is already sign extended.  If so, just
-    // eliminate the trunc/sext pair.
     SDOperand Op = N0.getOperand(0);
     unsigned OpBits   = MVT::getSizeInBits(Op.getValueType());
     unsigned MidBits  = MVT::getSizeInBits(N0.getValueType());
@@ -2096,6 +2105,14 @@
   if (N0.getOpcode() == ISD::ZERO_EXTEND || N0.getOpcode() == ISD::ANY_EXTEND)
     return DAG.getNode(ISD::ZERO_EXTEND, VT, N0.getOperand(0));
 
+  // fold (zext (truncate (load x))) -> (zext (smaller load x))
+  // fold (zext (truncate (srl (load x), c))) -> (zext (small load (x+c/n)))
+  if (N0.getOpcode() == ISD::TRUNCATE) {
+    SDOperand NarrowLoad = ReduceLoadWidth(N0.Val);
+    if (NarrowLoad.Val)
+      N0 = NarrowLoad;
+  }
+
   // fold (zext (truncate x)) -> (and x, mask)
   if (N0.getOpcode() == ISD::TRUNCATE &&
       (!AfterLegalize || TLI.isOperationLegal(ISD::AND, VT))) {
@@ -2168,6 +2185,14 @@
       N0.getOpcode() == ISD::SIGN_EXTEND)
     return DAG.getNode(N0.getOpcode(), VT, N0.getOperand(0));
   
+  // fold (aext (truncate (load x))) -> (aext (smaller load x))
+  // fold (aext (truncate (srl (load x), c))) -> (aext (small load (x+c/n)))
+  if (N0.getOpcode() == ISD::TRUNCATE) {
+    SDOperand NarrowLoad = ReduceLoadWidth(N0.Val);
+    if (NarrowLoad.Val)
+      N0 = NarrowLoad;
+  }
+
   // fold (aext (truncate x))
   if (N0.getOpcode() == ISD::TRUNCATE) {
     SDOperand TruncOp = N0.getOperand(0);
@@ -2226,6 +2251,72 @@
   return SDOperand();
 }
 
+/// ReduceLoadWidth - If the result of a wider load is shifted to right of N
+/// bits and then truncated to a narrower type and where N is a multiple
+/// of number of bits of the narrower type, transform it to a narrower load
+/// from address + N / num of bits of new type. If the result is to be
+/// extended, also fold the extension to form a extending load.
+SDOperand DAGCombiner::ReduceLoadWidth(SDNode *N) {
+  unsigned Opc = N->getOpcode();
+  ISD::LoadExtType ExtType = ISD::NON_EXTLOAD;
+  SDOperand N0 = N->getOperand(0);
+  MVT::ValueType VT = N->getValueType(0);
+  MVT::ValueType EVT = N->getValueType(0);
+
+  if (Opc == ISD::SIGN_EXTEND_INREG) {
+    ExtType = ISD::SEXTLOAD;
+    EVT = cast<VTSDNode>(N->getOperand(1))->getVT();
+  }
+
+  unsigned EVTBits = MVT::getSizeInBits(EVT);
+  unsigned ShAmt = 0;
+  if (N0.getOpcode() == ISD::SRL && N0.hasOneUse()) {
+    if (ConstantSDNode *N01 = dyn_cast<ConstantSDNode>(N0.getOperand(1))) {
+      ShAmt = N01->getValue();
+      // Is the shift amount a multiple of size of VT?
+      if ((ShAmt & (EVTBits-1)) == 0) {
+        N0 = N0.getOperand(0);
+        if (MVT::getSizeInBits(N0.getValueType()) <= EVTBits)
+          return SDOperand();
+        ShAmt /= EVTBits;
+      }
+    }
+  }
+
+  if (ISD::isNON_EXTLoad(N0.Val) && N0.hasOneUse() &&
+      // Do not allow folding to i1 here.  i1 is implicitly stored in memory in
+      // zero extended form: by shrinking the load, we lose track of the fact
+      // that it is already zero extended.
+      // FIXME: This should be reevaluated.
+      VT != MVT::i1) {
+    assert(MVT::getSizeInBits(N0.getValueType()) > EVTBits &&
+           "Cannot truncate to larger type!");
+    LoadSDNode *LN0 = cast<LoadSDNode>(N0);
+    MVT::ValueType PtrType = N0.getOperand(1).getValueType();
+    // For big endian targets, we need to add an offset to the pointer to load
+    // the correct bytes.  For little endian systems, we merely need to read
+    // fewer bytes from the same pointer.
+    uint64_t PtrOff =  ShAmt
+      ? ShAmt : (TLI.isLittleEndian() ? 0
+                 : (MVT::getSizeInBits(N0.getValueType()) - EVTBits) / 8);
+    SDOperand NewPtr = DAG.getNode(ISD::ADD, PtrType, LN0->getBasePtr(),
+                                   DAG.getConstant(PtrOff, PtrType));
+    AddToWorkList(NewPtr.Val);
+    SDOperand Load = (ExtType == ISD::NON_EXTLOAD)
+      ? DAG.getLoad(VT, LN0->getChain(), NewPtr,
+                    LN0->getSrcValue(), LN0->getSrcValueOffset())
+      : DAG.getExtLoad(ExtType, VT, LN0->getChain(), NewPtr,
+                       LN0->getSrcValue(), LN0->getSrcValueOffset(), EVT);
+    AddToWorkList(N);
+    CombineTo(N0.Val, Load, Load.getValue(1));
+    if (ShAmt)
+      return DAG.getNode(N->getOpcode(), VT, Load);
+    return SDOperand(N, 0);   // Return N so it doesn't get rechecked!
+  }
+
+  return SDOperand();
+}
+
 
 SDOperand DAGCombiner::visitSIGN_EXTEND_INREG(SDNode *N) {
   SDOperand N0 = N->getOperand(0);
@@ -2252,6 +2343,12 @@
   if (TLI.MaskedValueIsZero(N0, 1ULL << (EVTBits-1)))
     return DAG.getZeroExtendInReg(N0, EVT);
   
+  // fold (sext_in_reg (load x)) -> (smaller sextload x)
+  // fold (sext_in_reg (srl (load x), c)) -> (smaller sextload (x+c/evtbits))
+  SDOperand NarrowLoad = ReduceLoadWidth(N);
+  if (NarrowLoad.Val)
+    return NarrowLoad;
+
   // fold (sext_in_reg (srl X, 24), i8) -> sra X, 24
   // fold (sext_in_reg (srl X, 23), i8) -> sra X, 23 iff possible.
   // We already fold "(sext_in_reg (srl X, 25), i8) -> srl X, 25" above.
@@ -2265,7 +2362,7 @@
           return DAG.getNode(ISD::SRA, VT, N0.getOperand(0), N0.getOperand(1));
       }
   }
-  
+
   // fold (sext_inreg (extload x)) -> (sextload x)
   if (ISD::isEXTLoad(N0.Val) && 
       ISD::isUNINDEXEDLoad(N0.Val) &&
@@ -2298,7 +2395,6 @@
 SDOperand DAGCombiner::visitTRUNCATE(SDNode *N) {
   SDOperand N0 = N->getOperand(0);
   MVT::ValueType VT = N->getValueType(0);
-  unsigned VTBits = MVT::getSizeInBits(VT);
 
   // noop truncate
   if (N0.getValueType() == N->getValueType(0))
@@ -2326,47 +2422,7 @@
 
   // fold (truncate (load x)) -> (smaller load x)
   // fold (truncate (srl (load x), c)) -> (smaller load (x+c/evtbits))
-  unsigned ShAmt = 0;
-  if (N0.getOpcode() == ISD::SRL && N0.hasOneUse()) {
-    if (ConstantSDNode *N01 = dyn_cast<ConstantSDNode>(N0.getOperand(1))) {
-      ShAmt = N01->getValue();
-      // Is the shift amount a multiple of size of VT?
-      if ((ShAmt & (VTBits-1)) == 0) {
-        N0 = N0.getOperand(0);
-        if (MVT::getSizeInBits(N0.getValueType()) <= VTBits)
-          return SDOperand();
-        ShAmt /= VTBits;
-      }
-    }
-  }
-  if (ISD::isNON_EXTLoad(N0.Val) && N0.hasOneUse() &&
-      // Do not allow folding to i1 here.  i1 is implicitly stored in memory in
-      // zero extended form: by shrinking the load, we lose track of the fact
-      // that it is already zero extended.
-      // FIXME: This should be reevaluated.
-      VT != MVT::i1) {
-    assert(MVT::getSizeInBits(N0.getValueType()) > VTBits &&
-           "Cannot truncate to larger type!");
-    LoadSDNode *LN0 = cast<LoadSDNode>(N0);
-    MVT::ValueType PtrType = N0.getOperand(1).getValueType();
-    // For big endian targets, we need to add an offset to the pointer to load
-    // the correct bytes.  For little endian systems, we merely need to read
-    // fewer bytes from the same pointer.
-    uint64_t PtrOff =  ShAmt
-      ? ShAmt : (TLI.isLittleEndian() ? 0
-                 : (MVT::getSizeInBits(N0.getValueType()) - VTBits) / 8);
-    SDOperand NewPtr = DAG.getNode(ISD::ADD, PtrType, LN0->getBasePtr(),
-                                   DAG.getConstant(PtrOff, PtrType));
-    AddToWorkList(NewPtr.Val);
-    SDOperand Load = DAG.getLoad(VT, LN0->getChain(), NewPtr,
-                                 LN0->getSrcValue(), LN0->getSrcValueOffset());
-    AddToWorkList(N);
-    CombineTo(N0.Val, Load, Load.getValue(1));
-    if (ShAmt)
-      return DAG.getNode(ISD::TRUNCATE, VT, Load);
-    return SDOperand(N, 0);   // Return N so it doesn't get rechecked!
-  }
-  return SDOperand();
+  return ReduceLoadWidth(N);
 }
 
 SDOperand DAGCombiner::visitBIT_CONVERT(SDNode *N) {





From evan.cheng at apple.com  Wed Mar 21 20:55:35 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Wed, 21 Mar 2007 20:55:35 -0500
Subject: [llvm-commits] CVS: llvm/test/CodeGen/ARM/trunc_ldr.ll
Message-ID: <200703220155.l2M1tZLM032377@zion.cs.uiuc.edu>



Changes in directory llvm/test/CodeGen/ARM:

trunc_ldr.ll updated: 1.1 -> 1.2
---
Log message:

Another test case.

---
Diffs of the changes:  (+13 -15)

 trunc_ldr.ll |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)


Index: llvm/test/CodeGen/ARM/trunc_ldr.ll
diff -u llvm/test/CodeGen/ARM/trunc_ldr.ll:1.1 llvm/test/CodeGen/ARM/trunc_ldr.ll:1.2
--- llvm/test/CodeGen/ARM/trunc_ldr.ll:1.1	Wed Mar 21 15:14:56 2007
+++ llvm/test/CodeGen/ARM/trunc_ldr.ll	Wed Mar 21 20:55:16 2007
@@ -1,27 +1,25 @@
 ; RUN: llvm-as < %s | llc -march=arm &&
-; RUN: llvm-as < %s | llc -march=arm | grep "ldrb.*7"
+; RUN: llvm-as < %s | llc -march=arm | grep "ldrb.*7" | wc -l | grep 1
+; RUN: llvm-as < %s | llc -march=arm | grep "ldrsb.*7" | wc -l | grep 1
 
 	%struct.A = type { i8, i8, i8, i8, i16, i8, i8, %struct.B** }
 	%struct.B = type { float, float, i32, i32, i32, [0 x i8] }
 
-implementation   ; Functions:
-
-define i32 @f1(%struct.A* %d) {
-entry:
+define i8 @f1(%struct.A* %d) {
 	%tmp2 = getelementptr %struct.A* %d, i32 0, i32 4
 	%tmp23 = bitcast i16* %tmp2 to i32*
 	%tmp4 = load i32* %tmp23
 	%tmp512 = lshr i32 %tmp4, 24
 	%tmp56 = trunc i32 %tmp512 to i8
-	icmp eq i8 %tmp56, 0
-	br i1 %0, label %UnifiedReturnBlock, label %conArue
-
-conArue:
-	%tmp8 = tail call i32 @f( %struct.A* %d )
-	ret i32 %tmp8
-
-UnifiedReturnBlock:
-	ret i32 0
+	ret i8 %tmp56
 }
 
-declare i32 @f(%struct.A*)
+define i32 @f2(%struct.A* %d) {
+	%tmp2 = getelementptr %struct.A* %d, i32 0, i32 4
+	%tmp23 = bitcast i16* %tmp2 to i32*
+	%tmp4 = load i32* %tmp23
+	%tmp512 = lshr i32 %tmp4, 24
+	%tmp56 = trunc i32 %tmp512 to i8
+        %tmp57 = sext i8 %tmp56 to i32
+	ret i32 %tmp57
+}





From reid at x10sys.com  Wed Mar 21 21:02:29 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 21:02:29 -0500
Subject: [llvm-commits] CVS: llvm/docs/LangRef.html
Message-ID: <200703220202.l2M22TZk032718@zion.cs.uiuc.edu>



Changes in directory llvm/docs:

LangRef.html updated: 1.212 -> 1.213
---
Log message:

Preview nounwind function attribute.


---
Diffs of the changes:  (+6 -3)

 LangRef.html |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Index: llvm/docs/LangRef.html
diff -u llvm/docs/LangRef.html:1.212 llvm/docs/LangRef.html:1.213
--- llvm/docs/LangRef.html:1.212	Wed Mar 21 19:02:17 2007
+++ llvm/docs/LangRef.html	Wed Mar 21 21:02:11 2007
@@ -738,8 +738,11 @@
     target-specific</dd>
     <dt><tt>sret</tt></dt>
     <dd>This indicates that the parameter specifies the address of a structure
-    that is the return value of the function in the source program.
-    </dd>
+    that is the return value of the function in the source program.</dd>
+    <dt><tt>nounwind</tt></dt>
+    <dd>This function attribute indicates that the function type does not use
+    the unwind instruction and does not allow stack unwinding to propagate
+    through it.</dd>
   </dl>
 
 </div>
@@ -4603,7 +4606,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.org">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2007/03/22 00:02:17 $
+  Last modified: $Date: 2007/03/22 02:02:11 $
 </address>
 </body>
 </html>





From nicholas at mxc.ca  Wed Mar 21 21:03:11 2007
From: nicholas at mxc.ca (Nick Lewycky)
Date: Wed, 21 Mar 2007 21:03:11 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp
Message-ID: <200703220203.l2M23Bh7000344@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

PredicateSimplifier.cpp updated: 1.60 -> 1.61
---
Log message:

Fix broken optimization disabled by a logic bug.

Analyze GEPs. If the indices are all zero, transfer whether the pointer is
known to be not null through the GEP.

Add a few more cases for xor and shift instructions.


---
Diffs of the changes:  (+51 -10)

 PredicateSimplifier.cpp |   61 ++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 51 insertions(+), 10 deletions(-)


Index: llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp
diff -u llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.60 llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.61
--- llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp:1.60	Sun Mar 18 17:58:46 2007
+++ llvm/lib/Transforms/Scalar/PredicateSimplifier.cpp	Wed Mar 21 21:02:51 2007
@@ -1516,13 +1516,27 @@
             add(SI->getCondition(), ConstantInt::getFalse(),
                 ICmpInst::ICMP_EQ, NewContext);
         }
+      } else if (GetElementPtrInst *GEPI = dyn_cast<GetElementPtrInst>(I)) {
+        for (GetElementPtrInst::op_iterator OI = GEPI->idx_begin(),
+             OE = GEPI->idx_end(); OI != OE; ++OI) {
+          ConstantInt *Op = dyn_cast<ConstantInt>(IG.canonicalize(*OI, Top));
+          if (!Op || !Op->isZero()) return;
+        }
+        // TODO: The GEPI indices are all zero. Copy from definition to operand,
+        // jumping the type plane as needed.
+        if (isRelatedBy(GEPI, Constant::getNullValue(GEPI->getType()),
+                        ICmpInst::ICMP_NE)) {
+          Value *Ptr = GEPI->getPointerOperand();
+          add(Ptr, Constant::getNullValue(Ptr->getType()), ICmpInst::ICMP_NE,
+              NewContext);
+        }
       }
       // TODO: CastInst "%a = cast ... %b" where %a is EQ or NE a constant.
     }
 
     /// opsToDef - A new relationship was discovered involving one of this
     /// instruction's operands. Find any new relationship involving the
-    /// definition.
+    /// definition, or another operand.
     void opsToDef(Instruction *I) {
       Instruction *NewContext = below(I) ? I : TopInst;
 
@@ -1551,6 +1565,9 @@
 
         switch (Opcode) {
           default: break;
+          case Instruction::LShr:
+          case Instruction::AShr:
+          case Instruction::Shl:
           case Instruction::Sub:
             if (Op1 == Zero) {
               add(BO, Op0, ICmpInst::ICMP_EQ, NewContext);
@@ -1562,6 +1579,7 @@
               add(BO, AllOnes, ICmpInst::ICMP_EQ, NewContext);
               return;
             } // fall-through
+          case Instruction::Xor:
           case Instruction::Add:
             if (Op0 == Zero) {
               add(BO, Op1, ICmpInst::ICMP_EQ, NewContext);
@@ -1589,25 +1607,32 @@
         }
 
         // "%x = add i32 %y, %z" and %x EQ %y then %z EQ 0
-        // "%x = mul i32 %y, %z" and %x EQ %y then %z EQ 1
-        // 1. Repeat all of the above, with order of operands reversed.
+        // "%x = add i32 %y, %z" and %x EQ %z then %y EQ 0
+        // "%x = shl i32 %y, %z" and %x EQ %y and %y NE 0 then %z EQ 0
         // "%x = udiv i32 %y, %z" and %x EQ %y then %z EQ 1
 
-        Value *Known = Op0, *Unknown = Op1;
-        if (Known != BO) std::swap(Known, Unknown);
-        if (Known == BO) {
+        Value *Known = Op0, *Unknown = Op1,
+              *TheBO = IG.canonicalize(BO, Top);
+        if (Known != TheBO) std::swap(Known, Unknown);
+        if (Known == TheBO) {
           switch (Opcode) {
             default: break;
+            case Instruction::LShr:
+            case Instruction::AShr:
+            case Instruction::Shl:
+              if (!isRelatedBy(Known, Zero, ICmpInst::ICMP_NE)) break;
+              // otherwise, fall-through.
+            case Instruction::Sub:
+              if (Unknown == Op1) break;
+              // otherwise, fall-through.
             case Instruction::Xor:
             case Instruction::Add:
-            case Instruction::Sub:
               add(Unknown, Zero, ICmpInst::ICMP_EQ, NewContext);
               break;
             case Instruction::UDiv:
             case Instruction::SDiv:
-              if (Unknown == Op0) break; // otherwise, fallthrough
-            case Instruction::Mul:
-              if (isa<ConstantInt>(Unknown)) {
+              if (Unknown == Op1) break;
+              if (isRelatedBy(Known, Zero, ICmpInst::ICMP_NE)) {
                 Constant *One = ConstantInt::get(Ty, 1);
                 add(Unknown, One, ICmpInst::ICMP_EQ, NewContext);
               }
@@ -1633,6 +1658,8 @@
         }
 
       } else if (SelectInst *SI = dyn_cast<SelectInst>(I)) {
+        if (I->getType()->isFPOrFPVector()) return;
+
         // Given: "%a = select i1 %x, i32 %b, i32 %c"
         // %x EQ true  then %a EQ %b
         // %x EQ false then %a EQ %c
@@ -1658,6 +1685,20 @@
         }
 
         // TODO: "%a = cast ... %b" where %b is NE/LT/GT a constant.
+      } else if (GetElementPtrInst *GEPI = dyn_cast<GetElementPtrInst>(I)) {
+        for (GetElementPtrInst::op_iterator OI = GEPI->idx_begin(),
+             OE = GEPI->idx_end(); OI != OE; ++OI) {
+          ConstantInt *Op = dyn_cast<ConstantInt>(IG.canonicalize(*OI, Top));
+          if (!Op || !Op->isZero()) return;
+        }
+        // TODO: The GEPI indices are all zero. Copy from operand to definition,
+        // jumping the type plane as needed.
+        Value *Ptr = GEPI->getPointerOperand();
+        if (isRelatedBy(Ptr, Constant::getNullValue(Ptr->getType()),
+                        ICmpInst::ICMP_NE)) {
+          add(GEPI, Constant::getNullValue(GEPI->getType()), ICmpInst::ICMP_NE,
+              NewContext);
+        }
       }
     }
 





From reid at x10sys.com  Wed Mar 21 21:13:43 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 21:13:43 -0500
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/Lexer.l llvmAsmParser.y
Message-ID: <200703220213.l2M2DhWS001294@zion.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

Lexer.l updated: 1.100 -> 1.101
llvmAsmParser.y updated: 1.331 -> 1.332
---
Log message:

Add support for the noreturn and nounwind function attributes.


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

 Lexer.l         |    2 ++
 llvmAsmParser.y |    3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)


Index: llvm/lib/AsmParser/Lexer.l
diff -u llvm/lib/AsmParser/Lexer.l:1.100 llvm/lib/AsmParser/Lexer.l:1.101
--- llvm/lib/AsmParser/Lexer.l:1.100	Fri Mar  9 13:26:52 2007
+++ llvm/lib/AsmParser/Lexer.l	Wed Mar 21 21:13:23 2007
@@ -235,6 +235,8 @@
 
 inreg           { return INREG; }
 sret            { return SRET;  }
+nounwind        { return NOUNWIND; }
+noreturn        { return NORETURN; }
 
 void            { RET_TY(Type::VoidTy,  VOID);  }
 float           { RET_TY(Type::FloatTy, FLOAT); }


Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.331 llvm/lib/AsmParser/llvmAsmParser.y:1.332
--- llvm/lib/AsmParser/llvmAsmParser.y:1.331	Tue Mar 20 12:18:33 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y	Wed Mar 21 21:13:23 2007
@@ -1078,7 +1078,7 @@
 %token <OtherOpVal> EXTRACTELEMENT INSERTELEMENT SHUFFLEVECTOR
 
 // Function Attributes
-%token NORETURN INREG SRET
+%token NORETURN INREG SRET NOUNWIND
 
 // Visibility Styles
 %token DEFAULT HIDDEN
@@ -1204,6 +1204,7 @@
               ;
 
 FuncAttr      : NORETURN { $$ = FunctionType::NoReturnAttribute; }
+              | NOUNWIND { $$ = FunctionType::NoUnwindAttribute; }
               | ParamAttr
               ;
 





From reid at x10sys.com  Wed Mar 21 21:14:26 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 21:14:26 -0500
Subject: [llvm-commits] CVS: llvm/lib/AsmParser/Lexer.cpp.cvs Lexer.l.cvs
	llvmAsmParser.cpp.cvs llvmAsmParser.h.cvs llvmAsmParser.y.cvs
Message-ID: <200703220214.l2M2EQ0Z001336@zion.cs.uiuc.edu>



Changes in directory llvm/lib/AsmParser:

Lexer.cpp.cvs updated: 1.33 -> 1.34
Lexer.l.cvs updated: 1.27 -> 1.28
llvmAsmParser.cpp.cvs updated: 1.76 -> 1.77
llvmAsmParser.h.cvs updated: 1.59 -> 1.60
llvmAsmParser.y.cvs updated: 1.77 -> 1.78
---
Log message:

Regenerate.


---
Diffs of the changes:  (+1576 -1542)

 Lexer.cpp.cvs         | 1150 ++++++++++++++---------------
 Lexer.l.cvs           |    2 
 llvmAsmParser.cpp.cvs | 1951 +++++++++++++++++++++++++-------------------------
 llvmAsmParser.h.cvs   |   12 
 llvmAsmParser.y.cvs   |    3 
 5 files changed, 1576 insertions(+), 1542 deletions(-)


Index: llvm/lib/AsmParser/Lexer.cpp.cvs
diff -u llvm/lib/AsmParser/Lexer.cpp.cvs:1.33 llvm/lib/AsmParser/Lexer.cpp.cvs:1.34
--- llvm/lib/AsmParser/Lexer.cpp.cvs:1.33	Fri Mar  9 15:19:09 2007
+++ llvm/lib/AsmParser/Lexer.cpp.cvs	Wed Mar 21 21:14:08 2007
@@ -20,7 +20,7 @@
 /* A lexical scanner generated by flex*/
 
 /* Scanner skeleton version:
- * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.33 2007/03/09 21:19:09 reid Exp $
+ * $Header: /var/cvs/llvm/llvm/lib/AsmParser/Lexer.cpp.cvs,v 1.34 2007/03/22 02:14:08 reid Exp $
  */
 
 #define FLEX_SCANNER
@@ -317,37 +317,37 @@
 	*yy_cp = '\0'; \
 	yy_c_buf_p = yy_cp;
 
-#define YY_NUM_RULES 134
-#define YY_END_OF_BUFFER 135
-static yyconst short int yy_acclist[215] =
+#define YY_NUM_RULES 136
+#define YY_END_OF_BUFFER 137
+static yyconst short int yy_acclist[217] =
     {   0,
-      135,  133,  134,  132,  133,  134,  132,  134,  133,  134,
-      133,  134,  133,  134,  133,  134,  133,  134,  133,  134,
-      125,  133,  134,  125,  133,  134,    1,  133,  134,  133,
-      134,  133,  134,  133,  134,  133,  134,  133,  134,  133,
-      134,  133,  134,  133,  134,  133,  134,  133,  134,  133,
-      134,  133,  134,  133,  134,  133,  134,  133,  134,  133,
-      134,  133,  134,  133,  134,  133,  134,  133,  134,  133,
-      134,  133,  134,  133,  134,  123,  121,  119,  128,  126,
-      130,  125,    1,  120,  129,  105,   36,   68,   50,   69,
-       64,   24,  123,  119,  130,   21,  130,  131,  124,  120,
-
-       51,   63,   34,   37,    3,   53,   78,   83,   81,   82,
-       80,   79,   84,   88,  104,   73,   71,   60,   72,   70,
-       52,   86,   77,   75,   76,   74,   87,   85,   65,  122,
-      130,  130,   62,   89,   67,   56,  112,   59,   66,  113,
-       61,   23,  127,   55,   92,   58,   43,   25,    4,   48,
-       54,   57,   44,   12,   91,  130,   31,    2,    5,   45,
-       94,   42,   47,  114,   90,   22,  111,   39,    7,   46,
-       38,   98,   97,    8,   16,  107,  110,   33,   49,  102,
-       96,  106,   26,   27,   95,  108,  103,  101,    6,   28,
-       93,   32,    9,   18,   10,   99,   11,  100,   30,   13,
+      137,  135,  136,  134,  135,  136,  134,  136,  135,  136,
+      135,  136,  135,  136,  135,  136,  135,  136,  135,  136,
+      127,  135,  136,  127,  135,  136,    1,  135,  136,  135,
+      136,  135,  136,  135,  136,  135,  136,  135,  136,  135,
+      136,  135,  136,  135,  136,  135,  136,  135,  136,  135,
+      136,  135,  136,  135,  136,  135,  136,  135,  136,  135,
+      136,  135,  136,  135,  136,  135,  136,  135,  136,  135,
+      136,  135,  136,  135,  136,  125,  123,  121,  130,  128,
+      132,  127,    1,  122,  131,  107,   36,   70,   52,   71,
+       66,   24,  125,  121,  132,   21,  132,  133,  126,  122,
+
+       53,   65,   34,   37,    3,   55,   80,   85,   83,   84,
+       82,   81,   86,   90,  106,   75,   73,   62,   74,   72,
+       54,   88,   79,   77,   78,   76,   89,   87,   67,  124,
+      132,  132,   64,   91,   69,   58,  114,   61,   68,  115,
+       63,   23,  129,   57,   94,   60,   43,   25,    4,   50,
+       56,   59,   46,   12,   93,  132,   31,    2,    5,   47,
+       96,   42,   49,  116,   92,   22,  113,   39,    7,   48,
+       38,  100,   99,    8,   16,  109,  112,   33,   51,  104,
+       98,  108,   26,   27,   97,  110,  105,  103,    6,   28,
+       95,   32,    9,   18,   10,  101,   11,   45,   44,  102,
 
-       15,   14,   29,   35,   17,  109,  115,  117,  118,   40,
-      116,   19,   41,   20
+       30,   13,   15,   14,   29,   35,   17,  111,  117,  119,
+      120,   40,  118,   19,   41,   20
     } ;
 
-static yyconst short int yy_accept[540] =
+static yyconst short int yy_accept[553] =
     {   0,
         1,    1,    1,    2,    4,    7,    9,   11,   13,   15,
        17,   19,   21,   24,   27,   30,   32,   34,   36,   38,
@@ -360,54 +360,56 @@
        89,   89,   90,   90,   90,   90,   90,   90,   90,   90,
        90,   90,   90,   91,   91,   91,   91,   91,   91,   91,
 
-       92,   92,   92,   92,   92,   92,   92,   92,   92,   92,
-       92,   92,   92,   92,   92,   92,   93,   93,   93,   93,
+       91,   92,   92,   92,   92,   92,   92,   92,   92,   92,
+       92,   92,   92,   92,   92,   92,   92,   93,   93,   93,
        93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
-       93,   93,   94,   95,   96,   97,   98,   98,   99,   99,
-      100,  101,  102,  102,  102,  103,  103,  103,  104,  104,
-      104,  104,  105,  105,  105,  105,  105,  105,  105,  105,
-      105,  106,  106,  106,  106,  106,  106,  106,  106,  106,
+       93,   93,   93,   94,   95,   96,   97,   98,   98,   99,
+       99,  100,  101,  102,  102,  102,  103,  103,  103,  104,
+      104,  104,  104,  105,  105,  105,  105,  105,  105,  105,
+      105,  105,  106,  106,  106,  106,  106,  106,  106,  106,
       106,  106,  106,  106,  106,  106,  106,  106,  106,  106,
-      106,  106,  106,  106,  106,  106,  107,  107,  108,  109,
-      110,  111,  112,  113,  113,  114,  115,  115,  116,  116,
+      106,  106,  106,  106,  106,  106,  106,  107,  107,  107,
+      107,  108,  109,  110,  111,  112,  113,  113,  114,  115,
 
-      116,  116,  116,  116,  117,  118,  119,  119,  119,  119,
-      120,  121,  121,  121,  122,  122,  122,  122,  122,  122,
-      122,  122,  123,  124,  125,  125,  126,  127,  127,  128,
-      129,  129,  129,  129,  129,  129,  129,  129,  129,  130,
-      130,  130,  131,  132,  132,  132,  132,  133,  133,  133,
-      133,  134,  134,  134,  135,  135,  135,  135,  135,  135,
-      135,  135,  135,  135,  135,  135,  135,  135,  136,  137,
-      137,  137,  137,  137,  138,  139,  139,  139,  139,  140,
-      140,  140,  140,  140,  140,  140,  140,  140,  141,  142,
-      142,  142,  143,  143,  143,  144,  145,  145,  145,  146,
-
-      146,  146,  146,  147,  148,  148,  148,  149,  149,  149,
-      150,  150,  151,  152,  152,  152,  152,  152,  153,  153,
-      154,  154,  155,  155,  155,  156,  157,  158,  158,  158,
-      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
-      159,  159,  159,  160,  160,  161,  162,  162,  162,  162,
-      162,  162,  162,  162,  163,  163,  163,  163,  163,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      165,  165,  165,  165,  166,  166,  167,  167,  167,  167,
-      167,  167,  167,  167,  168,  168,  168,  169,  169,  169,
-      169,  170,  170,  170,  170,  171,  171,  171,  172,  173,
-
-      174,  174,  174,  175,  176,  176,  176,  176,  176,  177,
-      177,  178,  179,  180,  180,  180,  181,  181,  181,  182,
-      183,  184,  185,  186,  186,  187,  188,  188,  188,  188,
-      188,  188,  189,  189,  189,  190,  191,  191,  191,  191,
-      191,  191,  192,  192,  192,  192,  192,  192,  192,  192,
-      193,  193,  193,  193,  193,  193,  193,  193,  193,  194,
-      194,  194,  194,  194,  195,  195,  195,  195,  195,  196,
-      197,  198,  199,  199,  199,  199,  200,  200,  200,  200,
-      201,  201,  202,  203,  203,  203,  203,  203,  203,  203,
-      203,  203,  203,  203,  203,  204,  204,  204,  204,  204,
-
-      204,  204,  205,  205,  205,  205,  205,  206,  206,  206,
-      206,  206,  206,  207,  207,  207,  207,  207,  207,  207,
-      207,  207,  207,  207,  207,  207,  208,  208,  209,  210,
-      210,  211,  211,  212,  213,  214,  214,  215,  215
+      115,  116,  116,  116,  116,  116,  116,  117,  118,  119,
+      119,  119,  119,  120,  121,  121,  121,  122,  122,  122,
+      122,  122,  122,  122,  122,  123,  124,  125,  125,  126,
+      127,  127,  128,  129,  129,  129,  129,  129,  129,  129,
+      129,  129,  130,  130,  130,  131,  132,  132,  132,  132,
+      133,  133,  133,  133,  134,  134,  134,  135,  135,  135,
+      135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
+      135,  136,  137,  137,  137,  137,  137,  138,  139,  139,
+      139,  139,  140,  140,  140,  140,  140,  140,  140,  140,
+      140,  141,  142,  142,  142,  142,  142,  143,  143,  143,
+
+      144,  145,  145,  145,  146,  146,  146,  146,  147,  148,
+      148,  148,  149,  149,  149,  150,  150,  151,  152,  152,
+      152,  152,  152,  153,  153,  154,  154,  155,  155,  155,
+      156,  157,  158,  158,  158,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  160,  160,
+      161,  162,  162,  162,  162,  162,  162,  162,  162,  163,
+      163,  163,  163,  163,  164,  164,  164,  164,  164,  164,
+      164,  164,  164,  164,  164,  164,  164,  165,  165,  165,
+      165,  166,  166,  167,  167,  167,  167,  167,  167,  167,
+      167,  168,  168,  168,  169,  169,  169,  169,  170,  170,
+
+      170,  170,  171,  171,  171,  172,  173,  174,  174,  174,
+      175,  176,  176,  176,  176,  176,  177,  177,  178,  179,
+      179,  179,  180,  180,  180,  181,  181,  181,  182,  183,
+      184,  185,  186,  186,  187,  188,  188,  188,  188,  188,
+      188,  189,  189,  189,  190,  191,  191,  191,  191,  191,
+      191,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      194,  194,  194,  194,  194,  195,  195,  195,  195,  195,
+      196,  197,  198,  199,  200,  201,  201,  201,  201,  202,
+      202,  202,  202,  203,  203,  204,  205,  205,  205,  205,
+
+      205,  205,  205,  205,  205,  205,  205,  205,  206,  206,
+      206,  206,  206,  206,  206,  207,  207,  207,  207,  207,
+      208,  208,  208,  208,  208,  208,  209,  209,  209,  209,
+      209,  209,  209,  209,  209,  209,  209,  209,  209,  210,
+      210,  211,  212,  212,  213,  213,  214,  215,  216,  216,
+      217,  217
     } ;
 
 static yyconst int yy_ec[256] =
@@ -451,135 +453,137 @@
         4,    4,    4,    4
     } ;
 
-static yyconst short int yy_base[547] =
+static yyconst short int yy_base[560] =
     {   0,
-        0,    0, 1173, 1174, 1174, 1174, 1168, 1157,   35,   39,
+        0,    0, 1199, 1200, 1200, 1200, 1194, 1183,   35,   39,
        43,   49,   55,   61,    0,   72,   64,   67,   66,   86,
-       76,  106,   91,   65,  133,  121,  117,   78,  152,   95,
-       90,  179,  137,  211,  139,   99,  148,  110, 1166, 1174,
-     1155, 1174,    0,   49,  185,  217,   98,  238,  254,  259,
-        0, 1164,    0,  200,  116,  149,  146,  118,  160,   63,
-      154, 1153,  153,  186,  208,  161,  264,  171,  205,  200,
-     1152,  219,  260,  222,  176,  228,  261,  124,  273,  274,
-      231,  269,  278,  279,  280,  281,  282,  290,  232,  202,
-      289,  291, 1151,  292,  294,  301,  309,  310,  312,  305,
-
-      313,  316,  317,  321,  322,  323,  324,  328,  326,  330,
-      332,  337,  345,  329,  346, 1150,  347,  355,  357,  358,
-      359,  362,  363,  380,  364,  241,  377,  370,  113,  366,
-      378, 1149,    0,  399, 1148,  414,  432,    0, 1157, 1174,
-        0, 1146,  382,  365, 1145,  405,  401, 1144,  367,  408,
-      404, 1143,  427,  417,  433,  419,  434,  421,  441,  385,
-     1142,  442,  422,  438,  443,  444,  447,  446,  449,  450,
-      456,  454,  469,  457,  459,  472,  473,  476,  465,  479,
-      480,  481,  485,  487,  488, 1141,  492, 1140, 1139, 1138,
-     1137, 1136, 1135,  491, 1134, 1133,  493, 1132,  522,  496,
-
-      499,  494,  510, 1131, 1130, 1129,  498,  501,  497, 1128,
-     1127,  524,  505, 1126,  514,  535,  537,  536,  540,  542,
-      539, 1125, 1124, 1123,  543, 1122, 1121,  544, 1120, 1119,
-      545,  546,  547,  553,  506,  557,  561,  566, 1118,  567,
-      568, 1174,  581,  576,  585,  597,  602,  587,  603,  588,
-     1117,  589,  604, 1116,  608,  590,  609,  612,  613,  615,
-      617,  619,  621,  620,  622,  623,  624, 1115, 1114,  626,
-      627,  630,  634, 1113, 1112,  638,  635,  639, 1111,  646,
-      640,  643,  644,  648,  647,  657,  658, 1110, 1109,  660,
-      664, 1108,  661,  663,    0, 1107,  669,  668, 1106,  670,
-
-      674,  678, 1105, 1104,  675,  687, 1103,  688,  690, 1102,
-      691, 1101, 1100,  692,  693,  694,  696, 1099,  697, 1098,
-      701, 1097,  705,  707, 1096,  712, 1095,  712,  713, 1094,
-      715,  723,  720,  724,  717,  727,  729,  732,  733,  734,
-      740,  735, 1093,  741, 1092, 1091,  742,  745,  746,  747,
-      750,  751,  748, 1090,  754,  755,  760,  761, 1089,  763,
-      762,  767,  772,  774,  768,  775,  776,  779,  783, 1088,
-      784,  785,  786, 1087,  791, 1086,  793,  789,  794,  800,
-      802,  795,  804, 1085,  807,  805, 1084,  810,  812,  813,
-     1083,  815,  816,  817, 1082,  820,  818, 1081, 1080, 1079,
-
-      824,  827, 1078, 1077,  830,  833,  831,  834, 1076,  839,
-     1075, 1074, 1073,  845,  846, 1072,  849,  850, 1071, 1070,
-     1069, 1068, 1067,  852, 1066, 1065,  851,  848,  853,  854,
-      855, 1064,  856,  857, 1063, 1062,  860,  866,  869,  870,
-      874, 1061,  875,  872,  877,  878,  879,  881,  883, 1060,
-      887,  889,  892,  895,  897,  900,  902,  903, 1059,  904,
-      906,  909,  910, 1058,  911,  914,  912,  918, 1057, 1056,
-     1055, 1054,  924,  917,  916, 1053,  931,  935,  937, 1042,
-      919, 1032, 1031,  938,  940,  922,  942,  945,  947,  949,
-      952,  953,  954,  957, 1030,  956,  958,  960,  961,  964,
-
-      965, 1028,  966,  967,  972,  977, 1027,  969,  978,  981,
-      982,  984, 1025,  990,  986,  987,  991,  992,  996,  997,
-      998,  999, 1004,  672, 1005, 1024, 1008, 1022, 1019, 1010,
-     1017, 1013, 1016,  671,  502, 1011,  458, 1174, 1047, 1049,
-      254, 1054, 1057,  220, 1061,  167
+       76,  106,   91,   65,  133,  121,  117,   99,  152,   95,
+       78,  179,  137,  211,  139,   90,  148,   93, 1192, 1200,
+     1181, 1200,    0,   49,  185,  217,  116,  238,  254,  259,
+        0, 1190,    0,  200,  125,  149,  146,  153,  177,   63,
+      154, 1179,  160,  161,  208,  185,  264,  171,  113,  210,
+     1178,  222,  260,  228,  186,  261,  271,  110,  273,  274,
+      230,  223,  277,  278,  279,  282,  286,  285,  205,  290,
+      287,  292, 1177,  288,  299,  300,  307,  309,  312,  314,
+
+      316,  318,  323,  311,  324,  326,  328,  327,  330,  329,
+      339,  347,  341,  343,  334,  354, 1176,  358,  342,  359,
+      361,  364,  365,  367,  371,  369,  370,  378,  395,  386,
+      385,  387, 1175,    0,  406, 1174,  421,  439,    0, 1183,
+     1200,    0, 1172,  232,  408, 1171,  396,  400, 1170,  397,
+      426,  412, 1169,  414,  424,  440,  413,  430,  441,  442,
+      443, 1168,  445,  448,  449,  454,  451,  453,  458,  460,
+      466,  462,  461,  469,  464,  465,  470,  475,  487,  488,
+      489,  490,  491,  492,  493,  494, 1167,  496,  495,  501,
+     1166, 1165, 1164, 1163, 1162, 1161,  502, 1160, 1159,  498,
+
+     1158,  528,  503,  504,  508,  516, 1157, 1156, 1155,  510,
+      520,  533, 1154, 1153,  541,  542, 1152,  543,  544,  545,
+      546,  551,  549,  547, 1151, 1150, 1149,  553, 1148, 1147,
+      568, 1146, 1145,  570,  548,  554,  550,  574,  575,  576,
+      577, 1144,  579,  563, 1200,  596,  611,  615,  619,  624,
+      584,  588,  585, 1143,  625,  626, 1142,  589,  627,  628,
+      629,  630,  631,  633,  636,  634,  637,  640,  639,  647,
+     1141, 1140,  638,  641,  652,  642, 1139, 1138,  654,  657,
+      656, 1137,  658,  660,  664,  669,  671,  586,  673,  674,
+     1136, 1135,  676,  678,  679,  680, 1134,  681,  682,    0,
+
+     1133,  683,  684, 1132,  685,  688,  699, 1131, 1130,  702,
+      700, 1129,  704,  705, 1128,  709, 1127, 1126,  711,  713,
+      719,  715, 1125,  716, 1124,  718, 1123,  720,  723, 1122,
+      730, 1121,  730,  590, 1120,  732,  739,  734,  735,  744,
+      746,  745,  748,  749,  750,  753,  751, 1119,  754, 1118,
+     1117,  758,  761,  763,  757,  764,  765,  770, 1116,  773,
+      774,  776,  778, 1115,  777,  782,  779,  784,  785,  791,
+      786,  793,  794,  798,  802,  803, 1114,  804,  805,  806,
+     1113,  807, 1112,  811,  815,  808,  821,  822,  810,  825,
+     1111,  826,  830, 1110,  831,  832,  836, 1109,  833,  838,
+
+      839, 1108,  842,  841, 1107, 1106, 1105,  837,  850, 1104,
+     1103,  852,  853,  860,  844, 1102,  851, 1101, 1100,  855,
+      864, 1099,  869,  870, 1098,  871,  872, 1097, 1096, 1095,
+     1094, 1093,  873, 1092, 1091,  874,  875,  876,  878,  879,
+     1090,  880,  884, 1089, 1088,  889,  891,  893,  894,  895,
+     1087,  896,  899,  900,  902,  901,  909,  907,  912,  908,
+     1076,  914,  924,  922,  926,  915,  927,  929,  930, 1066,
+      931,  933,  937,  938, 1065,  943,  944,  941,  945, 1064,
+     1063, 1062, 1059, 1058, 1057,  950,  946,  951, 1056,  963,
+      964,  952, 1054,  949, 1053, 1052,  968,  967,  969,  972,
+
+      975,  976,  979,  980,  981,  982,  983, 1047,  985,  988,
+      986,  990,  991,  994, 1046,  997,  995,  999, 1004,  947,
+     1002, 1008, 1009, 1010, 1016,  687, 1013, 1017, 1019, 1021,
+     1022, 1024, 1026, 1027, 1030, 1034, 1031, 1036,  555, 1037,
+      515,  512, 1040,  463, 1041,  399,  366,  247, 1045,  243,
+     1200, 1081, 1083,  212, 1088, 1091,  167, 1095,  108
     } ;
 
-static yyconst short int yy_def[547] =
+static yyconst short int yy_def[560] =
     {   0,
-      538,    1,  538,  538,  538,  538,  539,  540,  541,  538,
-      540,  540,  540,  540,  542,  543,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  539,  538,
-      540,  538,  544,  538,  538,  540,  540,  540,  540,  540,
-      542,  545,  546,  538,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,   25,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  538,  544,  538,  540,  540,  540,   50,  545,  538,
-      546,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,   50,  540,
-
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  538,  538,  538,  538,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  199,  540,  540,  540,  540,  540,
-
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  538,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,  540,  540,  540,
-      540,  540,  540,  540,  540,  540,  540,    0,  538,  538,
-      538,  538,  538,  538,  538,  538
+      551,    1,  551,  551,  551,  551,  552,  553,  554,  551,
+      553,  553,  553,  553,  555,  556,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  552,  551,
+      553,  551,  557,  551,  551,  553,  553,  553,  553,  553,
+      555,  558,  559,  551,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,   25,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  551,  557,  551,  553,  553,  553,   50,  558,
+      551,  559,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+
+      553,   50,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  551,  551,  551,  551,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  202,
+
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      551,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+      553,  553,  553,  553,  553,  553,  553,  553,  553,  553,
+        0,  551,  551,  551,  551,  551,  551,  551,  551
     } ;
 
-static yyconst short int yy_nxt[1219] =
+static yyconst short int yy_nxt[1245] =
     {   0,
         4,    5,    6,    7,    8,    9,   10,   11,   12,   13,
        14,   14,   14,    4,   15,   16,    8,    8,    8,   17,
@@ -589,135 +593,138 @@
        45,   45,   46,   46,   46,   46,   42,   47,   44,   44,
        44,   44,   42,   48,   49,   49,   49,   49,   42,   48,
        49,   49,   49,   49,   42,   52,   42,   42,   42,   42,
-       42,   54,   54,   54,   54,   63,   55,   64,  149,   42,
+       42,   54,   54,   54,   54,   63,   55,   64,  150,   42,
        60,   42,   81,   56,   61,   57,   50,   58,   65,   42,
 
-       59,   93,   62,   42,   42,   66,  135,   70,   42,   67,
-       71,   42,   42,  103,   79,   68,   94,   72,   69,   42,
-       80,  101,  128,   42,  238,   73,   42,   74,   75,   42,
-       42,   42,  102,  131,   42,   76,   90,   42,  142,   77,
-       86,   78,   82,   82,   82,   82,   42,  170,   87,   91,
-       42,  146,   42,   88,   83,   92,  115,   89,  126,   42,
-      129,   42,   42,   84,   85,   42,   42,   42,  145,  116,
-      141,  127,  117,   42,   42,   95,  143,   96,  144,  118,
-      130,   97,  151,   98,   42,   99,  147,  100,  104,   42,
-      148,  150,   42,  134,   45,   45,   45,   45,  155,   42,
-
-      159,  105,  106,  166,  107,  108,  109,  152,  110,   54,
-       54,   54,   54,   42,  111,   42,  112,  113,   42,  114,
-      104,   42,  161,  133,   42,   48,   46,   46,   46,   46,
-       42,  184,   42,  119,  120,   42,  121,  153,  122,  154,
-      123,   42,  124,  160,   42,   42,  125,  136,  136,  136,
-      136,   42,  165,  173,   42,  137,  162,   43,  183,  234,
-      167,  137,   48,   49,   49,   49,   49,   42,  138,  138,
-      138,  138,   42,   42,   42,  138,  138,   42,  138,  138,
-      138,  138,  138,  138,  168,  156,   42,   42,  157,  163,
-       41,   42,   42,   42,   42,   42,  164,  158,  169,   41,
-
-       41,  180,   42,   42,   42,   42,  172,   42,  174,  182,
-      171,  185,  175,  181,   42,  176,  177,  178,   42,  179,
-      186,  187,   42,   42,  189,   42,   42,  195,  188,   42,
-       42,  194,  191,  193,   42,   42,   42,   42,  190,   42,
-      196,   42,   42,   42,  201,   42,  192,  204,  208,  200,
-       42,  197,  202,  210,  198,  212,  215,  206,   42,   42,
-       42,  205,  199,  209,  203,  214,  207,  211,   42,  213,
-       42,   42,   42,  216,  218,   42,   42,   42,   42,   42,
-       42,  217,  223,   42,  221,  219,  226,  233,  220,  237,
-       42,   42,  222,   42,  252,   42,  224,  249,   42,  225,
-
-      227,  239,  228,  229,  235,  263,  236,  248,  243,  243,
-      243,  243,  230,  240,   42,  231,  244,   42,   42,  241,
-      232,   42,  244,  136,  136,  136,  136,   42,  250,  253,
-       42,  137,   42,  254,   42,   42,  251,  137,  245,  246,
-       42,  247,  247,  247,  247,   42,   42,   42,  258,  255,
-      260,   42,  257,  256,   42,   42,   42,   42,  266,   42,
-       42,  259,   42,   42,  261,  264,  270,   42,  262,   42,
-       42,   42,   42,  274,  277,  267,  268,  265,   42,  276,
-      275,  272,   42,  269,  273,   42,   42,  271,  280,   42,
-      279,  278,   42,   42,   42,  281,  282,  285,   42,  283,
-
-       42,   42,  286,  288,   42,   42,   42,   42,  287,   42,
-       42,   42,   42,  284,   42,   42,  290,  298,   42,   42,
-      289,  292,  300,   42,  301,  293,  291,   42,  320,  302,
-      294,  295,  295,  295,  295,  296,  297,   42,  295,  295,
-      305,  295,  295,  295,  295,  295,  295,  299,   42,   42,
-       42,  306,   42,   42,  303,   42,   42,   42,   42,   42,
-       42,  304,  308,  310,  307,  312,   42,  315,  316,  309,
-       42,  311,  319,  317,   42,  314,  321,  318,  313,   42,
-       42,   42,  245,  245,  323,  326,  326,  326,  326,  322,
-      243,  243,  243,  243,  326,  326,  326,  326,  244,  324,
-
-       42,   42,   42,   42,  244,  325,  247,  247,  247,  247,
-       42,  247,  247,  247,  247,   42,   42,   42,  327,  329,
-      330,   42,   42,  331,  328,   42,   42,  333,   42,  332,
-       42,  335,   42,   42,   42,   42,   42,   42,  334,   42,
-       42,  342,  337,   42,  336,  344,  343,   42,   42,  339,
-      340,   42,   42,   42,  351,  341,   42,   42,  338,   42,
-       42,   42,  352,  345,  346,  354,  347,  350,  348,  353,
-       42,   42,  349,   42,   42,  358,   42,   42,  355,  356,
-      357,   42,   42,   42,   42,   42,  359,   42,   42,  366,
-      360,   42,  361,  362,  367,  364,  365,  368,  370,  363,
-
-       42,   42,  369,   42,   42,   42,   42,   42,  371,   42,
-       42,  372,  374,  377,   42,  532,  375,  376,   42,  373,
-       42,  326,  326,  326,  326,   42,   42,  378,   42,  381,
-       42,  384,  379,   42,  383,  385,   42,   42,  380,  388,
-       42,  382,   42,  389,  387,   42,   42,   42,   42,  392,
-      391,  386,  390,   42,   42,   42,  397,  395,   42,   42,
-       42,   42,  398,   42,   42,  393,  394,   42,   42,  399,
-      402,  396,  400,   42,   42,   42,   42,  401,  405,  403,
-       42,   42,  404,  411,  409,   42,  407,   42,   42,   42,
-      412,  406,   42,  408,  410,  413,   42,   42,   42,   42,
-
-      415,  414,   42,  418,   42,  417,   42,   42,   42,  422,
-      420,  425,  416,   42,  424,   42,  419,   42,   42,  426,
-       42,  428,  421,   42,  423,   42,   42,  427,   42,   42,
-       42,   42,  429,   42,  431,  430,  435,   42,  439,  440,
-       42,  433,  432,   42,   42,  442,   42,   42,  437,  438,
-      446,  436,   42,  444,  434,  441,  445,  443,   42,   42,
-      448,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-       42,  447,  451,   42,  452,  456,  449,  450,  453,   42,
-      454,  457,   42,   42,  455,   42,  458,   42,   42,  460,
-       42,   42,   42,  459,   42,  461,   42,  465,  466,  464,
-
-       42,  462,   42,  467,  471,   42,  468,  469,   42,  463,
-       42,  475,  474,   42,  470,   42,   42,   42,  476,   42,
-      472,  478,   42,   42,   42,   42,  473,   42,  480,   42,
-       42,   42,   42,  484,  477,   42,  491,   42,  490,  479,
-      485,  488,  481,  482,   42,  486,  483,  489,   42,  487,
-       42,   42,  492,   42,  493,   42,  495,  496,   42,  498,
-       42,  499,   42,  497,  494,   42,   42,   42,  501,   42,
-       42,   42,  504,   42,   42,  500,  506,   42,   42,   42,
-       42,  503,   42,  505,  507,   42,  502,  511,  508,  513,
-       42,   42,  517,  509,   42,   42,  514,   42,  510,   42,
-
-       42,  515,  512,   42,   42,   42,  516,  523,  519,   42,
-       42,   42,   42,  520,  524,  518,  521,   42,   42,  522,
-      530,   42,  525,   42,   42,  531,   42,  526,  527,   42,
-       42,  535,   42,  529,  528,   42,  536,   42,   42,  534,
-       42,   42,  533,   42,   42,   42,  537,   39,   39,   39,
-       39,   39,   41,   41,   51,   42,   51,   51,   51,   53,
-       53,  139,  139,  139,  139,  139,   42,   42,   42,   42,
+       59,  104,   62,   42,   42,   66,   42,   70,   42,   67,
+       71,  142,   42,  129,   79,   68,  132,   72,   69,   42,
+       80,  102,   93,   42,  136,   73,   42,   74,   75,   42,
+       42,   94,  103,  171,   42,   76,   90,   95,   42,   77,
+       86,   78,   82,   82,   82,   82,   42,  143,   87,   91,
+       42,  161,   42,   88,   83,   92,  116,   89,  127,   42,
+      130,   42,   42,   84,   85,   42,   42,   42,  146,  117,
+      134,  128,  118,   42,   42,   96,  144,   97,  145,  119,
+      131,   98,  153,   99,   42,  100,  147,  101,  105,  152,
+       42,  151,   42,  135,   45,   45,   45,   45,   42,   42,
+
+      160,  106,  107,  148,  108,  109,  110,  149,  111,   54,
+       54,   54,   54,  167,  112,   43,  113,  114,   42,  115,
+      105,   42,  156,   42,   42,   48,   46,   46,   46,   46,
+       42,  184,  162,  120,  121,   42,  122,  154,  123,  155,
+      124,   42,  125,   42,   41,   42,  126,  137,  137,  137,
+      137,   42,  174,   41,   41,  138,   42,  251,  166,  163,
+       42,  138,   48,   49,   49,   49,   49,   42,  139,  139,
+      139,  139,   42,   42,   42,  139,  139,   42,  139,  139,
+      139,  139,  139,  139,   42,  157,   42,   42,  158,  164,
+       42,   42,   42,  168,  169,   42,  165,  159,   42,   42,
+
+       42,   42,  181,   42,  183,   42,  173,  175,  170,  186,
+      172,  176,   42,   42,  177,  178,  179,  182,  180,  185,
+       42,  187,   42,  188,   42,   42,  189,   42,  190,   42,
+      192,   42,  194,  197,  191,  196,   42,   42,  198,   42,
+       42,   42,   42,   42,  193,  199,  195,   42,  201,  204,
+      207,  211,   42,  203,   42,   42,   42,  205,  200,  209,
+       42,  218,  213,  217,  208,  202,  212,   42,  210,  206,
+      215,   42,   42,  216,   42,  223,  214,   42,   42,   42,
+       42,  219,   42,   42,   42,  221,  224,  226,  237,  220,
+      229,   42,  236,  231,  232,  225,  222,  241,   42,   42,
+
+       42,  227,  228,  233,  230,  238,  234,  239,   42,   42,
+       42,  235,   42,   42,  240,  246,  246,  246,  246,  253,
+      242,   42,  243,  247,  255,   42,   42,   42,  244,  247,
+      137,  137,  137,  137,   42,  254,  258,   42,  138,   42,
+      252,  257,  261,   42,  138,  248,  249,  256,  250,  250,
+      250,  250,   42,   42,   42,   42,   42,  262,   42,  260,
+      259,   42,   42,  266,   42,  264,   42,   42,  267,  265,
+      263,   42,  273,   42,   42,   42,   42,   42,   42,   42,
+      268,  280,   42,   42,  269,  279,  270,  271,   42,  277,
+      272,  281,  275,  284,  283,  276,  278,  282,  285,  274,
+
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+      286,   42,  289,  291,   42,   42,   42,   42,  290,  295,
+      288,   42,  293,   42,  287,   42,  296,  292,   42,   42,
+      297,  303,  294,   42,  305,  299,  298,  300,  300,  300,
+      300,  302,  301,  306,  300,  300,   42,  300,  300,  300,
+      300,  300,  300,  304,   42,   42,   42,   42,   42,   42,
+       42,   42,   42,   42,   42,  307,   42,   42,   42,  324,
+      313,  308,  317,  312,  315,  322,   42,  310,  309,  314,
+      311,   42,  316,   42,  323,  319,  318,   42,   42,   42,
+       42,  320,   42,  321,  326,  328,  325,   42,   42,   42,
+
+      330,   42,   42,   42,  327,  246,  246,  246,  246,  333,
+      337,  329,  392,  247,  363,  332,  334,  248,  248,  247,
+      331,  331,  331,  331,  331,  331,  331,  331,  250,  250,
+      250,  250,   42,  250,  250,  250,  250,   42,   42,   42,
+       42,   42,   42,   42,   42,  336,   42,   42,  340,   42,
+       42,   42,   42,   42,   42,   42,  335,  339,  342,  347,
+       42,  341,  348,  345,  338,   42,  344,   42,  349,   42,
+       42,   42,  346,   42,  343,  350,  356,   42,  351,  357,
+      354,  358,   42,  355,   42,  359,   42,   42,  352,   42,
+      353,   42,   42,   42,   42,   42,   42,   42,   42,  360,
+
+       42,   42,  364,  362,  361,  373,  365,  367,  366,  374,
+      372,  375,   42,   42,  371,   42,  368,   42,   42,  370,
+      369,  378,   42,  376,   42,  377,   42,  379,   42,   42,
+      381,   42,   42,   42,  380,  382,   42,  383,  384,  331,
+      331,  331,  331,   42,  388,   42,  385,   42,   42,  391,
+      390,  386,   42,  395,  396,  387,  389,   42,   42,   42,
+      394,   42,   42,   42,   42,  399,   42,   42,  393,  398,
+       42,   42,  404,  402,   42,  405,   42,   42,   42,  397,
+      409,  400,  401,   42,  403,  406,   42,   42,  407,   42,
+       42,   42,   42,  410,  408,   42,  411,   42,   42,   42,
+
+      412,  416,  419,  418,   42,  414,   42,   42,  417,  415,
+      413,   42,  421,  423,  422,   42,   42,   42,   42,   42,
+       42,   42,  420,   42,   42,  424,  427,  426,   42,  431,
+      429,  425,  433,  435,   42,   42,  428,  434,   42,   42,
+      432,  437,  430,   42,   42,   42,   42,  438,  436,   42,
+       42,   42,   42,  440,   42,   42,  439,   42,  451,  444,
+      448,  449,  442,   42,   42,   42,   42,  441,   42,  445,
+      446,  447,  457,   42,  443,  453,  454,   42,  450,  455,
+      452,  456,   42,   42,   42,   42,   42,   42,   42,   42,
+      458,   42,   42,   42,  462,  459,  463,   42,  467,  464,
+
+      460,  461,   42,  465,   42,  468,   42,   42,   42,   42,
+      469,  466,   42,   42,   42,   42,  471,  470,  476,  477,
+       42,   42,   42,  475,  472,   42,  473,   42,   42,  479,
+      478,  480,  482,  474,  484,   42,  481,   42,  483,   42,
+       42,  488,   42,   42,   42,  485,   42,  487,  491,  489,
+       42,   42,  490,  486,   42,  493,   42,   42,   42,   42,
+       42,  497,   42,   42,   42,   42,  492,  503,  501,  494,
+      495,  504,  498,  502,  496,  499,   42,   42,  500,  507,
+       42,   42,   42,  506,  505,   42,  508,  509,   42,   42,
+      510,  512,   42,   42,   42,   42,   42,  514,   42,   42,
+
+      517,   42,  519,   42,   42,  513,  511,   42,   42,  516,
+       42,  518,   42,  520,  524,   42,  515,   42,  521,  522,
+      526,   42,   42,   42,  527,  530,   42,  523,  528,   42,
+       42,  525,   42,  529,   42,   42,  532,   42,  536,   42,
+       42,  533,  535,   42,   42,  531,  537,   42,  534,   42,
+       42,  543,  538,   42,   42,  544,  540,  539,   42,   42,
+       42,  548,  542,  541,  549,   42,   42,   42,  547,   42,
+       42,   42,   42,  546,  545,   42,   42,   42,   42,   42,
+      550,   39,   39,   39,   39,   39,   41,   41,   51,   42,
+       51,   51,   51,   53,   53,  140,  140,  140,  140,  140,
+
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
        42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
-      140,   42,  242,   42,   42,   42,   42,  140,   42,  132,
-       42,   40,  538,    3,  538,  538,  538,  538,  538,  538,
-      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
-      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
+       42,   42,   42,   42,   42,   42,  141,   42,  245,   42,
+       42,   42,   42,  141,   42,  133,   42,   40,  551,    3,
 
-      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
-      538,  538,  538,  538,  538,  538,  538,  538
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551
     } ;
 
-static yyconst short int yy_chk[1219] =
+static yyconst short int yy_chk[1245] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -728,131 +735,134 @@
        44,   44,   12,   13,   13,   13,   13,   13,   13,   14,
        14,   14,   14,   14,   14,   16,   60,   17,   24,   19,
        18,   16,   16,   16,   16,   19,   17,   19,   60,   21,
-       18,   28,   24,   17,   18,   17,   13,   17,   19,   20,
+       18,   31,   24,   17,   18,   17,   13,   17,   19,   20,
 
-       17,   28,   18,   31,   23,   20,   47,   21,   30,   20,
-       21,   47,   36,   31,   23,   20,   28,   21,   20,   22,
-       23,   30,   36,   38,  129,   22,  129,   22,   22,   55,
-       27,   58,   30,   38,   26,   22,   27,   78,   55,   22,
-       26,   22,   25,   25,   25,   25,   25,   78,   26,   27,
-       33,   58,   35,   26,   25,   27,   33,   26,   35,   57,
-       37,   37,   56,   25,   25,   29,   63,   61,   57,   33,
-      546,   35,   33,   59,   66,   29,   56,   29,   56,   33,
-       37,   29,   63,   29,   68,   29,   59,   29,   32,   75,
-       59,   61,   32,   45,   45,   45,   45,   45,   66,   64,
-
-       68,   32,   32,   75,   32,   32,   32,   64,   32,   54,
-       54,   54,   54,   70,   32,   90,   32,   32,   69,   32,
-       34,   65,   70,  544,   34,   46,   46,   46,   46,   46,
-       46,   90,   72,   34,   34,   74,   34,   65,   34,   65,
-       34,   76,   34,   69,   81,   89,   34,   48,   48,   48,
-       48,   48,   74,   81,  126,   48,   72,  541,   89,  126,
-       76,   48,   49,   49,   49,   49,   49,   49,   50,   50,
-       50,   50,   50,   73,   77,   50,   50,   67,   50,   50,
+       17,   31,   18,   36,   23,   20,   38,   21,   30,   20,
+       21,  559,   28,   36,   23,   20,   38,   21,   20,   22,
+       23,   30,   28,   78,   47,   22,   69,   22,   22,   47,
+       27,   28,   30,   78,   26,   22,   27,   28,   55,   22,
+       26,   22,   25,   25,   25,   25,   25,   55,   26,   27,
+       33,   69,   35,   26,   25,   27,   33,   26,   35,   57,
+       37,   37,   56,   25,   25,   29,   58,   61,   57,   33,
+      557,   35,   33,   63,   64,   29,   56,   29,   56,   33,
+       37,   29,   64,   29,   68,   29,   58,   29,   32,   63,
+       59,   61,   32,   45,   45,   45,   45,   45,   66,   75,
+
+       68,   32,   32,   59,   32,   32,   32,   59,   32,   54,
+       54,   54,   54,   75,   32,  554,   32,   32,   89,   32,
+       34,   65,   66,   70,   34,   46,   46,   46,   46,   46,
+       46,   89,   70,   34,   34,   72,   34,   65,   34,   65,
+       34,   74,   34,   81,   82,  144,   34,   48,   48,   48,
+       48,   48,   81,   82,   82,   48,  550,  144,   74,   72,
+      548,   48,   49,   49,   49,   49,   49,   49,   50,   50,
+       50,   50,   50,   73,   76,   50,   50,   67,   50,   50,
        50,   50,   50,   50,   77,   67,   79,   80,   67,   73,
-       82,   83,   84,   85,   86,   87,   73,   67,   77,   82,
-
-       82,   86,   91,   88,   92,   94,   80,   95,   83,   88,
-       79,   91,   84,   87,   96,   85,   85,   85,  100,   85,
-       92,   94,   97,   98,   96,   99,  101,  100,   95,  102,
-      103,   99,   97,   98,  104,  105,  106,  107,   96,  109,
-      101,  108,  114,  110,  106,  111,   97,  107,  109,  105,
-      112,  102,  106,  110,  103,  111,  114,  108,  113,  115,
-      117,  107,  104,  109,  106,  113,  108,  110,  118,  112,
-      119,  120,  121,  115,  117,  122,  123,  125,  144,  130,
-      149,  115,  121,  128,  119,  117,  123,  125,  118,  128,
-      127,  131,  120,  124,  149,  143,  121,  144,  160,  122,
-
-      123,  130,  124,  124,  127,  160,  127,  143,  134,  134,
-      134,  134,  124,  131,  147,  124,  134,  151,  146,  131,
-      124,  150,  134,  136,  136,  136,  136,  136,  146,  150,
-      154,  136,  156,  151,  158,  163,  147,  136,  137,  137,
-      153,  137,  137,  137,  137,  137,  155,  157,  156,  153,
-      158,  164,  155,  154,  159,  162,  165,  166,  163,  168,
-      167,  157,  169,  170,  159,  162,  167,  172,  159,  171,
-      174,  537,  175,  170,  172,  164,  165,  162,  179,  171,
-      170,  169,  173,  166,  169,  176,  177,  168,  175,  178,
-      174,  173,  180,  181,  182,  176,  177,  179,  183,  178,
-
-      184,  185,  180,  182,  194,  187,  197,  202,  181,  200,
-      209,  207,  201,  178,  208,  535,  184,  202,  213,  235,
-      183,  187,  207,  203,  208,  194,  185,  215,  235,  209,
-      197,  199,  199,  199,  199,  200,  201,  212,  199,  199,
-      213,  199,  199,  199,  199,  199,  199,  203,  216,  218,
-      217,  215,  221,  219,  212,  220,  225,  228,  231,  232,
-      233,  212,  217,  219,  216,  220,  234,  228,  231,  218,
-      236,  219,  234,  232,  237,  225,  236,  233,  221,  238,
-      240,  241,  244,  244,  238,  244,  244,  244,  244,  237,
-      243,  243,  243,  243,  245,  245,  245,  245,  243,  240,
-
-      248,  250,  252,  256,  243,  241,  246,  246,  246,  246,
-      246,  247,  247,  247,  247,  247,  249,  253,  248,  250,
-      252,  255,  257,  253,  249,  258,  259,  256,  260,  255,
-      261,  258,  262,  264,  263,  265,  266,  267,  257,  270,
-      271,  265,  260,  272,  259,  267,  266,  273,  277,  262,
-      263,  276,  278,  281,  277,  264,  282,  283,  261,  280,
-      285,  284,  278,  270,  271,  281,  272,  276,  272,  280,
-      286,  287,  273,  290,  293,  285,  294,  291,  282,  283,
-      284,  298,  297,  300,  534,  524,  286,  301,  305,  298,
-      287,  302,  290,  291,  300,  294,  297,  301,  305,  293,
-
-      306,  308,  302,  309,  311,  314,  315,  316,  306,  317,
-      319,  308,  311,  316,  321,  524,  314,  315,  323,  309,
-      324,  326,  326,  326,  326,  328,  329,  317,  331,  323,
-      335,  328,  319,  333,  324,  329,  332,  334,  321,  333,
-      336,  323,  337,  334,  332,  338,  339,  340,  342,  337,
-      336,  331,  335,  341,  344,  347,  342,  340,  348,  349,
-      350,  353,  344,  351,  352,  338,  339,  355,  356,  347,
-      350,  341,  348,  357,  358,  361,  360,  349,  353,  351,
-      362,  365,  352,  361,  358,  363,  356,  364,  366,  367,
-      362,  355,  368,  357,  360,  363,  369,  371,  372,  373,
-
-      365,  364,  378,  368,  375,  367,  377,  379,  382,  373,
-      371,  378,  366,  380,  377,  381,  369,  383,  386,  379,
-      385,  381,  372,  388,  375,  389,  390,  380,  392,  393,
-      394,  397,  382,  396,  385,  383,  390,  401,  396,  396,
-      402,  388,  386,  405,  407,  401,  406,  408,  393,  394,
-      407,  392,  410,  405,  389,  397,  406,  402,  414,  415,
-      410,  428,  417,  418,  427,  424,  429,  430,  431,  433,
-      434,  408,  417,  437,  418,  429,  414,  415,  424,  438,
-      427,  430,  439,  440,  428,  444,  431,  441,  443,  434,
-      445,  446,  447,  433,  448,  437,  449,  441,  443,  440,
-
-      451,  438,  452,  444,  448,  453,  445,  446,  454,  439,
-      455,  453,  452,  456,  447,  457,  458,  460,  454,  461,
-      449,  456,  462,  463,  465,  467,  451,  466,  458,  475,
-      474,  468,  481,  463,  455,  486,  475,  473,  474,  457,
-      465,  468,  460,  461,  477,  466,  462,  473,  478,  467,
-      479,  484,  477,  485,  478,  487,  481,  484,  488,  486,
-      489,  487,  490,  485,  479,  491,  492,  493,  489,  496,
-      494,  497,  492,  498,  499,  488,  494,  500,  501,  503,
-      504,  491,  508,  493,  496,  505,  490,  500,  497,  503,
-      506,  509,  508,  498,  510,  511,  504,  512,  499,  515,
-
-      516,  505,  501,  514,  517,  518,  506,  515,  510,  519,
-      520,  521,  522,  511,  516,  509,  512,  523,  525,  514,
-      522,  527,  517,  530,  536,  523,  532,  518,  519,  533,
-      531,  530,  529,  521,  520,  528,  532,  526,  513,  527,
-      507,  502,  525,  495,  483,  482,  536,  539,  539,  539,
-      539,  539,  540,  540,  542,  480,  542,  542,  542,  543,
-      543,  545,  545,  545,  545,  545,  476,  472,  471,  470,
-      469,  464,  459,  450,  442,  436,  435,  432,  426,  425,
-      423,  422,  421,  420,  419,  416,  413,  412,  411,  409,
-      404,  403,  400,  399,  398,  395,  391,  387,  384,  376,
-
-      374,  370,  359,  354,  346,  345,  343,  330,  327,  325,
-      322,  320,  318,  313,  312,  310,  307,  304,  303,  299,
-      296,  292,  289,  288,  279,  275,  274,  269,  268,  254,
-      251,  239,  230,  229,  227,  226,  224,  223,  222,  214,
-      211,  210,  206,  205,  204,  198,  196,  195,  193,  192,
-      191,  190,  189,  188,  186,  161,  152,  148,  145,  142,
-      139,  135,  132,  116,   93,   71,   62,   52,   41,   39,
-        8,    7,    3,  538,  538,  538,  538,  538,  538,  538,
-      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
-      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
+       83,   84,   85,   76,   77,   86,   73,   67,   88,   87,
 
-      538,  538,  538,  538,  538,  538,  538,  538,  538,  538,
-      538,  538,  538,  538,  538,  538,  538,  538
+       91,   94,   86,   90,   88,   92,   80,   83,   77,   91,
+       79,   84,   95,   96,   85,   85,   85,   87,   85,   90,
+       97,   92,   98,   94,  104,   99,   94,  100,   95,  101,
+       97,  102,   98,  100,   96,   99,  103,  105,  101,  106,
+      108,  107,  110,  109,   97,  102,   98,  115,  104,  107,
+      108,  110,  111,  106,  113,  119,  114,  107,  103,  109,
+      112,  115,  111,  114,  108,  105,  110,  116,  109,  107,
+      112,  118,  120,  113,  121,  119,  111,  122,  123,  547,
+      124,  116,  126,  127,  125,  118,  120,  122,  127,  116,
+      124,  128,  126,  125,  125,  121,  118,  130,  131,  130,
+
+      132,  122,  123,  125,  124,  128,  125,  128,  129,  147,
+      150,  125,  546,  148,  129,  135,  135,  135,  135,  147,
+      131,  145,  132,  135,  150,  152,  157,  154,  132,  135,
+      137,  137,  137,  137,  137,  148,  154,  155,  137,  151,
+      145,  152,  157,  158,  137,  138,  138,  151,  138,  138,
+      138,  138,  138,  156,  159,  160,  161,  158,  163,  156,
+      155,  164,  165,  161,  167,  160,  168,  166,  163,  160,
+      159,  169,  168,  170,  173,  172,  544,  175,  176,  171,
+      163,  173,  174,  177,  164,  172,  165,  166,  178,  171,
+      167,  174,  170,  177,  176,  170,  171,  175,  178,  169,
+
+      179,  180,  181,  182,  183,  184,  185,  186,  189,  188,
+      179,  200,  181,  183,  190,  197,  203,  204,  182,  188,
+      180,  205,  185,  210,  179,  542,  189,  184,  541,  206,
+      190,  205,  186,  211,  210,  200,  197,  202,  202,  202,
+      202,  204,  203,  211,  202,  202,  212,  202,  202,  202,
+      202,  202,  202,  206,  215,  216,  218,  219,  220,  221,
+      224,  235,  223,  237,  222,  212,  228,  236,  539,  237,
+      220,  215,  223,  219,  222,  235,  244,  216,  215,  221,
+      218,  231,  222,  234,  236,  228,  224,  238,  239,  240,
+      241,  231,  243,  234,  239,  241,  238,  251,  253,  288,
+
+      244,  252,  258,  334,  240,  246,  246,  246,  246,  252,
+      258,  243,  334,  246,  288,  251,  253,  247,  247,  246,
+      247,  247,  247,  247,  248,  248,  248,  248,  249,  249,
+      249,  249,  249,  250,  250,  250,  250,  250,  255,  256,
+      259,  260,  261,  262,  263,  256,  264,  266,  261,  265,
+      267,  273,  269,  268,  274,  276,  255,  260,  263,  268,
+      270,  262,  269,  266,  259,  275,  265,  279,  270,  281,
+      280,  283,  267,  284,  264,  273,  280,  285,  274,  281,
+      276,  283,  286,  279,  287,  284,  289,  290,  275,  293,
+      275,  294,  295,  296,  298,  299,  302,  303,  305,  285,
+
+      526,  306,  289,  287,  286,  303,  290,  294,  293,  305,
+      302,  306,  307,  311,  299,  310,  295,  313,  314,  298,
+      296,  311,  316,  307,  319,  310,  320,  313,  322,  324,
+      316,  326,  321,  328,  314,  319,  329,  320,  321,  331,
+      331,  331,  331,  333,  328,  336,  322,  338,  339,  333,
+      329,  324,  337,  338,  339,  326,  328,  340,  342,  341,
+      337,  343,  344,  345,  347,  342,  346,  349,  336,  341,
+      355,  352,  347,  345,  353,  349,  354,  356,  357,  340,
+      355,  343,  344,  358,  346,  352,  360,  361,  353,  362,
+      365,  363,  367,  356,  354,  366,  357,  368,  369,  371,
+
+      358,  363,  367,  366,  370,  361,  372,  373,  365,  362,
+      360,  374,  369,  371,  370,  375,  376,  378,  379,  380,
+      382,  386,  368,  389,  384,  372,  375,  374,  385,  380,
+      378,  373,  384,  386,  387,  388,  376,  385,  390,  392,
+      382,  388,  379,  393,  395,  396,  399,  389,  387,  397,
+      408,  400,  401,  392,  404,  403,  390,  415,  408,  397,
+      403,  403,  395,  409,  417,  412,  413,  393,  420,  399,
+      400,  401,  417,  414,  396,  412,  413,  421,  404,  414,
+      409,  415,  423,  424,  426,  427,  433,  436,  437,  438,
+      420,  439,  440,  442,  426,  421,  427,  443,  438,  433,
+
+      423,  424,  446,  436,  447,  439,  448,  449,  450,  452,
+      440,  437,  453,  454,  456,  455,  443,  442,  450,  452,
+      458,  460,  457,  449,  446,  459,  447,  462,  466,  454,
+      453,  455,  457,  448,  459,  464,  456,  463,  458,  465,
+      467,  464,  468,  469,  471,  460,  472,  463,  467,  465,
+      473,  474,  466,  462,  478,  469,  476,  477,  479,  487,
+      520,  474,  494,  486,  488,  492,  468,  487,  479,  471,
+      472,  488,  476,  486,  473,  477,  490,  491,  478,  492,
+      498,  497,  499,  491,  490,  500,  494,  497,  501,  502,
+      498,  500,  503,  504,  505,  506,  507,  502,  509,  511,
+
+      505,  510,  507,  512,  513,  501,  499,  514,  517,  504,
+      516,  506,  518,  509,  513,  521,  503,  519,  510,  511,
+      516,  522,  523,  524,  517,  521,  527,  512,  518,  525,
+      528,  514,  529,  519,  530,  531,  523,  532,  528,  533,
+      534,  524,  527,  535,  537,  522,  529,  536,  525,  538,
+      540,  535,  530,  543,  545,  536,  532,  531,  549,  515,
+      508,  543,  534,  533,  545,  496,  495,  493,  540,  489,
+      485,  484,  483,  538,  537,  482,  481,  480,  475,  470,
+      549,  552,  552,  552,  552,  552,  553,  553,  555,  461,
+      555,  555,  555,  556,  556,  558,  558,  558,  558,  558,
+
+      451,  445,  444,  441,  435,  434,  432,  431,  430,  429,
+      428,  425,  422,  419,  418,  416,  411,  410,  407,  406,
+      405,  402,  398,  394,  391,  383,  381,  377,  364,  359,
+      351,  350,  348,  335,  332,  330,  327,  325,  323,  318,
+      317,  315,  312,  309,  308,  304,  301,  297,  292,  291,
+      282,  278,  277,  272,  271,  257,  254,  242,  233,  232,
+      230,  229,  227,  226,  225,  217,  214,  213,  209,  208,
+      207,  201,  199,  198,  196,  195,  194,  193,  192,  191,
+      187,  162,  153,  149,  146,  143,  140,  136,  133,  117,
+       93,   71,   62,   52,   41,   39,    8,    7,    3,  551,
+
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551,  551,  551,  551,  551,  551,  551,
+      551,  551,  551,  551
     } ;
 
 static yy_state_type yy_state_buf[YY_BUF_SIZE + 2], *yy_state_ptr;
@@ -1017,7 +1027,7 @@
 /* HexIntConstant - Hexadecimal constant generated by the CFE to avoid forcing
  * it to deal with 64 bit numbers.
  */
-#line 1021 "Lexer.cpp"
+#line 1031 "Lexer.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -1171,7 +1181,7 @@
 #line 190 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 
 
-#line 1175 "Lexer.cpp"
+#line 1185 "Lexer.cpp"
 
 	if ( yy_init )
 		{
@@ -1219,14 +1229,14 @@
 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
-				if ( yy_current_state >= 539 )
+				if ( yy_current_state >= 552 )
 					yy_c = yy_meta[(unsigned int) yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 			*yy_state_ptr++ = yy_current_state;
 			++yy_cp;
 			}
-		while ( yy_current_state != 538 );
+		while ( yy_current_state != 551 );
 
 yy_find_action:
 		yy_current_state = *--yy_state_ptr;
@@ -1479,37 +1489,47 @@
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 239 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::VoidTy,  VOID);  }
+#line 238 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return NOUNWIND; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 240 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::FloatTy, FLOAT); }
+#line 239 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return NORETURN; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
 #line 241 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::DoubleTy,DOUBLE);}
+{ RET_TY(Type::VoidTy,  VOID);  }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
 #line 242 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TY(Type::LabelTy, LABEL); }
+{ RET_TY(Type::FloatTy, FLOAT); }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
 #line 243 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return TYPE;   }
+{ RET_TY(Type::DoubleTy,DOUBLE);}
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
 #line 244 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return OPAQUE; }
+{ RET_TY(Type::LabelTy, LABEL); }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
 #line 245 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return TYPE;   }
+	YY_BREAK
+case 51:
+YY_RULE_SETUP
+#line 246 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return OPAQUE; }
+	YY_BREAK
+case 52:
+YY_RULE_SETUP
+#line 247 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { uint64_t NumBits = atoull(yytext+1);
                   if (NumBits < IntegerType::MIN_INT_BITS || 
                       NumBits > IntegerType::MAX_INT_BITS)
@@ -1518,367 +1538,367 @@
                   RET_TY(Ty, INTTYPE);
                 }
 	YY_BREAK
-case 51:
-YY_RULE_SETUP
-#line 253 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Add, ADD); }
-	YY_BREAK
-case 52:
-YY_RULE_SETUP
-#line 254 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Sub, SUB); }
-	YY_BREAK
 case 53:
 YY_RULE_SETUP
 #line 255 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Mul, MUL); }
+{ RET_TOK(BinaryOpVal, Add, ADD); }
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
 #line 256 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
+{ RET_TOK(BinaryOpVal, Sub, SUB); }
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
 #line 257 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SDiv, SDIV); }
+{ RET_TOK(BinaryOpVal, Mul, MUL); }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
 #line 258 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, FDiv, FDIV); }
+{ RET_TOK(BinaryOpVal, UDiv, UDIV); }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
 #line 259 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, URem, UREM); }
+{ RET_TOK(BinaryOpVal, SDiv, SDIV); }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
 #line 260 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, SRem, SREM); }
+{ RET_TOK(BinaryOpVal, FDiv, FDIV); }
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
 #line 261 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, FRem, FREM); }
+{ RET_TOK(BinaryOpVal, URem, UREM); }
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
 #line 262 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Shl, SHL); }
+{ RET_TOK(BinaryOpVal, SRem, SREM); }
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
 #line 263 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, LShr, LSHR); }
+{ RET_TOK(BinaryOpVal, FRem, FREM); }
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
 #line 264 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, AShr, ASHR); }
+{ RET_TOK(BinaryOpVal, Shl, SHL); }
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
 #line 265 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, And, AND); }
+{ RET_TOK(BinaryOpVal, LShr, LSHR); }
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
 #line 266 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Or , OR ); }
+{ RET_TOK(BinaryOpVal, AShr, ASHR); }
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
 #line 267 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(BinaryOpVal, Xor, XOR); }
+{ RET_TOK(BinaryOpVal, And, AND); }
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
 #line 268 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal,  ICmp,  ICMP); }
+{ RET_TOK(BinaryOpVal, Or , OR ); }
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
 #line 269 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal,  FCmp,  FCMP); }
+{ RET_TOK(BinaryOpVal, Xor, XOR); }
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 271 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return EQ;  }
+#line 270 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal,  ICmp,  ICMP); }
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 272 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return NE;  }
+#line 271 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal,  FCmp,  FCMP); }
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
 #line 273 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return SLT; }
+{ return EQ;  }
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
 #line 274 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return SGT; }
+{ return NE;  }
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
 #line 275 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return SLE; }
+{ return SLT; }
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
 #line 276 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return SGE; }
+{ return SGT; }
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
 #line 277 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return ULT; }
+{ return SLE; }
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
 #line 278 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return UGT; }
+{ return SGE; }
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
 #line 279 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return ULE; }
+{ return ULT; }
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
 #line 280 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return UGE; }
+{ return UGT; }
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
 #line 281 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return OEQ; }
+{ return ULE; }
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
 #line 282 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return ONE; }
+{ return UGE; }
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
 #line 283 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return OLT; }
+{ return OEQ; }
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
 #line 284 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return OGT; }
+{ return ONE; }
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
 #line 285 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return OLE; }
+{ return OLT; }
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
 #line 286 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return OGE; }
+{ return OGT; }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 287 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return ORD; }
+{ return OLE; }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
 #line 288 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return UNO; }
+{ return OGE; }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 289 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return UEQ; }
+{ return ORD; }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 290 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ return UNE; }
+{ return UNO; }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 292 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
+#line 291 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return UEQ; }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 293 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Call, CALL); }
+#line 292 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ return UNE; }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
 #line 294 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, Trunc, TRUNC); }
+{ RET_TOK(OtherOpVal, PHI, PHI_TOK); }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
 #line 295 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, ZExt, ZEXT); }
+{ RET_TOK(OtherOpVal, Call, CALL); }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
 #line 296 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SExt, SEXT); }
+{ RET_TOK(CastOpVal, Trunc, TRUNC); }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
 #line 297 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
+{ RET_TOK(CastOpVal, ZExt, ZEXT); }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 298 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPExt, FPEXT); }
+{ RET_TOK(CastOpVal, SExt, SEXT); }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 299 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
+{ RET_TOK(CastOpVal, FPTrunc, FPTRUNC); }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 300 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
+{ RET_TOK(CastOpVal, FPExt, FPEXT); }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 301 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
+{ RET_TOK(CastOpVal, UIToFP, UITOFP); }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 302 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
+{ RET_TOK(CastOpVal, SIToFP, SITOFP); }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 303 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
+{ RET_TOK(CastOpVal, FPToUI, FPTOUI); }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 304 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
+{ RET_TOK(CastOpVal, FPToSI, FPTOSI); }
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
 #line 305 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(CastOpVal, BitCast, BITCAST); }
+{ RET_TOK(CastOpVal, IntToPtr, INTTOPTR); }
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
 #line 306 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, Select, SELECT); }
+{ RET_TOK(CastOpVal, PtrToInt, PTRTOINT); }
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
 #line 307 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, VAArg , VAARG); }
+{ RET_TOK(CastOpVal, BitCast, BITCAST); }
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
 #line 308 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Ret, RET); }
+{ RET_TOK(OtherOpVal, Select, SELECT); }
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
 #line 309 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Br, BR); }
+{ RET_TOK(OtherOpVal, VAArg , VAARG); }
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
 #line 310 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Switch, SWITCH); }
+{ RET_TOK(TermOpVal, Ret, RET); }
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
 #line 311 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Invoke, INVOKE); }
+{ RET_TOK(TermOpVal, Br, BR); }
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
 #line 312 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unwind, UNWIND); }
+{ RET_TOK(TermOpVal, Switch, SWITCH); }
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
 #line 313 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
+{ RET_TOK(TermOpVal, Invoke, INVOKE); }
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 315 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Malloc, MALLOC); }
+#line 314 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unwind, UNWIND); }
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 316 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
+#line 315 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(TermOpVal, Unreachable, UNREACHABLE); }
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
 #line 317 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Free, FREE); }
+{ RET_TOK(MemOpVal, Malloc, MALLOC); }
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
 #line 318 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Load, LOAD); }
+{ RET_TOK(MemOpVal, Alloca, ALLOCA); }
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
 #line 319 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, Store, STORE); }
+{ RET_TOK(MemOpVal, Free, FREE); }
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
 #line 320 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
+{ RET_TOK(MemOpVal, Load, LOAD); }
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 322 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
+#line 321 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, Store, STORE); }
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 323 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
+#line 322 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(MemOpVal, GetElementPtr, GETELEMENTPTR); }
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
 #line 324 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
-{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+{ RET_TOK(OtherOpVal, ExtractElement, EXTRACTELEMENT); }
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 327 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 325 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, InsertElement, INSERTELEMENT); }
+	YY_BREAK
+case 120:
+YY_RULE_SETUP
+#line 326 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+{ RET_TOK(OtherOpVal, ShuffleVector, SHUFFLEVECTOR); }
+	YY_BREAK
+case 121:
+YY_RULE_SETUP
+#line 329 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(yytext+1);
                   llvmAsmlval.StrVal = strdup(yytext+1);             // Skip %
                   return LOCALVAR;
                 }
 	YY_BREAK
-case 120:
+case 122:
 YY_RULE_SETUP
-#line 332 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 334 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                   UnEscapeLexed(yytext+1);
                   llvmAsmlval.StrVal = strdup(yytext+1);             // Skip @
                   return GLOBALVAR;
                 }
 	YY_BREAK
-case 121:
+case 123:
 YY_RULE_SETUP
-#line 337 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 339 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-1] = 0;  // nuke colon
                   UnEscapeLexed(yytext);
@@ -1886,9 +1906,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 122:
+case 124:
 YY_RULE_SETUP
-#line 343 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 345 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                   yytext[strlen(yytext)-2] = 0;  // nuke colon, end quote
                   UnEscapeLexed(yytext+1);
@@ -1896,9 +1916,9 @@
                   return LABELSTR;
                 }
 	YY_BREAK
-case 123:
+case 125:
 YY_RULE_SETUP
-#line 350 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 352 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { // Note that we cannot unescape a string constant here!  The
                    // string constant might contain a \00 which would not be
                    // understood by the string stuff.  It is valid to make a
@@ -1909,18 +1929,18 @@
                    return STRINGCONSTANT;
                  }
 	YY_BREAK
-case 124:
+case 126:
 YY_RULE_SETUP
-#line 359 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 361 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                      yytext[strlen(yytext)-1] = 0;           // nuke end quote
                      llvmAsmlval.StrVal = strdup(yytext+2);  // Nuke @, quote
                      return ATSTRINGCONSTANT;
                    }
 	YY_BREAK
-case 125:
+case 127:
 YY_RULE_SETUP
-#line 365 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 367 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { int len = strlen(yytext); 
                   uint32_t numBits = ((len * 64) / 19) + 1;
                   APInt Tmp(numBits, yytext, len, 10);
@@ -1936,9 +1956,9 @@
                   }
                 }
 	YY_BREAK
-case 126:
+case 128:
 YY_RULE_SETUP
-#line 379 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 381 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { int len = strlen(yytext); 
                   uint32_t numBits = (((len-1) * 64) / 19) + 2;
                   APInt Tmp(numBits, yytext, len, 10);
@@ -1954,9 +1974,9 @@
                   }
                 }
 	YY_BREAK
-case 127:
+case 129:
 YY_RULE_SETUP
-#line 394 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 396 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { int len = strlen(yytext+3) - 3;
                    uint32_t bits = len * 4;
                    APInt Tmp(bits, yytext+3, len, 16);
@@ -1975,9 +1995,9 @@
                    }
                  }
 	YY_BREAK
-case 128:
+case 130:
 YY_RULE_SETUP
-#line 412 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 414 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -1986,9 +2006,9 @@
                   return LOCALVAL_ID;
                 }
 	YY_BREAK
-case 129:
+case 131:
 YY_RULE_SETUP
-#line 419 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 421 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                   uint64_t Val = atoull(yytext+1);
                   if ((unsigned)Val != Val)
@@ -1997,18 +2017,18 @@
                   return GLOBALVAL_ID;
                 }
 	YY_BREAK
-case 130:
+case 132:
 YY_RULE_SETUP
-#line 427 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 429 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = atof(yytext); return FPVAL; }
 	YY_BREAK
-case 131:
+case 133:
 YY_RULE_SETUP
-#line 428 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 430 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { llvmAsmlval.FPVal = HexToFP(yytext); return FPVAL; }
 	YY_BREAK
 case YY_STATE_EOF(INITIAL):
-#line 430 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 432 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 {
                   /* Make sure to free the internal buffers for flex when we are
                    * done reading our input!
@@ -2017,22 +2037,22 @@
                   return EOF;
                 }
 	YY_BREAK
-case 132:
+case 134:
 YY_RULE_SETUP
-#line 438 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 440 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { /* Ignore whitespace */ }
 	YY_BREAK
-case 133:
+case 135:
 YY_RULE_SETUP
-#line 439 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 441 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 { return yytext[0]; }
 	YY_BREAK
-case 134:
+case 136:
 YY_RULE_SETUP
-#line 441 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 443 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2036 "Lexer.cpp"
+#line 2056 "Lexer.cpp"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2319,7 +2339,7 @@
 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
-			if ( yy_current_state >= 539 )
+			if ( yy_current_state >= 552 )
 				yy_c = yy_meta[(unsigned int) yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -2349,11 +2369,11 @@
 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
-		if ( yy_current_state >= 539 )
+		if ( yy_current_state >= 552 )
 			yy_c = yy_meta[(unsigned int) yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-	yy_is_jam = (yy_current_state == 538);
+	yy_is_jam = (yy_current_state == 551);
 	if ( ! yy_is_jam )
 		*yy_state_ptr++ = yy_current_state;
 
@@ -2910,5 +2930,5 @@
 	return 0;
 	}
 #endif
-#line 441 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
+#line 443 "/proj/llvm/llvm-1/lib/AsmParser/Lexer.l"
 


Index: llvm/lib/AsmParser/Lexer.l.cvs
diff -u llvm/lib/AsmParser/Lexer.l.cvs:1.27 llvm/lib/AsmParser/Lexer.l.cvs:1.28
--- llvm/lib/AsmParser/Lexer.l.cvs:1.27	Fri Mar  9 15:19:09 2007
+++ llvm/lib/AsmParser/Lexer.l.cvs	Wed Mar 21 21:14:08 2007
@@ -235,6 +235,8 @@
 
 inreg           { return INREG; }
 sret            { return SRET;  }
+nounwind        { return NOUNWIND; }
+noreturn        { return NORETURN; }
 
 void            { RET_TY(Type::VoidTy,  VOID);  }
 float           { RET_TY(Type::FloatTy, FLOAT); }


Index: llvm/lib/AsmParser/llvmAsmParser.cpp.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.76 llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.77
--- llvm/lib/AsmParser/llvmAsmParser.cpp.cvs:1.76	Tue Mar 20 12:19:31 2007
+++ llvm/lib/AsmParser/llvmAsmParser.cpp.cvs	Wed Mar 21 21:14:08 2007
@@ -193,8 +193,9 @@
      NORETURN = 384,
      INREG = 385,
      SRET = 386,
-     DEFAULT = 387,
-     HIDDEN = 388
+     NOUNWIND = 387,
+     DEFAULT = 388,
+     HIDDEN = 389
    };
 #endif
 /* Tokens.  */
@@ -327,8 +328,9 @@
 #define NORETURN 384
 #define INREG 385
 #define SRET 386
-#define DEFAULT 387
-#define HIDDEN 388
+#define NOUNWIND 387
+#define DEFAULT 388
+#define HIDDEN 389
 
 
 
@@ -1327,7 +1329,7 @@
   llvm::FCmpInst::Predicate         FPredicate;
 } YYSTYPE;
 /* Line 196 of yacc.c.  */
-#line 1331 "llvmAsmParser.tab.c"
+#line 1333 "llvmAsmParser.tab.c"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1
@@ -1339,7 +1341,7 @@
 
 
 /* Line 219 of yacc.c.  */
-#line 1343 "llvmAsmParser.tab.c"
+#line 1345 "llvmAsmParser.tab.c"
 
 #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
 # define YYSIZE_T __SIZE_TYPE__
@@ -1490,20 +1492,20 @@
 /* YYFINAL -- State number of the termination state. */
 #define YYFINAL  40
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   1429
+#define YYLAST   1434
 
 /* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS  148
+#define YYNTOKENS  149
 /* YYNNTS -- Number of nonterminals. */
 #define YYNNTS  78
 /* YYNRULES -- Number of rules. */
-#define YYNRULES  286
+#define YYNRULES  287
 /* YYNRULES -- Number of states. */
-#define YYNSTATES  559
+#define YYNSTATES  560
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   388
+#define YYMAXUTOK   389
 
 #define YYTRANSLATE(YYX)						\
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -1515,15 +1517,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,
-     138,   139,   136,     2,   135,     2,     2,     2,     2,     2,
+     139,   140,   137,     2,   136,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     143,   134,   144,     2,     2,     2,     2,     2,     2,     2,
+     144,   135,   145,     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,   140,   137,   142,     2,     2,     2,     2,     2,   147,
+       2,   141,   138,   143,     2,     2,     2,     2,     2,   148,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     141,     2,     2,   145,     2,   146,     2,     2,     2,     2,
+     142,     2,     2,   146,     2,   147,     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,
@@ -1549,7 +1551,7 @@
       95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
      105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
      115,   116,   117,   118,   119,   120,   121,   122,   123,   124,
-     125,   126,   127,   128,   129,   130,   131,   132,   133
+     125,   126,   127,   128,   129,   130,   131,   132,   133,   134
 };
 
 #if YYDEBUG
@@ -1567,31 +1569,31 @@
      138,   140,   142,   144,   146,   148,   150,   151,   153,   154,
      156,   158,   159,   161,   163,   165,   167,   168,   170,   172,
      174,   176,   178,   181,   183,   185,   187,   189,   190,   193,
-     195,   197,   198,   201,   202,   205,   206,   210,   213,   214,
-     216,   217,   221,   223,   226,   228,   230,   232,   234,   236,
-     238,   241,   243,   246,   252,   258,   264,   270,   274,   277,
-     283,   288,   291,   293,   295,   297,   301,   303,   307,   309,
-     310,   312,   316,   321,   325,   329,   334,   339,   343,   350,
-     356,   359,   362,   365,   368,   371,   374,   377,   380,   383,
-     386,   389,   392,   399,   405,   414,   421,   428,   436,   444,
-     451,   460,   469,   473,   475,   477,   479,   481,   482,   484,
-     487,   488,   492,   493,   497,   501,   503,   507,   511,   512,
-     519,   520,   528,   529,   537,   540,   544,   546,   550,   554,
-     558,   562,   564,   565,   571,   575,   577,   581,   583,   584,
-     594,   596,   598,   603,   605,   607,   610,   614,   615,   617,
-     619,   621,   623,   625,   627,   629,   631,   633,   637,   639,
-     645,   647,   649,   651,   653,   655,   657,   660,   663,   666,
-     670,   673,   674,   676,   679,   682,   686,   696,   706,   715,
-     730,   732,   734,   741,   747,   750,   757,   765,   769,   775,
-     776,   777,   781,   784,   786,   792,   798,   805,   812,   817,
-     824,   829,   834,   841,   848,   851,   860,   862,   864,   865,
-     869,   876,   880,   887,   890,   895,   902
+     195,   197,   199,   200,   203,   204,   207,   208,   212,   215,
+     216,   218,   219,   223,   225,   228,   230,   232,   234,   236,
+     238,   240,   243,   245,   248,   254,   260,   266,   272,   276,
+     279,   285,   290,   293,   295,   297,   299,   303,   305,   309,
+     311,   312,   314,   318,   323,   327,   331,   336,   341,   345,
+     352,   358,   361,   364,   367,   370,   373,   376,   379,   382,
+     385,   388,   391,   394,   401,   407,   416,   423,   430,   438,
+     446,   453,   462,   471,   475,   477,   479,   481,   483,   484,
+     486,   489,   490,   494,   495,   499,   503,   505,   509,   513,
+     514,   521,   522,   530,   531,   539,   542,   546,   548,   552,
+     556,   560,   564,   566,   567,   573,   577,   579,   583,   585,
+     586,   596,   598,   600,   605,   607,   609,   612,   616,   617,
+     619,   621,   623,   625,   627,   629,   631,   633,   635,   639,
+     641,   647,   649,   651,   653,   655,   657,   659,   662,   665,
+     668,   672,   675,   676,   678,   681,   684,   688,   698,   708,
+     717,   732,   734,   736,   743,   749,   752,   759,   767,   771,
+     777,   778,   779,   783,   786,   788,   794,   800,   807,   814,
+     819,   826,   831,   836,   843,   850,   853,   862,   864,   866,
+     867,   871,   878,   882,   889,   892,   897,   904
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS. */
 static const short int yyrhs[] =
 {
-     188,     0,    -1,    68,    -1,    69,    -1,    70,    -1,    71,
+     189,     0,    -1,    68,    -1,    69,    -1,    70,    -1,    71,
       -1,    72,    -1,    73,    -1,    74,    -1,    75,    -1,    76,
       -1,    80,    -1,    81,    -1,    82,    -1,    77,    -1,    78,
       -1,    79,    -1,   111,    -1,   112,    -1,   113,    -1,   114,
@@ -1602,86 +1604,86 @@
       -1,    97,    -1,    98,    -1,    99,    -1,   100,    -1,   101,
       -1,   102,    -1,   103,    -1,   104,    -1,    91,    -1,    92,
       -1,    93,    -1,    94,    -1,    23,    -1,    24,    -1,    11,
-      -1,    12,    -1,    13,    -1,    16,    -1,    19,    -1,   156,
-      -1,    -1,   156,   134,    -1,    -1,    17,    -1,    20,    -1,
-     159,   134,    -1,    -1,    37,    -1,    39,    -1,    38,    -1,
+      -1,    12,    -1,    13,    -1,    16,    -1,    19,    -1,   157,
+      -1,    -1,   157,   135,    -1,    -1,    17,    -1,    20,    -1,
+     160,   135,    -1,    -1,    37,    -1,    39,    -1,    38,    -1,
       40,    -1,    42,    -1,    41,    -1,    43,    -1,    45,    -1,
-      -1,   133,    -1,    -1,    41,    -1,    43,    -1,    -1,    37,
+      -1,   134,    -1,    -1,    41,    -1,    43,    -1,    -1,    37,
       -1,    38,    -1,    39,    -1,    42,    -1,    -1,    56,    -1,
       57,    -1,    58,    -1,    59,    -1,    60,    -1,    55,     4,
       -1,   112,    -1,   113,    -1,   130,    -1,   131,    -1,    -1,
-     168,   167,    -1,   129,    -1,   167,    -1,    -1,   170,   169,
-      -1,    -1,    48,     4,    -1,    -1,   135,    48,     4,    -1,
-      31,    19,    -1,    -1,   173,    -1,    -1,   135,   176,   175,
-      -1,   173,    -1,    48,     4,    -1,    11,    -1,    12,    -1,
-      13,    -1,    14,    -1,    44,    -1,   177,    -1,   178,   136,
-      -1,   210,    -1,   137,     4,    -1,   178,   138,   182,   139,
-     170,    -1,    10,   138,   182,   139,   170,    -1,   140,     4,
-     141,   178,   142,    -1,   143,     4,   141,   178,   144,    -1,
-     145,   183,   146,    -1,   145,   146,    -1,   143,   145,   183,
-     146,   144,    -1,   143,   145,   146,   144,    -1,   178,   168,
-      -1,   178,    -1,    10,    -1,   179,    -1,   181,   135,   179,
-      -1,   181,    -1,   181,   135,    34,    -1,    34,    -1,    -1,
-     178,    -1,   183,   135,   178,    -1,   178,   140,   186,   142,
-      -1,   178,   140,   142,    -1,   178,   147,    19,    -1,   178,
-     143,   186,   144,    -1,   178,   145,   186,   146,    -1,   178,
-     145,   146,    -1,   178,   143,   145,   186,   146,   144,    -1,
-     178,   143,   145,   146,   144,    -1,   178,    35,    -1,   178,
-      36,    -1,   178,   210,    -1,   178,   185,    -1,   178,    22,
-      -1,   154,     3,    -1,   154,     5,    -1,   154,     4,    -1,
-     154,     6,    -1,    11,    23,    -1,    11,    24,    -1,   155,
-       9,    -1,   151,   138,   184,    33,   178,   139,    -1,   110,
-     138,   184,   221,   139,    -1,   124,   138,   184,   135,   184,
-     135,   184,   139,    -1,   149,   138,   184,   135,   184,   139,
-      -1,   150,   138,   184,   135,   184,   139,    -1,    83,   152,
-     138,   184,   135,   184,   139,    -1,    84,   153,   138,   184,
-     135,   184,   139,    -1,   126,   138,   184,   135,   184,   139,
-      -1,   127,   138,   184,   135,   184,   135,   184,   139,    -1,
-     128,   138,   184,   135,   184,   135,   184,   139,    -1,   186,
-     135,   184,    -1,   184,    -1,    29,    -1,    30,    -1,   189,
-      -1,    -1,   190,    -1,   189,   190,    -1,    -1,    28,   191,
-     206,    -1,    -1,    27,   192,   207,    -1,    53,    52,   196,
-      -1,    21,    -1,   158,    15,   178,    -1,   158,    15,    10,
-      -1,    -1,   160,   163,   187,   184,   193,   175,    -1,    -1,
-     160,   161,   163,   187,   184,   194,   175,    -1,    -1,   160,
-     162,   163,   187,   178,   195,   175,    -1,    46,   197,    -1,
-      49,   134,   198,    -1,    19,    -1,    47,   134,    19,    -1,
-      61,   134,    19,    -1,   140,   199,   142,    -1,   199,   135,
-      19,    -1,    19,    -1,    -1,   200,   135,   178,   168,   157,
-      -1,   178,   168,   157,    -1,   200,    -1,   200,   135,    34,
-      -1,    34,    -1,    -1,   166,   180,   159,   138,   201,   139,
-     170,   174,   171,    -1,    25,    -1,   145,    -1,   165,   163,
-     202,   203,    -1,    26,    -1,   146,    -1,   213,   205,    -1,
-     164,   163,   202,    -1,    -1,    54,    -1,     3,    -1,     4,
-      -1,     9,    -1,    23,    -1,    24,    -1,    35,    -1,    36,
-      -1,    22,    -1,   143,   186,   144,    -1,   185,    -1,    52,
-     208,    19,   135,    19,    -1,     7,    -1,     8,    -1,   156,
-      -1,   159,    -1,   210,    -1,   209,    -1,   178,   211,    -1,
-     213,   214,    -1,   204,   214,    -1,   215,   158,   216,    -1,
-     215,   218,    -1,    -1,    18,    -1,    62,   212,    -1,    62,
-      10,    -1,    63,    14,   211,    -1,    63,    11,   211,   135,
-      14,   211,   135,    14,   211,    -1,    64,   154,   211,   135,
-      14,   211,   140,   217,   142,    -1,    64,   154,   211,   135,
-      14,   211,   140,   142,    -1,    65,   166,   180,   211,   138,
-     220,   139,   170,    33,    14,   211,    66,    14,   211,    -1,
-      66,    -1,    67,    -1,   217,   154,   209,   135,    14,   211,
-      -1,   154,   209,   135,    14,   211,    -1,   158,   223,    -1,
-     178,   140,   211,   135,   211,   142,    -1,   219,   135,   140,
-     211,   135,   211,   142,    -1,   178,   211,   168,    -1,   220,
-     135,   178,   211,   168,    -1,    -1,    -1,   221,   135,   212,
-      -1,    51,    50,    -1,    50,    -1,   149,   178,   211,   135,
-     211,    -1,   150,   178,   211,   135,   211,    -1,    83,   152,
-     178,   211,   135,   211,    -1,    84,   153,   178,   211,   135,
-     211,    -1,   151,   212,    33,   178,    -1,   124,   212,   135,
-     212,   135,   212,    -1,   125,   212,   135,   178,    -1,   126,
-     212,   135,   212,    -1,   127,   212,   135,   212,   135,   212,
-      -1,   128,   212,   135,   212,   135,   212,    -1,   123,   219,
-      -1,   222,   166,   180,   211,   138,   220,   139,   170,    -1,
-     225,    -1,    32,    -1,    -1,   105,   178,   172,    -1,   105,
-     178,   135,    11,   211,   172,    -1,   106,   178,   172,    -1,
-     106,   178,   135,    11,   211,   172,    -1,   107,   212,    -1,
-     224,   108,   178,   211,    -1,   224,   109,   212,   135,   178,
-     211,    -1,   110,   178,   211,   221,    -1
+     169,   168,    -1,   129,    -1,   132,    -1,   168,    -1,    -1,
+     171,   170,    -1,    -1,    48,     4,    -1,    -1,   136,    48,
+       4,    -1,    31,    19,    -1,    -1,   174,    -1,    -1,   136,
+     177,   176,    -1,   174,    -1,    48,     4,    -1,    11,    -1,
+      12,    -1,    13,    -1,    14,    -1,    44,    -1,   178,    -1,
+     179,   137,    -1,   211,    -1,   138,     4,    -1,   179,   139,
+     183,   140,   171,    -1,    10,   139,   183,   140,   171,    -1,
+     141,     4,   142,   179,   143,    -1,   144,     4,   142,   179,
+     145,    -1,   146,   184,   147,    -1,   146,   147,    -1,   144,
+     146,   184,   147,   145,    -1,   144,   146,   147,   145,    -1,
+     179,   169,    -1,   179,    -1,    10,    -1,   180,    -1,   182,
+     136,   180,    -1,   182,    -1,   182,   136,    34,    -1,    34,
+      -1,    -1,   179,    -1,   184,   136,   179,    -1,   179,   141,
+     187,   143,    -1,   179,   141,   143,    -1,   179,   148,    19,
+      -1,   179,   144,   187,   145,    -1,   179,   146,   187,   147,
+      -1,   179,   146,   147,    -1,   179,   144,   146,   187,   147,
+     145,    -1,   179,   144,   146,   147,   145,    -1,   179,    35,
+      -1,   179,    36,    -1,   179,   211,    -1,   179,   186,    -1,
+     179,    22,    -1,   155,     3,    -1,   155,     5,    -1,   155,
+       4,    -1,   155,     6,    -1,    11,    23,    -1,    11,    24,
+      -1,   156,     9,    -1,   152,   139,   185,    33,   179,   140,
+      -1,   110,   139,   185,   222,   140,    -1,   124,   139,   185,
+     136,   185,   136,   185,   140,    -1,   150,   139,   185,   136,
+     185,   140,    -1,   151,   139,   185,   136,   185,   140,    -1,
+      83,   153,   139,   185,   136,   185,   140,    -1,    84,   154,
+     139,   185,   136,   185,   140,    -1,   126,   139,   185,   136,
+     185,   140,    -1,   127,   139,   185,   136,   185,   136,   185,
+     140,    -1,   128,   139,   185,   136,   185,   136,   185,   140,
+      -1,   187,   136,   185,    -1,   185,    -1,    29,    -1,    30,
+      -1,   190,    -1,    -1,   191,    -1,   190,   191,    -1,    -1,
+      28,   192,   207,    -1,    -1,    27,   193,   208,    -1,    53,
+      52,   197,    -1,    21,    -1,   159,    15,   179,    -1,   159,
+      15,    10,    -1,    -1,   161,   164,   188,   185,   194,   176,
+      -1,    -1,   161,   162,   164,   188,   185,   195,   176,    -1,
+      -1,   161,   163,   164,   188,   179,   196,   176,    -1,    46,
+     198,    -1,    49,   135,   199,    -1,    19,    -1,    47,   135,
+      19,    -1,    61,   135,    19,    -1,   141,   200,   143,    -1,
+     200,   136,    19,    -1,    19,    -1,    -1,   201,   136,   179,
+     169,   158,    -1,   179,   169,   158,    -1,   201,    -1,   201,
+     136,    34,    -1,    34,    -1,    -1,   167,   181,   160,   139,
+     202,   140,   171,   175,   172,    -1,    25,    -1,   146,    -1,
+     166,   164,   203,   204,    -1,    26,    -1,   147,    -1,   214,
+     206,    -1,   165,   164,   203,    -1,    -1,    54,    -1,     3,
+      -1,     4,    -1,     9,    -1,    23,    -1,    24,    -1,    35,
+      -1,    36,    -1,    22,    -1,   144,   187,   145,    -1,   186,
+      -1,    52,   209,    19,   136,    19,    -1,     7,    -1,     8,
+      -1,   157,    -1,   160,    -1,   211,    -1,   210,    -1,   179,
+     212,    -1,   214,   215,    -1,   205,   215,    -1,   216,   159,
+     217,    -1,   216,   219,    -1,    -1,    18,    -1,    62,   213,
+      -1,    62,    10,    -1,    63,    14,   212,    -1,    63,    11,
+     212,   136,    14,   212,   136,    14,   212,    -1,    64,   155,
+     212,   136,    14,   212,   141,   218,   143,    -1,    64,   155,
+     212,   136,    14,   212,   141,   143,    -1,    65,   167,   181,
+     212,   139,   221,   140,   171,    33,    14,   212,    66,    14,
+     212,    -1,    66,    -1,    67,    -1,   218,   155,   210,   136,
+      14,   212,    -1,   155,   210,   136,    14,   212,    -1,   159,
+     224,    -1,   179,   141,   212,   136,   212,   143,    -1,   220,
+     136,   141,   212,   136,   212,   143,    -1,   179,   212,   169,
+      -1,   221,   136,   179,   212,   169,    -1,    -1,    -1,   222,
+     136,   213,    -1,    51,    50,    -1,    50,    -1,   150,   179,
+     212,   136,   212,    -1,   151,   179,   212,   136,   212,    -1,
+      83,   153,   179,   212,   136,   212,    -1,    84,   154,   179,
+     212,   136,   212,    -1,   152,   213,    33,   179,    -1,   124,
+     213,   136,   213,   136,   213,    -1,   125,   213,   136,   179,
+      -1,   126,   213,   136,   213,    -1,   127,   213,   136,   213,
+     136,   213,    -1,   128,   213,   136,   213,   136,   213,    -1,
+     123,   220,    -1,   223,   167,   181,   212,   139,   221,   140,
+     171,    -1,   226,    -1,    32,    -1,    -1,   105,   179,   173,
+      -1,   105,   179,   136,    11,   212,   173,    -1,   106,   179,
+     173,    -1,   106,   179,   136,    11,   212,   173,    -1,   107,
+     213,    -1,   225,   108,   179,   212,    -1,   225,   109,   213,
+     136,   179,   212,    -1,   110,   179,   212,   222,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -1697,25 +1699,25 @@
     1151,  1152,  1153,  1157,  1158,  1159,  1163,  1164,  1168,  1169,
     1170,  1174,  1175,  1176,  1177,  1178,  1181,  1182,  1183,  1184,
     1185,  1186,  1187,  1194,  1195,  1196,  1197,  1200,  1201,  1206,
-    1207,  1210,  1211,  1218,  1219,  1225,  1226,  1234,  1242,  1243,
-    1248,  1249,  1250,  1255,  1268,  1268,  1268,  1268,  1271,  1275,
-    1279,  1286,  1291,  1299,  1318,  1337,  1342,  1354,  1364,  1368,
-    1378,  1385,  1392,  1399,  1404,  1409,  1416,  1417,  1424,  1431,
-    1439,  1445,  1457,  1485,  1501,  1530,  1558,  1583,  1602,  1628,
-    1648,  1660,  1667,  1733,  1743,  1753,  1759,  1769,  1775,  1785,
-    1790,  1795,  1803,  1815,  1837,  1845,  1851,  1862,  1867,  1872,
-    1878,  1884,  1893,  1897,  1905,  1905,  1916,  1921,  1929,  1930,
-    1934,  1934,  1938,  1938,  1941,  1944,  1956,  1980,  1991,  1991,
-    2001,  2001,  2009,  2009,  2019,  2022,  2028,  2041,  2045,  2050,
-    2052,  2057,  2062,  2071,  2081,  2092,  2096,  2105,  2114,  2119,
-    2231,  2231,  2233,  2242,  2242,  2244,  2249,  2261,  2265,  2270,
-    2274,  2278,  2282,  2286,  2290,  2294,  2298,  2302,  2327,  2331,
-    2345,  2349,  2353,  2357,  2363,  2363,  2369,  2378,  2382,  2391,
-    2400,  2409,  2413,  2418,  2422,  2426,  2431,  2441,  2460,  2469,
-    2538,  2542,  2549,  2560,  2573,  2583,  2594,  2604,  2613,  2622,
-    2625,  2626,  2633,  2637,  2642,  2663,  2680,  2694,  2708,  2720,
-    2728,  2735,  2741,  2747,  2753,  2768,  2832,  2837,  2841,  2848,
-    2855,  2863,  2870,  2878,  2886,  2900,  2917
+    1207,  1208,  1211,  1212,  1219,  1220,  1226,  1227,  1235,  1243,
+    1244,  1249,  1250,  1251,  1256,  1269,  1269,  1269,  1269,  1272,
+    1276,  1280,  1287,  1292,  1300,  1319,  1338,  1343,  1355,  1365,
+    1369,  1379,  1386,  1393,  1400,  1405,  1410,  1417,  1418,  1425,
+    1432,  1440,  1446,  1458,  1486,  1502,  1531,  1559,  1584,  1603,
+    1629,  1649,  1661,  1668,  1734,  1744,  1754,  1760,  1770,  1776,
+    1786,  1791,  1796,  1804,  1816,  1838,  1846,  1852,  1863,  1868,
+    1873,  1879,  1885,  1894,  1898,  1906,  1906,  1917,  1922,  1930,
+    1931,  1935,  1935,  1939,  1939,  1942,  1945,  1957,  1981,  1992,
+    1992,  2002,  2002,  2010,  2010,  2020,  2023,  2029,  2042,  2046,
+    2051,  2053,  2058,  2063,  2072,  2082,  2093,  2097,  2106,  2115,
+    2120,  2232,  2232,  2234,  2243,  2243,  2245,  2250,  2262,  2266,
+    2271,  2275,  2279,  2283,  2287,  2291,  2295,  2299,  2303,  2328,
+    2332,  2346,  2350,  2354,  2358,  2364,  2364,  2370,  2379,  2383,
+    2392,  2401,  2410,  2414,  2419,  2423,  2427,  2432,  2442,  2461,
+    2470,  2539,  2543,  2550,  2561,  2574,  2584,  2595,  2605,  2614,
+    2623,  2626,  2627,  2634,  2638,  2643,  2664,  2681,  2695,  2709,
+    2721,  2729,  2736,  2742,  2748,  2754,  2769,  2833,  2838,  2842,
+    2849,  2856,  2864,  2871,  2879,  2887,  2901,  2918
 };
 #endif
 
@@ -1743,22 +1745,22 @@
   "LOAD", "STORE", "GETELEMENTPTR", "TRUNC", "ZEXT", "SEXT", "FPTRUNC",
   "FPEXT", "BITCAST", "UITOFP", "SITOFP", "FPTOUI", "FPTOSI", "INTTOPTR",
   "PTRTOINT", "PHI_TOK", "SELECT", "VAARG", "EXTRACTELEMENT",
-  "INSERTELEMENT", "SHUFFLEVECTOR", "NORETURN", "INREG", "SRET", "DEFAULT",
-  "HIDDEN", "'='", "','", "'*'", "'\\\\'", "'('", "')'", "'['", "'x'",
-  "']'", "'<'", "'>'", "'{'", "'}'", "'c'", "$accept", "ArithmeticOps",
-  "LogicalOps", "CastOps", "IPredicates", "FPredicates", "IntType",
-  "FPType", "LocalName", "OptLocalName", "OptLocalAssign", "GlobalName",
-  "OptGlobalAssign", "GVInternalLinkage", "GVExternalLinkage",
-  "GVVisibilityStyle", "FunctionDeclareLinkage", "FunctionDefineLinkage",
-  "OptCallingConv", "ParamAttr", "OptParamAttrs", "FuncAttr",
-  "OptFuncAttrs", "OptAlign", "OptCAlign", "SectionString", "OptSection",
-  "GlobalVarAttributes", "GlobalVarAttribute", "PrimType", "Types",
-  "ArgType", "ResultTypes", "ArgTypeList", "ArgTypeListI", "TypeListI",
-  "ConstVal", "ConstExpr", "ConstVector", "GlobalType", "Module",
-  "DefinitionList", "Definition", "@1", "@2", "@3", "@4", "@5", "AsmBlock",
-  "TargetDefinition", "LibrariesDefinition", "LibList", "ArgListH",
-  "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader", "END",
-  "Function", "FunctionProto", "OptSideEffect", "ConstValueRef",
+  "INSERTELEMENT", "SHUFFLEVECTOR", "NORETURN", "INREG", "SRET",
+  "NOUNWIND", "DEFAULT", "HIDDEN", "'='", "','", "'*'", "'\\\\'", "'('",
+  "')'", "'['", "'x'", "']'", "'<'", "'>'", "'{'", "'}'", "'c'", "$accept",
+  "ArithmeticOps", "LogicalOps", "CastOps", "IPredicates", "FPredicates",
+  "IntType", "FPType", "LocalName", "OptLocalName", "OptLocalAssign",
+  "GlobalName", "OptGlobalAssign", "GVInternalLinkage",
+  "GVExternalLinkage", "GVVisibilityStyle", "FunctionDeclareLinkage",
+  "FunctionDefineLinkage", "OptCallingConv", "ParamAttr", "OptParamAttrs",
+  "FuncAttr", "OptFuncAttrs", "OptAlign", "OptCAlign", "SectionString",
+  "OptSection", "GlobalVarAttributes", "GlobalVarAttribute", "PrimType",
+  "Types", "ArgType", "ResultTypes", "ArgTypeList", "ArgTypeListI",
+  "TypeListI", "ConstVal", "ConstExpr", "ConstVector", "GlobalType",
+  "Module", "DefinitionList", "Definition", "@1", "@2", "@3", "@4", "@5",
+  "AsmBlock", "TargetDefinition", "LibrariesDefinition", "LibList",
+  "ArgListH", "ArgList", "FunctionHeaderH", "BEGIN", "FunctionHeader",
+  "END", "Function", "FunctionProto", "OptSideEffect", "ConstValueRef",
   "SymbolicValueRef", "ValueRef", "ResolvedVal", "BasicBlockList",
   "BasicBlock", "InstructionList", "BBTerminatorInst", "JumpTable", "Inst",
   "PHIList", "ValueRefList", "IndexList", "OptTailCall", "InstVal",
@@ -1784,43 +1786,43 @@
      355,   356,   357,   358,   359,   360,   361,   362,   363,   364,
      365,   366,   367,   368,   369,   370,   371,   372,   373,   374,
      375,   376,   377,   378,   379,   380,   381,   382,   383,   384,
-     385,   386,   387,   388,    61,    44,    42,    92,    40,    41,
-      91,   120,    93,    60,    62,   123,   125,    99
+     385,   386,   387,   388,   389,    61,    44,    42,    92,    40,
+      41,    91,   120,    93,    60,    62,   123,   125,    99
 };
 # endif
 
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const unsigned char yyr1[] =
 {
-       0,   148,   149,   149,   149,   149,   149,   149,   149,   149,
-     149,   150,   150,   150,   150,   150,   150,   151,   151,   151,
-     151,   151,   151,   151,   151,   151,   151,   151,   151,   152,
+       0,   149,   150,   150,   150,   150,   150,   150,   150,   150,
+     150,   151,   151,   151,   151,   151,   151,   152,   152,   152,
      152,   152,   152,   152,   152,   152,   152,   152,   152,   153,
-     153,   153,   153,   153,   153,   153,   153,   153,   153,   153,
-     153,   153,   153,   153,   153,   154,   155,   155,   156,   156,
-     157,   157,   158,   158,   159,   159,   160,   160,   161,   161,
-     161,   161,   161,   162,   162,   162,   163,   163,   164,   164,
-     164,   165,   165,   165,   165,   165,   166,   166,   166,   166,
-     166,   166,   166,   167,   167,   167,   167,   168,   168,   169,
-     169,   170,   170,   171,   171,   172,   172,   173,   174,   174,
-     175,   175,   176,   176,   177,   177,   177,   177,   178,   178,
-     178,   178,   178,   178,   178,   178,   178,   178,   178,   178,
-     178,   179,   180,   180,   181,   181,   182,   182,   182,   182,
-     183,   183,   184,   184,   184,   184,   184,   184,   184,   184,
-     184,   184,   184,   184,   184,   184,   184,   184,   184,   184,
-     184,   184,   185,   185,   185,   185,   185,   185,   185,   185,
-     185,   185,   186,   186,   187,   187,   188,   188,   189,   189,
-     191,   190,   192,   190,   190,   190,   190,   190,   193,   190,
-     194,   190,   195,   190,   190,   190,   196,   197,   197,   198,
-     199,   199,   199,   200,   200,   201,   201,   201,   201,   202,
-     203,   203,   204,   205,   205,   206,   207,   208,   208,   209,
-     209,   209,   209,   209,   209,   209,   209,   209,   209,   209,
-     210,   210,   210,   210,   211,   211,   212,   213,   213,   214,
-     215,   215,   215,   216,   216,   216,   216,   216,   216,   216,
-     216,   216,   217,   217,   218,   219,   219,   220,   220,   220,
-     221,   221,   222,   222,   223,   223,   223,   223,   223,   223,
-     223,   223,   223,   223,   223,   223,   223,   224,   224,   225,
-     225,   225,   225,   225,   225,   225,   225
+     153,   153,   153,   153,   153,   153,   153,   153,   153,   154,
+     154,   154,   154,   154,   154,   154,   154,   154,   154,   154,
+     154,   154,   154,   154,   154,   155,   156,   156,   157,   157,
+     158,   158,   159,   159,   160,   160,   161,   161,   162,   162,
+     162,   162,   162,   163,   163,   163,   164,   164,   165,   165,
+     165,   166,   166,   166,   166,   166,   167,   167,   167,   167,
+     167,   167,   167,   168,   168,   168,   168,   169,   169,   170,
+     170,   170,   171,   171,   172,   172,   173,   173,   174,   175,
+     175,   176,   176,   177,   177,   178,   178,   178,   178,   179,
+     179,   179,   179,   179,   179,   179,   179,   179,   179,   179,
+     179,   179,   180,   181,   181,   182,   182,   183,   183,   183,
+     183,   184,   184,   185,   185,   185,   185,   185,   185,   185,
+     185,   185,   185,   185,   185,   185,   185,   185,   185,   185,
+     185,   185,   185,   186,   186,   186,   186,   186,   186,   186,
+     186,   186,   186,   187,   187,   188,   188,   189,   189,   190,
+     190,   192,   191,   193,   191,   191,   191,   191,   191,   194,
+     191,   195,   191,   196,   191,   191,   191,   197,   198,   198,
+     199,   200,   200,   200,   201,   201,   202,   202,   202,   202,
+     203,   204,   204,   205,   206,   206,   207,   208,   209,   209,
+     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
+     210,   211,   211,   211,   211,   212,   212,   213,   214,   214,
+     215,   216,   216,   216,   217,   217,   217,   217,   217,   217,
+     217,   217,   217,   218,   218,   219,   220,   220,   221,   221,
+     221,   222,   222,   223,   223,   224,   224,   224,   224,   224,
+     224,   224,   224,   224,   224,   224,   224,   224,   225,   225,
+     226,   226,   226,   226,   226,   226,   226,   226
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -1836,25 +1838,25 @@
        1,     1,     1,     1,     1,     1,     0,     1,     0,     1,
        1,     0,     1,     1,     1,     1,     0,     1,     1,     1,
        1,     1,     2,     1,     1,     1,     1,     0,     2,     1,
-       1,     0,     2,     0,     2,     0,     3,     2,     0,     1,
-       0,     3,     1,     2,     1,     1,     1,     1,     1,     1,
-       2,     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,     6,
-       8,     8,     3,     1,     1,     1,     1,     0,     1,     2,
-       0,     3,     0,     3,     3,     1,     3,     3,     0,     6,
-       0,     7,     0,     7,     2,     3,     1,     3,     3,     3,
-       3,     1,     0,     5,     3,     1,     3,     1,     0,     9,
-       1,     1,     4,     1,     1,     2,     3,     0,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     3,     1,     5,
-       1,     1,     1,     1,     1,     1,     2,     2,     2,     3,
-       2,     0,     1,     2,     2,     3,     9,     9,     8,    14,
-       1,     1,     6,     5,     2,     6,     7,     3,     5,     0,
-       0,     3,     2,     1,     5,     5,     6,     6,     4,     6,
-       4,     4,     6,     6,     2,     8,     1,     1,     0,     3,
-       6,     3,     6,     2,     4,     6,     4
+       1,     1,     0,     2,     0,     2,     0,     3,     2,     0,
+       1,     0,     3,     1,     2,     1,     1,     1,     1,     1,
+       1,     2,     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,
+       6,     8,     8,     3,     1,     1,     1,     1,     0,     1,
+       2,     0,     3,     0,     3,     3,     1,     3,     3,     0,
+       6,     0,     7,     0,     7,     2,     3,     1,     3,     3,
+       3,     3,     1,     0,     5,     3,     1,     3,     1,     0,
+       9,     1,     1,     4,     1,     1,     2,     3,     0,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     3,     1,
+       5,     1,     1,     1,     1,     1,     1,     2,     2,     2,
+       3,     2,     0,     1,     2,     2,     3,     9,     9,     8,
+      14,     1,     1,     6,     5,     2,     6,     7,     3,     5,
+       0,     0,     3,     2,     1,     5,     5,     6,     6,     4,
+       6,     4,     4,     6,     6,     2,     8,     1,     1,     0,
+       3,     6,     3,     6,     2,     4,     6,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1862,450 +1864,452 @@
    means the default is an error.  */
 static const unsigned short int yydefact[] =
 {
-      67,    58,    64,    59,    65,   185,   182,   180,     0,     0,
-       0,     0,     0,     0,    76,     0,    67,   178,    78,    81,
-       0,     0,   194,     0,     0,    62,     0,    66,    68,    70,
+      67,    58,    64,    59,    65,   186,   183,   181,     0,     0,
+       0,     0,     0,     0,    76,     0,    67,   179,    78,    81,
+       0,     0,   195,     0,     0,    62,     0,    66,    68,    70,
       69,    71,    73,    72,    74,    75,    77,    76,    76,     0,
-       1,   179,    79,    80,    76,   183,    82,    83,    84,    85,
-      76,   241,   181,   241,     0,     0,   202,   195,   196,   184,
-     230,   231,   187,   114,   115,   116,   117,   118,     0,     0,
-       0,     0,   232,   233,   119,   186,   121,     0,     0,   174,
-     175,     0,    86,    86,   242,   238,    63,   213,   214,   215,
-     237,   197,   198,   201,     0,   139,   122,     0,     0,     0,
-       0,   128,   140,     0,   120,   139,     0,     0,   114,   115,
-     116,     0,     0,     0,   188,     0,    87,    88,    89,    90,
-      91,     0,   216,     0,   278,   240,     0,   199,   138,    97,
-     134,   136,     0,     0,     0,     0,     0,     0,   127,     0,
-     190,   192,   159,   160,   155,   157,   156,   158,   161,   154,
-     150,   151,     2,     3,     4,     5,     6,     7,     8,     9,
+       1,   180,    79,    80,    76,   184,    82,    83,    84,    85,
+      76,   242,   182,   242,     0,     0,   203,   196,   197,   185,
+     231,   232,   188,   115,   116,   117,   118,   119,     0,     0,
+       0,     0,   233,   234,   120,   187,   122,     0,     0,   175,
+     176,     0,    86,    86,   243,   239,    63,   214,   215,   216,
+     238,   198,   199,   202,     0,   140,   123,     0,     0,     0,
+       0,   129,   141,     0,   121,   140,     0,     0,   115,   116,
+     117,     0,     0,     0,   189,     0,    87,    88,    89,    90,
+      91,     0,   217,     0,   279,   241,     0,   200,   139,    97,
+     135,   137,     0,     0,     0,     0,     0,     0,   128,     0,
+     191,   193,   160,   161,   156,   158,   157,   159,   162,   155,
+     151,   152,     2,     3,     4,     5,     6,     7,     8,     9,
       10,    14,    15,    16,    11,    12,    13,     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,   153,   152,   110,    92,   133,   132,     0,
-     210,   211,   212,   277,   263,     0,     0,     0,     0,    86,
-     250,   251,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   239,    86,   254,
-       0,   276,   200,   131,     0,   101,     0,     0,   130,     0,
-     141,   101,   110,   110,    29,    30,    31,    32,    33,    34,
+       0,     0,     0,   154,   153,   111,    92,   134,   133,     0,
+     211,   212,   213,   278,   264,     0,     0,     0,     0,    86,
+     251,   252,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   240,    86,   255,
+       0,   277,   201,   132,     0,   102,     0,     0,   131,     0,
+     142,   102,   111,   111,    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,     0,     0,     0,   143,   173,     0,
-       0,     0,   147,     0,   144,     0,     0,     0,     0,   189,
-       0,   262,   244,     0,   243,     0,     0,    55,     0,     0,
-       0,     0,   105,   105,   283,     0,     0,   274,     0,     0,
+      48,     0,     0,     0,     0,     0,     0,   144,   174,     0,
+       0,     0,   148,     0,   145,     0,     0,     0,     0,   190,
+       0,   263,   245,     0,   244,     0,     0,    55,     0,     0,
+       0,     0,   106,   106,   284,     0,     0,   275,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    93,
-      94,    95,    96,    98,   137,   135,   124,   125,   126,   129,
-     123,   191,   193,     0,     0,   260,     0,     0,     0,     0,
-       0,   142,   128,   140,     0,   145,   146,     0,     0,     0,
-       0,     0,   112,   110,   208,   219,   220,   221,   226,   222,
-     223,   224,   225,   217,     0,   228,   235,   234,   236,     0,
-     245,     0,     0,     0,     0,     0,   279,     0,   281,   260,
+      94,    95,    96,    98,   138,   136,   125,   126,   127,   130,
+     124,   192,   194,     0,     0,   261,     0,     0,     0,     0,
+       0,   143,   129,   141,     0,   146,   147,     0,     0,     0,
+       0,     0,   113,   111,   209,   220,   221,   222,   227,   223,
+     224,   225,   226,   218,     0,   229,   236,   235,   237,     0,
+     246,     0,     0,     0,     0,     0,   280,     0,   282,   261,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,    99,   100,   102,     0,     0,     0,     0,
-       0,     0,     0,   172,   149,     0,     0,     0,     0,   107,
-     113,   111,   207,    97,   205,     0,   218,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   286,     0,     0,
-       0,   270,   271,     0,     0,     0,     0,   268,     0,   284,
-       0,     0,     0,     0,   163,     0,     0,     0,     0,   148,
-       0,     0,     0,    61,     0,   101,     0,   227,     0,     0,
-     259,     0,     0,   105,   106,   105,     0,     0,     0,     0,
-       0,   264,   265,   259,     0,     0,     0,   261,     0,   169,
-       0,     0,   165,   166,   162,    60,   204,   206,    97,   108,
-       0,     0,     0,     0,     0,   266,   267,     0,   280,   282,
-       0,     0,   269,   272,   273,     0,   285,   167,   168,     0,
-       0,     0,    61,   109,   103,   229,     0,     0,    97,     0,
-     101,   255,     0,   101,   164,   170,   171,   203,     0,   209,
-       0,   248,     0,     0,   257,     0,     0,   256,   275,   104,
-     246,     0,   247,     0,    97,     0,     0,     0,   258,     0,
-       0,     0,     0,   253,     0,     0,   252,     0,   249
+       0,     0,     0,    99,   100,   101,   103,     0,     0,     0,
+       0,     0,     0,     0,   173,   150,     0,     0,     0,     0,
+     108,   114,   112,   208,    97,   206,     0,   219,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   287,     0,
+       0,     0,   271,   272,     0,     0,     0,     0,   269,     0,
+     285,     0,     0,     0,     0,   164,     0,     0,     0,     0,
+     149,     0,     0,     0,    61,     0,   102,     0,   228,     0,
+       0,   260,     0,     0,   106,   107,   106,     0,     0,     0,
+       0,     0,   265,   266,   260,     0,     0,     0,   262,     0,
+     170,     0,     0,   166,   167,   163,    60,   205,   207,    97,
+     109,     0,     0,     0,     0,     0,   267,   268,     0,   281,
+     283,     0,     0,   270,   273,   274,     0,   286,   168,   169,
+       0,     0,     0,    61,   110,   104,   230,     0,     0,    97,
+       0,   102,   256,     0,   102,   165,   171,   172,   204,     0,
+     210,     0,   249,     0,     0,   258,     0,     0,   257,   276,
+     105,   247,     0,   248,     0,    97,     0,     0,     0,   259,
+       0,     0,     0,     0,   254,     0,     0,   253,     0,   250
 };
 
 /* YYDEFGOTO[NTERM-NUM]. */
 static const short int yydefgoto[] =
 {
-      -1,   190,   191,   192,   254,   271,   111,   112,    72,   486,
+      -1,   190,   191,   192,   254,   271,   111,   112,    72,   487,
       12,    73,    14,    37,    38,    39,    44,    50,   121,   323,
-     233,   395,   326,   529,   376,   352,   514,   289,   353,    74,
+     233,   396,   326,   530,   376,   352,   515,   289,   353,    74,
      113,   130,   199,   131,   132,   103,   278,   365,   279,    81,
       15,    16,    17,    19,    18,   195,   242,   243,    59,    22,
-      57,    94,   414,   415,   122,   202,    51,    89,    52,    45,
-     417,   366,    76,   368,   294,    53,    85,    86,   227,   533,
-     125,   307,   494,   398,   228,   229,   230,   231
+      57,    94,   415,   416,   122,   202,    51,    89,    52,    45,
+     418,   366,    76,   368,   294,    53,    85,    86,   227,   534,
+     125,   307,   495,   399,   228,   229,   230,   231
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -440
+#define YYPACT_NINF -472
 static const short int yypact[] =
 {
-     406,  -440,  -440,  -440,  -440,  -440,  -440,  -440,    -2,  -101,
-      21,   -55,    80,   -20,    15,   132,   556,  -440,   253,   197,
-      -7,    87,  -440,    20,   207,  -440,   893,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,  -440,  -440,    97,    97,   125,
-    -440,  -440,  -440,  -440,    97,  -440,  -440,  -440,  -440,  -440,
-      97,   235,  -440,     6,   240,   248,   258,  -440,  -440,  -440,
-    -440,  -440,   134,  -440,  -440,  -440,  -440,  -440,   269,   277,
-      11,   123,  -440,  -440,  -440,    33,  -440,   125,   125,  -440,
-    -440,  1055,   128,   128,  -440,  -440,    47,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,   -57,   939,  -440,   154,   156,   488,
-     134,  -440,    33,  -112,  -440,   939,  1055,  1149,    38,   281,
-     289,   239,   293,   850,  -440,   299,  -440,  -440,  -440,  -440,
-    -440,  1168,  -440,     2,  1301,  -440,   285,  -440,  -440,    33,
-    -440,   170,   167,  1149,  1149,   164,   -97,  1149,  -440,   171,
-    -440,    33,  -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,  -440,  -440,   254,   446,   174,
-    -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,
-    -440,  -440,   175,   176,   177,   178,   109,  1203,   676,   290,
-     181,   182,   183,  -440,  -440,   187,  -440,   134,    33,    93,
-    -440,  -440,  -440,  -440,  -440,   273,  1217,   127,   313,   128,
-    -440,  -440,   254,   446,  1149,  1149,  1149,  1149,  1149,  1149,
-    1149,  1149,  1149,  1149,  1149,  1149,  1149,  -440,   128,  -440,
-      70,  -440,  -440,   -29,  1098,  -440,    72,   -39,  -440,   184,
-      33,  -440,   187,   187,  -440,  -440,  -440,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,   188,  -440,  -440,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,  -440,
-    -440,   196,  1055,  1055,  1055,  1055,  1055,  -440,  -440,    22,
-     771,   -44,  -440,   -59,  -440,  1055,  1055,  1055,    -9,  -440,
-     198,  -440,   134,   591,  -440,   728,   728,  -440,   728,  1168,
-    1149,  1149,   112,   147,  -440,   591,    75,   190,   200,   214,
-     215,   217,   219,   591,   591,   322,  1168,  1149,  1149,  -440,
-    -440,  -440,  -440,  -440,  -440,  -440,   -41,  -440,  -440,  -440,
-     -41,  -440,  -440,  1055,  1055,  -440,   230,   231,   232,   233,
-    1055,  -440,   225,   850,   -43,  -440,  -440,   236,   241,   337,
-     355,   371,  -440,   187,  1114,  -440,  -440,  -440,  -440,  -440,
-    -440,  -440,  -440,   323,  1055,  -440,  -440,  -440,  -440,   243,
-    -440,   244,   728,   591,   591,    17,  -440,    19,  -440,  -440,
-     728,   242,  1149,  1149,  1149,  1149,  1149,   245,   246,  1149,
-     728,   591,   249,  -440,  -440,  -440,   252,   255,   -24,  1055,
-    1055,  1055,  1055,  -440,  -440,   247,  1055,  1055,  1149,  -440,
-    -440,  -440,  -440,    33,   257,   260,  -440,   375,   -37,   383,
-     386,   264,   268,   272,   728,   400,   728,   275,   282,   728,
-     284,    33,  -440,   295,   296,   728,   728,    33,   270,  -440,
-    1149,  1055,  1055,  1149,  -440,   297,   298,   301,   303,  -440,
-     300,   302,   150,    32,  1133,  -440,   305,  -440,   728,   728,
-    1149,   728,   728,   307,  -440,   307,   728,   311,  1149,  1149,
-    1149,  -440,  -440,  1149,   591,   308,   310,  -440,  1055,  -440,
-    1055,  1055,  -440,  -440,  -440,  -440,  -440,  -440,    33,    46,
-     397,   315,   314,   591,    26,  -440,  -440,   376,  -440,  -440,
-     309,   728,  -440,  -440,  -440,    89,  -440,  -440,  -440,   317,
-     319,   321,    32,  -440,   413,  -440,   449,     7,  -440,  1149,
-    -440,  -440,   324,  -440,  -440,  -440,  -440,  -440,   460,  -440,
-     728,  -440,   976,     9,   -29,   591,   149,  -440,   -41,  -440,
-    -440,   330,  -440,   976,  -440,   453,   454,   336,   -29,   728,
-     728,   461,   412,  -440,   728,   465,  -440,   728,  -440
+      44,  -472,  -472,  -472,  -472,  -472,  -472,  -472,    -9,   -93,
+      25,   -40,    89,    40,   303,   124,   406,  -472,   137,   199,
+      48,    73,  -472,    72,   147,  -472,  1101,  -472,  -472,  -472,
+    -472,  -472,  -472,  -472,  -472,  -472,  -472,    86,    86,   110,
+    -472,  -472,  -472,  -472,    86,  -472,  -472,  -472,  -472,  -472,
+      86,   215,  -472,     9,   216,   228,   233,  -472,  -472,  -472,
+    -472,  -472,   118,  -472,  -472,  -472,  -472,  -472,   250,   254,
+       4,   115,  -472,  -472,  -472,    88,  -472,   110,   110,  -472,
+    -472,  1115,   310,   310,  -472,  -472,    31,  -472,  -472,  -472,
+    -472,  -472,  -472,  -472,   -22,   955,  -472,   135,   138,   141,
+     118,  -472,    88,  -102,  -472,   955,  1115,  1153,    52,   251,
+     269,   239,   272,   739,  -472,   280,  -472,  -472,  -472,  -472,
+    -472,  1167,  -472,    -8,  1306,  -472,   270,  -472,  -472,    88,
+    -472,   154,   155,  1153,  1153,   156,   -55,  1153,  -472,   164,
+    -472,    88,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
+    -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
+    -472,  -472,  -472,  -472,  -472,  -472,  -472,   289,   447,   166,
+    -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
+    -472,  -472,   168,   169,   170,   171,   995,  1206,   491,   292,
+     174,   175,   176,  -472,  -472,   182,  -472,   118,    88,    49,
+    -472,  -472,  -472,  -472,  -472,   273,  1221,   122,   313,   310,
+    -472,  -472,   289,   447,  1153,  1153,  1153,  1153,  1153,  1153,
+    1153,  1153,  1153,  1153,  1153,  1153,  1153,  -472,   310,  -472,
+      38,  -472,  -472,   -24,  1010,  -472,    34,   -26,  -472,   180,
+      88,  -472,   182,   182,  -472,  -472,  -472,  -472,  -472,  -472,
+    -472,  -472,  -472,  -472,   187,  -472,  -472,  -472,  -472,  -472,
+    -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
+    -472,   188,  1115,  1115,  1115,  1115,  1115,  -472,  -472,    -6,
+     909,  -104,  -472,   -42,  -472,  1115,  1115,  1115,   -11,  -472,
+     195,  -472,   118,   592,  -472,   718,   718,  -472,   718,  1167,
+    1153,  1153,   -21,    93,  -472,   592,    35,   200,   203,   211,
+     213,   214,   218,   592,   592,   302,  1167,  1153,  1153,  -472,
+    -472,  -472,  -472,  -472,  -472,  -472,   -29,  -472,  -472,  -472,
+     -29,  -472,  -472,  1115,  1115,  -472,   219,   235,   255,   256,
+    1115,  -472,   207,   739,   -37,  -472,  -472,   258,   261,   354,
+     371,   395,  -472,   182,  1050,  -472,  -472,  -472,  -472,  -472,
+    -472,  -472,  -472,   346,  1115,  -472,  -472,  -472,  -472,   266,
+    -472,   267,   718,   592,   592,    19,  -472,    20,  -472,  -472,
+     718,   263,  1153,  1153,  1153,  1153,  1153,   271,   274,  1153,
+     718,   592,   279,  -472,  -472,  -472,  -472,   281,   282,    29,
+    1115,  1115,  1115,  1115,  -472,  -472,   284,  1115,  1115,  1153,
+    -472,  -472,  -472,  -472,    88,   288,   268,  -472,   412,   -96,
+     418,   421,   299,   304,   305,   718,   435,   718,   306,   307,
+     718,   311,    88,  -472,   312,   314,   718,   718,    88,   317,
+    -472,  1153,  1115,  1115,  1153,  -472,   315,   318,   324,   325,
+    -472,   323,   326,   157,    32,  1066,  -472,   328,  -472,   718,
+     718,  1153,   718,   718,   329,  -472,   329,   718,   331,  1153,
+    1153,  1153,  -472,  -472,  1153,   592,   335,   338,  -472,  1115,
+    -472,  1115,  1115,  -472,  -472,  -472,  -472,  -472,  -472,    88,
+     136,   434,   332,   341,   592,    71,  -472,  -472,   431,  -472,
+    -472,   340,   718,  -472,  -472,  -472,    74,  -472,  -472,  -472,
+     345,   347,   348,    32,  -472,   438,  -472,   455,    -2,  -472,
+    1153,  -472,  -472,   349,  -472,  -472,  -472,  -472,  -472,   485,
+    -472,   718,  -472,   866,    -1,   -24,   592,   190,  -472,   -29,
+    -472,  -472,   357,  -472,   866,  -472,   480,   482,   361,   -24,
+     718,   718,   486,   440,  -472,   718,   495,  -472,   718,  -472
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const short int yypgoto[] =
 {
-    -440,   358,   359,   361,   274,   276,  -206,  -440,     0,   -19,
-     401,    13,  -440,  -440,  -440,    31,  -440,  -440,  -178,  -309,
-    -394,  -440,  -236,  -440,  -297,    -1,  -440,  -207,  -440,  -440,
-     -25,   263,  -252,  -440,   387,   404,   -69,  -110,  -162,   160,
-    -440,  -440,   490,  -440,  -440,  -440,  -440,  -440,  -440,  -440,
-    -440,  -440,  -440,  -440,   426,  -440,  -440,  -440,  -440,  -440,
-    -440,  -439,   -73,   100,  -212,  -440,   457,  -440,  -440,  -440,
-    -440,  -440,    40,   135,  -440,  -440,  -440,  -440
+    -472,   388,   390,   391,   308,   309,  -206,  -472,     0,     3,
+     432,    13,  -472,  -472,  -472,    41,  -472,  -472,  -195,  -311,
+    -402,  -472,  -238,  -472,  -296,    27,  -472,  -189,  -472,  -472,
+     -25,   285,  -273,  -472,   416,   424,   -70,  -109,  -182,   173,
+    -472,  -472,   508,  -472,  -472,  -472,  -472,  -472,  -472,  -472,
+    -472,  -472,  -472,  -472,   443,  -472,  -472,  -472,  -472,  -472,
+    -472,  -471,   -74,   100,  -198,  -472,   475,  -472,  -472,  -472,
+    -472,  -472,    55,   152,  -472,  -472,  -472,  -472
 };
 
 /* 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 -178
+#define YYTABLE_NINF -179
 static const short int yytable[] =
 {
-      11,    75,   298,   193,   304,   330,   378,   308,   309,   310,
-     311,   312,   114,    13,   315,    98,    11,   394,   297,   453,
-     297,   394,   350,   137,    84,   281,   283,   200,   424,    13,
-     426,   299,    87,    23,   138,   331,   332,   140,   137,   351,
-     194,   -55,   -55,   -55,   -55,    20,   102,   372,     1,   239,
-     316,     3,    28,    29,    30,    31,    32,    33,    34,    21,
-      35,   142,   143,     1,   390,   425,     3,   425,    77,    78,
-     129,   319,   320,    24,   102,    82,   340,   350,   126,    25,
-     129,    83,   141,   319,   320,   127,    11,   346,   393,   321,
-     322,   340,   340,   541,   512,    26,   198,   104,   340,   105,
-     345,   321,   322,   405,   547,   328,   392,   457,   236,   237,
-       2,   443,   240,     4,    27,   444,    60,    61,   344,   100,
-     108,   109,   110,    66,   534,     1,     2,    54,     3,     4,
-      60,    61,    40,   100,    63,    64,    65,    66,   295,     1,
-       2,   296,     3,     4,   319,   320,   411,   201,    36,   531,
-     548,   542,    88,    67,    79,    80,    99,   340,   319,   320,
-      56,   519,   321,   322,   341,   520,   498,    67,   499,   104,
-     430,   105,   432,   433,   434,   393,   321,   322,   317,   318,
-     394,   293,   545,   115,   116,   117,   118,   119,   120,   302,
+      11,    75,   298,   330,   193,   281,   283,   378,    98,   297,
+     297,   114,   454,    13,   299,   395,    11,   200,   304,   395,
+     350,   308,   309,   310,   311,   312,   372,    84,   315,    13,
+     425,   427,   340,   316,   137,    87,   140,   351,    20,   194,
+     340,   345,    23,   390,  -178,   138,   102,     1,     1,   458,
+       3,     3,    21,   331,   332,   -55,   -55,   -55,   -55,   -63,
+       1,     2,   542,     3,     4,     5,     2,   426,   426,     4,
+     129,     6,     7,   548,   102,   142,   143,    24,    77,    78,
+     129,   137,   141,   319,   320,    82,    11,   513,   319,   320,
+       8,    83,   239,     9,   340,    25,   198,    10,   344,   340,
+     393,   321,   322,   394,    26,   346,   321,   322,   236,   237,
+     406,   104,   240,   105,   126,   375,   104,   535,   105,   328,
+     392,   127,    60,    61,    40,   100,    63,    64,    65,    66,
+     340,     1,     2,   295,     3,     4,   296,   341,   201,    79,
+      80,   532,   543,   549,   319,   320,   317,   318,    60,    61,
+      99,   100,    63,    64,    65,    66,    88,     1,     2,    67,
+       3,     4,   321,   322,   412,   444,    58,   350,   499,   445,
+     500,   104,   104,   105,   105,    27,   380,   327,    42,   395,
+      43,   293,   419,    54,   431,    67,   433,   434,   435,   302,
      303,   293,   305,   306,   293,   293,   293,   293,   293,   313,
-     314,   293,   418,   335,   336,   337,   338,   339,   104,   129,
-     105,   104,   290,   105,   327,   380,   347,   348,   349,   489,
-     367,    55,   367,   367,   519,   367,    58,   394,   523,   394,
-      36,   477,   367,   193,    46,    47,    48,   106,   107,    49,
-     367,   367,   144,   145,   146,   147,    68,   375,   104,    69,
-     105,   277,    70,    84,    71,   343,   502,   503,   504,    91,
-      68,   319,   320,    69,   396,   397,    70,    92,    71,   101,
-     194,   403,    95,    96,   198,   373,   374,    93,   393,   321,
-     322,    97,   377,   104,   536,   105,   104,   538,   105,   484,
-     -56,   198,   391,   293,    42,   133,    43,   134,   -57,   367,
-     367,   367,   148,   196,   232,   234,   235,   367,   238,   284,
-     241,   532,   272,   273,   274,   275,   276,   367,   367,   285,
-     286,   287,   288,   291,   297,   381,   333,   543,   329,   413,
-     445,   446,   447,   448,   334,   382,   354,   450,   451,   244,
-     245,   246,   247,   248,   249,   250,   251,   252,   253,   383,
-     384,   367,   385,   367,   386,   389,   367,   293,   431,   293,
-     293,   293,   367,   367,   437,   399,   400,   401,   402,   404,
-     408,   406,   475,   476,   409,   410,   407,   416,   419,   420,
-     435,   436,   429,   452,   440,   367,   367,   441,   367,   367,
-     442,   449,   454,   367,   456,   369,   370,   458,   371,   455,
-     459,   367,   460,   461,   464,   379,  -177,   462,   473,   509,
-     443,   510,   511,   387,   388,   474,   515,   466,   293,   468,
-     367,   -63,     1,     2,   425,     3,     4,     5,   367,   488,
-     469,   470,   478,     6,     7,   493,   480,   479,   481,   482,
-     490,   483,   497,   293,   293,   293,   501,   507,   493,   508,
-     516,   521,     8,   485,   517,     9,   524,   367,   525,    10,
-     526,   528,   367,   530,   539,   546,   537,   549,   550,   255,
-     256,   551,   421,   422,   423,   554,   367,   367,   555,   557,
-     428,   367,   224,   225,   367,   226,   300,   124,   513,   301,
-     438,   439,   139,   527,   535,    60,    61,   325,   100,    63,
-      64,    65,    66,   136,     1,     2,    41,     3,     4,   123,
-      90,     0,   485,   505,   427,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   463,     0,   465,     0,     0,   467,
-       0,     0,    67,     0,     0,   471,   472,   257,   258,   259,
-     260,   261,   262,   263,   264,   265,   266,   267,   268,   269,
-     270,     0,     0,     0,     0,     0,  -176,     0,   491,   492,
-       0,   495,   496,     0,     0,     0,   500,     0,     0,     0,
-       0,   -63,     1,     2,   506,     3,     4,     5,     0,     0,
-       0,     0,     0,     6,     7,     0,     0,     0,     0,     0,
-       0,     0,     0,   518,   355,   356,     0,     0,    60,    61,
-     357,   522,     8,     0,     0,     9,     0,     1,     2,    10,
-       3,     4,     0,   358,   359,   360,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,    68,   361,   362,    69,     0,
-     540,    70,     0,    71,   135,   544,     0,     0,     0,     0,
-       0,     0,     0,   363,     0,     0,     0,     0,     0,   552,
-     553,     0,     0,     0,   556,     0,     0,   558,     0,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   167,   168,     0,     0,     0,     0,
-       0,     0,     0,    60,    61,     0,   100,   108,   109,   110,
-      66,     0,     1,     2,     0,     3,     4,     0,     0,     0,
-       0,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,     0,   182,     0,   183,   184,   185,
-      67,     0,     0,     0,     0,     0,     0,   104,     0,   105,
-       0,   355,   356,     0,   364,    60,    61,   357,     0,     0,
-       0,     0,     0,     0,     1,     2,     0,     3,     4,     0,
-     358,   359,   360,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   361,   362,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,    60,    61,
-     363,   100,   108,   109,   110,    66,     0,     1,     2,     0,
-       3,     4,     0,     0,     0,     0,   152,   153,   154,   155,
+     314,   293,   335,   336,   337,   338,   339,   520,    55,   129,
+     520,   521,   290,    56,   524,   347,   348,   349,   490,   367,
+      36,   367,   367,   546,   367,   104,   395,   105,   395,   377,
+     104,   367,   105,    84,   193,    91,    46,    47,    48,   367,
+     367,    49,   144,   145,   146,   147,   478,    92,   319,   320,
+     106,   107,    93,    68,    96,   343,    69,    95,    97,    70,
+     -56,    71,   101,   397,   398,   393,   321,   322,   394,   194,
+     404,   503,   504,   505,   198,   373,   374,   133,   -57,    68,
+     134,   148,    69,   537,   196,    70,   539,    71,   135,   232,
+     234,   198,   391,   293,   104,   235,   105,   485,   367,   367,
+     367,   238,   319,   320,   241,   272,   367,   273,   274,   275,
+     276,   284,   533,   285,   286,   287,   367,   367,   288,   393,
+     321,   322,   394,   291,   297,   329,   333,   334,   544,   414,
+     446,   447,   448,   449,   354,   389,   381,   451,   452,   382,
+      28,    29,    30,    31,    32,    33,    34,   383,    35,   384,
+     385,   367,   405,   367,   386,   400,   367,   293,   432,   293,
+     293,   293,   367,   367,   438,   115,   116,   117,   118,   119,
+     120,   401,   476,   477,   244,   245,   246,   247,   248,   249,
+     250,   251,   252,   253,   453,   367,   367,   409,   367,   367,
+     410,   402,   403,   367,   407,   369,   370,   408,   371,   411,
+     417,   367,   420,   421,   430,   379,  -177,   436,   456,   510,
+     437,   511,   512,   387,   388,   441,   475,   442,   443,   293,
+     367,   -63,     1,     2,   455,     3,     4,     5,   367,   450,
+     489,   457,   459,     6,     7,   460,   494,    36,   461,   465,
+     462,   463,   444,   467,   293,   293,   293,   469,   470,   494,
+     471,   479,     8,   516,   486,     9,   474,   367,   480,    10,
+     481,   482,   367,   483,   491,   498,   484,   502,   517,   531,
+     255,   256,   422,   423,   424,   508,   367,   367,   509,   426,
+     429,   367,   518,   522,   367,   525,   529,   526,   527,   540,
+     439,   440,   538,   547,   550,   536,   551,   552,    60,    61,
+     555,   100,   108,   109,   110,    66,   556,     1,     2,   558,
+       3,     4,   224,   486,   225,   226,   528,   514,   124,   325,
+     300,   139,   301,   136,    41,   464,   123,   466,    90,   506,
+     468,   428,     0,     0,     0,    67,   472,   473,   257,   258,
+     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
+     269,   270,     0,     0,     0,     0,     0,     0,     0,   492,
+     493,     0,   496,   497,     0,     0,     0,   501,     0,     0,
+       0,     0,     0,     0,     0,   507,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   519,   355,   356,     0,     0,    60,
+      61,   357,   523,     0,     0,     0,     0,     0,     1,     2,
+       0,     3,     4,     0,   358,   359,   360,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   361,   362,    68,
+       0,   541,    69,     0,     0,    70,   545,    71,   282,     0,
+       0,     0,     0,     0,   363,     0,     0,     0,     0,     0,
+     553,   554,     0,     0,     0,   557,     0,     0,   559,     0,
+     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
+     162,   163,   164,   165,   166,   167,   168,     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,   169,   170,   171,   172,   173,   174,   175,   176,
+     177,   178,   179,   180,   181,     0,   182,     0,   183,   184,
+     185,   355,   356,     0,     0,    60,    61,   357,     0,   104,
+       0,   105,     0,     0,     1,     2,   364,     3,     4,     0,
+     358,   359,   360,     0,     0,     0,    60,    61,     0,     0,
+       0,     0,     0,   361,   362,     1,     2,     0,     3,     4,
+       0,   149,     0,     0,     0,     0,     0,     0,     0,     0,
+     363,     0,     0,     0,   150,   151,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   152,   153,   154,   155,
      156,   157,   158,   159,   160,   161,   162,   163,   164,   165,
-     166,   167,   168,    68,     0,    67,    69,     0,     0,    70,
-       0,    71,   282,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   169,   170,
+     166,   167,   168,     0,     0,     0,     0,   152,   153,   154,
+     155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
+     165,   166,   167,   168,     0,     0,     0,     0,   169,   170,
      171,   172,   173,   174,   175,   176,   177,   178,   179,   180,
-     181,     0,   182,     0,   183,   184,   185,    60,    61,     0,
-       0,     0,     0,     0,     0,     0,     1,     2,     0,     3,
-       4,   364,   149,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   150,   151,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      60,    61,     0,    62,    63,    64,    65,    66,    68,     1,
-       2,    69,     3,     4,    70,     0,    71,   342,   152,   153,
-     154,   155,   156,   157,   158,   159,   160,   161,   162,   163,
-     164,   165,   166,   167,   168,     0,     0,    67,     0,     0,
-       0,     0,     0,     0,     0,     0,    60,    61,     0,   100,
-      63,    64,    65,    66,     0,     1,     2,     0,     3,     4,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   128,   182,     0,   183,   184,   185,   355,
-     356,     0,     0,    67,     0,   357,   104,     0,   105,     0,
+     181,     0,   182,     0,   183,   184,   185,     0,     0,   169,
+     170,   171,   172,   173,   174,   175,   176,   177,   178,   179,
+     180,   181,   364,   182,     0,   183,   184,   185,     0,   355,
+     356,     0,     0,     0,     0,   357,   104,     0,   105,     0,
      186,     0,     0,   187,     0,   188,     0,   189,   358,   359,
      360,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,   361,   362,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   363,     0,
-      68,     0,     0,    69,     0,     0,    70,     0,    71,     0,
+       0,     0,     0,     0,     0,     0,    60,    61,   363,   100,
+     108,   109,   110,    66,     0,     1,     2,     0,     3,     4,
        0,     0,     0,     0,   152,   153,   154,   155,   156,   157,
      158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
-     168,     0,    60,    61,     0,   100,   108,   109,   110,    66,
-       0,     1,     2,     0,     3,     4,    68,     0,     0,    69,
-       0,     0,    70,     0,    71,     0,   169,   170,   171,   172,
-     173,   174,   175,   176,   177,   178,   179,   180,   181,    67,
-     182,     0,   183,   184,   185,    60,    61,     0,   100,    63,
-      64,    65,    66,     0,     1,     2,     0,     3,     4,   364,
-       0,    60,    61,     0,   100,    63,    64,    65,    66,     0,
-       1,     2,   324,     3,     4,     0,     0,     0,     0,     0,
-      60,    61,    67,   100,    63,    64,    65,    66,   412,     1,
-       2,     0,     3,     4,     0,     0,    60,    61,    67,   100,
-      63,    64,    65,    66,     0,     1,     2,   487,     3,     4,
-       0,     0,     0,     0,     0,    60,    61,    67,   197,    63,
-      64,    65,    66,     0,     1,     2,     0,     3,     4,     0,
-       0,     0,    68,    67,     0,    69,     0,     0,    70,     0,
-      71,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      60,    61,    67,   100,   108,   109,   110,    66,     0,     1,
-       2,     0,     3,     4,    60,    61,     0,   292,    63,    64,
-      65,    66,     0,     1,     2,    68,     3,     4,    69,     0,
-       0,    70,     0,    71,     0,     0,     0,    67,     0,     0,
+     168,     0,     0,    67,     0,     0,     0,     0,     0,     0,
+       0,     0,    60,    61,     0,   100,    63,    64,    65,    66,
+       0,     1,     2,     0,     3,     4,   169,   170,   171,   172,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,   128,
+     182,     0,   183,   184,   185,     0,     0,     0,     0,    67,
+       0,     0,    60,    61,     0,   100,   108,   109,   110,    66,
+     364,     1,     2,     0,     3,     4,     0,    60,    61,     0,
+     100,    63,    64,    65,    66,     0,     1,     2,     0,     3,
+       4,     0,     0,     0,     0,     0,     0,     0,     0,    67,
+       0,     0,     0,     0,   324,     0,     0,    68,     0,     0,
+      69,     0,     0,    70,    67,    71,   342,    60,    61,     0,
+     100,    63,    64,    65,    66,     0,     1,     2,     0,     3,
+       4,     0,     0,    60,    61,     0,   100,    63,    64,    65,
+      66,     0,     1,     2,   413,     3,     4,     0,     0,     0,
+       0,     0,     0,    68,    67,     0,    69,     0,     0,    70,
+     488,    71,     0,     0,     0,     0,     0,     0,    60,    61,
+      67,    62,    63,    64,    65,    66,     0,     1,     2,     0,
+       3,     4,    60,    61,     0,   100,   108,   109,   110,    66,
+       0,     1,     2,    68,     3,     4,    69,     0,   277,    70,
+       0,    71,     0,     0,     0,    67,     0,     0,    68,     0,
+       0,    69,     0,     0,    70,     0,    71,     0,     0,    67,
+      60,    61,     0,   100,    63,    64,    65,    66,     0,     1,
+       2,     0,     3,     4,    60,    61,     0,   197,    63,    64,
+      65,    66,     0,     1,     2,     0,     3,     4,    68,     0,
+       0,    69,     0,     0,    70,     0,    71,    67,     0,     0,
+       0,     0,     0,     0,    68,     0,     0,    69,     0,     0,
+      70,    67,    71,    60,    61,     0,   100,   108,   109,   110,
+      66,     0,     1,     2,     0,     3,     4,     0,    60,    61,
+       0,   292,    63,    64,    65,    66,     0,     1,     2,    68,
+       3,     4,    69,     0,     0,    70,     0,    71,     0,     0,
+      67,     0,     0,    68,     0,     0,    69,     0,     0,    70,
+       0,    71,     0,     0,     0,    67,     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,    68,     0,     0,    69,     0,     0,    70,     0,    71,
-       0,    67,     0,     0,     0,     0,     0,     0,     0,     0,
-      68,     0,     0,    69,     0,     0,    70,     0,    71,     0,
-       0,     0,     0,     0,     0,     0,    68,     0,     0,    69,
-       0,     0,    70,     0,    71,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,    68,     0,     0,    69,     0,
        0,    70,     0,    71,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   203,     0,     0,     0,     0,     0,     0,
-      68,     0,     0,    69,     0,     0,    70,     0,   280,     0,
-       0,   204,   205,     0,    68,     0,     0,    69,     0,     0,
-      70,     0,    71,   206,   207,   208,   209,   210,   211,   152,
-     153,   154,   155,   156,   157,   158,   159,   160,   161,   162,
-     163,   164,   165,   166,   212,   213,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   203,     0,
+       0,     0,     0,     0,    68,     0,     0,    69,     0,     0,
+      70,     0,   280,     0,     0,     0,   204,   205,     0,    68,
+       0,     0,    69,     0,     0,    70,     0,    71,   206,   207,
+     208,   209,   210,   211,   152,   153,   154,   155,   156,   157,
+     158,   159,   160,   161,   162,   163,   164,   165,   166,   212,
+     213,     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,   214,   215,   216,     0,
-       0,   217,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   218,   219,   220,   221,   222,   223
+       0,   214,   215,   216,     0,     0,   217,   170,   171,   172,
+     173,   174,   175,   176,   177,   178,   179,   180,   181,   218,
+     219,   220,   221,   222,   223
 };
 
 static const short int yycheck[] =
 {
-       0,    26,   208,   113,   216,   241,   303,   219,   220,   221,
-     222,   223,    81,     0,   226,     4,    16,   326,    11,   413,
-      11,   330,    31,   135,    18,   187,   188,    25,    11,    16,
-      11,   209,    26,   134,   146,   242,   243,   106,   135,    48,
-     113,     3,     4,     5,     6,    47,    71,   299,    16,   146,
-     228,    19,    37,    38,    39,    40,    41,    42,    43,    61,
-      45,    23,    24,    16,   316,    48,    19,    48,    37,    38,
-      95,   112,   113,    52,    99,    44,   135,    31,   135,   134,
-     105,    50,   107,   112,   113,   142,    86,   146,   129,   130,
-     131,   135,   135,   532,   488,    15,   121,   136,   135,   138,
-     144,   130,   131,   146,   543,   144,   318,   144,   133,   134,
-      17,   135,   137,    20,   134,   139,     7,     8,   280,    10,
-      11,    12,    13,    14,   518,    16,    17,   134,    19,    20,
-       7,     8,     0,    10,    11,    12,    13,    14,    11,    16,
-      17,    14,    19,    20,   112,   113,   353,   145,   133,   142,
-     544,   142,   146,    44,    29,    30,   145,   135,   112,   113,
-     140,   135,   130,   131,   142,   139,   463,    44,   465,   136,
-     382,   138,   384,   385,   386,   129,   130,   131,   108,   109,
-     489,   206,    33,    55,    56,    57,    58,    59,    60,   214,
+       0,    26,   208,   241,   113,   187,   188,   303,     4,    11,
+      11,    81,   414,     0,   209,   326,    16,    25,   216,   330,
+      31,   219,   220,   221,   222,   223,   299,    18,   226,    16,
+      11,    11,   136,   228,   136,    26,   106,    48,    47,   113,
+     136,   145,   135,   316,     0,   147,    71,    16,    16,   145,
+      19,    19,    61,   242,   243,     3,     4,     5,     6,    15,
+      16,    17,   533,    19,    20,    21,    17,    48,    48,    20,
+      95,    27,    28,   544,    99,    23,    24,    52,    37,    38,
+     105,   136,   107,   112,   113,    44,    86,   489,   112,   113,
+      46,    50,   147,    49,   136,   135,   121,    53,   280,   136,
+     129,   130,   131,   132,    15,   147,   130,   131,   133,   134,
+     147,   137,   137,   139,   136,   136,   137,   519,   139,   145,
+     318,   143,     7,     8,     0,    10,    11,    12,    13,    14,
+     136,    16,    17,    11,    19,    20,    14,   143,   146,    29,
+      30,   143,   143,   545,   112,   113,   108,   109,     7,     8,
+     146,    10,    11,    12,    13,    14,   147,    16,    17,    44,
+      19,    20,   130,   131,   353,   136,    19,    31,   464,   140,
+     466,   137,   137,   139,   139,   135,   141,   143,    41,   490,
+      43,   206,   364,   135,   382,    44,   384,   385,   386,   214,
      215,   216,   217,   218,   219,   220,   221,   222,   223,   224,
-     225,   226,   364,   272,   273,   274,   275,   276,   136,   234,
-     138,   136,   199,   138,   142,   140,   285,   286,   287,   455,
-     293,   134,   295,   296,   135,   298,    19,   536,   139,   538,
-     133,   443,   305,   343,    37,    38,    39,    77,    78,    42,
-     313,   314,     3,     4,     5,     6,   137,   135,   136,   140,
-     138,   142,   143,    18,   145,   280,   468,   469,   470,    19,
-     137,   112,   113,   140,   333,   334,   143,    19,   145,   146,
-     343,   340,   138,     4,   299,   300,   301,    19,   129,   130,
-     131,     4,   135,   136,   520,   138,   136,   523,   138,   139,
-       9,   316,   317,   318,    41,   141,    43,   141,     9,   372,
-     373,   374,     9,     4,    19,   135,   139,   380,   144,    19,
-     139,   517,   138,   138,   138,   138,   138,   390,   391,   138,
-     138,   138,   135,    50,    11,   135,   138,   533,   144,   354,
-     399,   400,   401,   402,   138,   135,   138,   406,   407,    85,
-      86,    87,    88,    89,    90,    91,    92,    93,    94,   135,
-     135,   424,   135,   426,   135,    33,   429,   382,   383,   384,
-     385,   386,   435,   436,   389,   135,   135,   135,   135,   144,
-      33,   135,   441,   442,    19,     4,   135,    54,   135,   135,
-     135,   135,   140,   408,   135,   458,   459,   135,   461,   462,
-     135,   144,   135,   466,    19,   295,   296,    14,   298,   139,
-      14,   474,   138,   135,     4,   305,     0,   135,   138,   478,
-     135,   480,   481,   313,   314,   440,    19,   135,   443,   135,
-     493,    15,    16,    17,    48,    19,    20,    21,   501,   454,
-     135,   135,   135,    27,    28,   460,   135,   139,   135,   139,
-     135,   139,   135,   468,   469,   470,   135,   139,   473,   139,
-     135,   142,    46,   453,   140,    49,   139,   530,   139,    53,
-     139,    48,   535,    14,     4,   135,   142,    14,    14,    23,
-      24,   135,   372,   373,   374,    14,   549,   550,    66,    14,
-     380,   554,   124,   124,   557,   124,   212,    86,   489,   213,
-     390,   391,   105,   512,   519,     7,     8,   234,    10,    11,
-      12,    13,    14,    99,    16,    17,    16,    19,    20,    83,
-      53,    -1,   512,   473,   379,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   424,    -1,   426,    -1,    -1,   429,
-      -1,    -1,    44,    -1,    -1,   435,   436,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-     104,    -1,    -1,    -1,    -1,    -1,     0,    -1,   458,   459,
-      -1,   461,   462,    -1,    -1,    -1,   466,    -1,    -1,    -1,
-      -1,    15,    16,    17,   474,    19,    20,    21,    -1,    -1,
-      -1,    -1,    -1,    27,    28,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   493,     3,     4,    -1,    -1,     7,     8,
-       9,   501,    46,    -1,    -1,    49,    -1,    16,    17,    53,
-      19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   137,    35,    36,   140,    -1,
-     530,   143,    -1,   145,   146,   535,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    52,    -1,    -1,    -1,    -1,    -1,   549,
-     550,    -1,    -1,    -1,   554,    -1,    -1,   557,    -1,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,     7,     8,    -1,    10,    11,    12,    13,
-      14,    -1,    16,    17,    -1,    19,    20,    -1,    -1,    -1,
-      -1,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,    -1,   124,    -1,   126,   127,   128,
-      44,    -1,    -1,    -1,    -1,    -1,    -1,   136,    -1,   138,
-      -1,     3,     4,    -1,   143,     7,     8,     9,    -1,    -1,
-      -1,    -1,    -1,    -1,    16,    17,    -1,    19,    20,    -1,
-      22,    23,    24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    35,    36,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,
-      52,    10,    11,    12,    13,    14,    -1,    16,    17,    -1,
-      19,    20,    -1,    -1,    -1,    -1,    68,    69,    70,    71,
+     225,   226,   272,   273,   274,   275,   276,   136,   135,   234,
+     136,   140,   199,   141,   140,   285,   286,   287,   456,   293,
+     134,   295,   296,    33,   298,   137,   537,   139,   539,   136,
+     137,   305,   139,    18,   343,    19,    37,    38,    39,   313,
+     314,    42,     3,     4,     5,     6,   444,    19,   112,   113,
+      77,    78,    19,   138,     4,   280,   141,   139,     4,   144,
+       9,   146,   147,   333,   334,   129,   130,   131,   132,   343,
+     340,   469,   470,   471,   299,   300,   301,   142,     9,   138,
+     142,     9,   141,   521,     4,   144,   524,   146,   147,    19,
+     136,   316,   317,   318,   137,   140,   139,   140,   372,   373,
+     374,   145,   112,   113,   140,   139,   380,   139,   139,   139,
+     139,    19,   518,   139,   139,   139,   390,   391,   136,   129,
+     130,   131,   132,    50,    11,   145,   139,   139,   534,   354,
+     400,   401,   402,   403,   139,    33,   136,   407,   408,   136,
+      37,    38,    39,    40,    41,    42,    43,   136,    45,   136,
+     136,   425,   145,   427,   136,   136,   430,   382,   383,   384,
+     385,   386,   436,   437,   389,    55,    56,    57,    58,    59,
+      60,   136,   442,   443,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,   409,   459,   460,    33,   462,   463,
+      19,   136,   136,   467,   136,   295,   296,   136,   298,     4,
+      54,   475,   136,   136,   141,   305,     0,   136,   140,   479,
+     136,   481,   482,   313,   314,   136,   441,   136,   136,   444,
+     494,    15,    16,    17,   136,    19,    20,    21,   502,   145,
+     455,    19,    14,    27,    28,    14,   461,   134,   139,     4,
+     136,   136,   136,   136,   469,   470,   471,   136,   136,   474,
+     136,   136,    46,    19,   454,    49,   139,   531,   140,    53,
+     136,   136,   536,   140,   136,   136,   140,   136,   136,    14,
+      23,    24,   372,   373,   374,   140,   550,   551,   140,    48,
+     380,   555,   141,   143,   558,   140,    48,   140,   140,     4,
+     390,   391,   143,   136,    14,   520,    14,   136,     7,     8,
+      14,    10,    11,    12,    13,    14,    66,    16,    17,    14,
+      19,    20,   124,   513,   124,   124,   513,   490,    86,   234,
+     212,   105,   213,    99,    16,   425,    83,   427,    53,   474,
+     430,   379,    -1,    -1,    -1,    44,   436,   437,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+     103,   104,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   459,
+     460,    -1,   462,   463,    -1,    -1,    -1,   467,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,   475,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   494,     3,     4,    -1,    -1,     7,
+       8,     9,   502,    -1,    -1,    -1,    -1,    -1,    16,    17,
+      -1,    19,    20,    -1,    22,    23,    24,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    35,    36,   138,
+      -1,   531,   141,    -1,    -1,   144,   536,   146,   147,    -1,
+      -1,    -1,    -1,    -1,    52,    -1,    -1,    -1,    -1,    -1,
+     550,   551,    -1,    -1,    -1,   555,    -1,    -1,   558,    -1,
+      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    -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,   110,   111,   112,   113,   114,   115,   116,   117,
+     118,   119,   120,   121,   122,    -1,   124,    -1,   126,   127,
+     128,     3,     4,    -1,    -1,     7,     8,     9,    -1,   137,
+      -1,   139,    -1,    -1,    16,    17,   144,    19,    20,    -1,
+      22,    23,    24,    -1,    -1,    -1,     7,     8,    -1,    -1,
+      -1,    -1,    -1,    35,    36,    16,    17,    -1,    19,    20,
+      -1,    22,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      52,    -1,    -1,    -1,    35,    36,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    68,    69,    70,    71,
       72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,   137,    -1,    44,   140,    -1,    -1,   143,
-      -1,   145,   146,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   110,   111,
+      82,    83,    84,    -1,    -1,    -1,    -1,    68,    69,    70,
+      71,    72,    73,    74,    75,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    -1,    -1,    -1,    -1,   110,   111,
      112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
-     122,    -1,   124,    -1,   126,   127,   128,     7,     8,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,    19,
-      20,   143,    22,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    35,    36,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       7,     8,    -1,    10,    11,    12,    13,    14,   137,    16,
-      17,   140,    19,    20,   143,    -1,   145,   146,    68,    69,
-      70,    71,    72,    73,    74,    75,    76,    77,    78,    79,
-      80,    81,    82,    83,    84,    -1,    -1,    44,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    -1,    10,
-      11,    12,    13,    14,    -1,    16,    17,    -1,    19,    20,
-     110,   111,   112,   113,   114,   115,   116,   117,   118,   119,
-     120,   121,   122,    34,   124,    -1,   126,   127,   128,     3,
-       4,    -1,    -1,    44,    -1,     9,   136,    -1,   138,    -1,
-     140,    -1,    -1,   143,    -1,   145,    -1,   147,    22,    23,
+     122,    -1,   124,    -1,   126,   127,   128,    -1,    -1,   110,
+     111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
+     121,   122,   144,   124,    -1,   126,   127,   128,    -1,     3,
+       4,    -1,    -1,    -1,    -1,     9,   137,    -1,   139,    -1,
+     141,    -1,    -1,   144,    -1,   146,    -1,   148,    22,    23,
       24,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
       -1,    35,    36,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    52,    -1,
-     137,    -1,    -1,   140,    -1,    -1,   143,    -1,   145,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,     7,     8,    52,    10,
+      11,    12,    13,    14,    -1,    16,    17,    -1,    19,    20,
       -1,    -1,    -1,    -1,    68,    69,    70,    71,    72,    73,
       74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
-      84,    -1,     7,     8,    -1,    10,    11,    12,    13,    14,
-      -1,    16,    17,    -1,    19,    20,   137,    -1,    -1,   140,
-      -1,    -1,   143,    -1,   145,    -1,   110,   111,   112,   113,
-     114,   115,   116,   117,   118,   119,   120,   121,   122,    44,
-     124,    -1,   126,   127,   128,     7,     8,    -1,    10,    11,
-      12,    13,    14,    -1,    16,    17,    -1,    19,    20,   143,
-      -1,     7,     8,    -1,    10,    11,    12,    13,    14,    -1,
-      16,    17,    34,    19,    20,    -1,    -1,    -1,    -1,    -1,
-       7,     8,    44,    10,    11,    12,    13,    14,    34,    16,
-      17,    -1,    19,    20,    -1,    -1,     7,     8,    44,    10,
-      11,    12,    13,    14,    -1,    16,    17,    34,    19,    20,
-      -1,    -1,    -1,    -1,    -1,     7,     8,    44,    10,    11,
-      12,    13,    14,    -1,    16,    17,    -1,    19,    20,    -1,
-      -1,    -1,   137,    44,    -1,   140,    -1,    -1,   143,    -1,
-     145,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       7,     8,    44,    10,    11,    12,    13,    14,    -1,    16,
+      84,    -1,    -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     7,     8,    -1,    10,    11,    12,    13,    14,
+      -1,    16,    17,    -1,    19,    20,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,   121,   122,    34,
+     124,    -1,   126,   127,   128,    -1,    -1,    -1,    -1,    44,
+      -1,    -1,     7,     8,    -1,    10,    11,    12,    13,    14,
+     144,    16,    17,    -1,    19,    20,    -1,     7,     8,    -1,
+      10,    11,    12,    13,    14,    -1,    16,    17,    -1,    19,
+      20,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    44,
+      -1,    -1,    -1,    -1,    34,    -1,    -1,   138,    -1,    -1,
+     141,    -1,    -1,   144,    44,   146,   147,     7,     8,    -1,
+      10,    11,    12,    13,    14,    -1,    16,    17,    -1,    19,
+      20,    -1,    -1,     7,     8,    -1,    10,    11,    12,    13,
+      14,    -1,    16,    17,    34,    19,    20,    -1,    -1,    -1,
+      -1,    -1,    -1,   138,    44,    -1,   141,    -1,    -1,   144,
+      34,   146,    -1,    -1,    -1,    -1,    -1,    -1,     7,     8,
+      44,    10,    11,    12,    13,    14,    -1,    16,    17,    -1,
+      19,    20,     7,     8,    -1,    10,    11,    12,    13,    14,
+      -1,    16,    17,   138,    19,    20,   141,    -1,   143,   144,
+      -1,   146,    -1,    -1,    -1,    44,    -1,    -1,   138,    -1,
+      -1,   141,    -1,    -1,   144,    -1,   146,    -1,    -1,    44,
+       7,     8,    -1,    10,    11,    12,    13,    14,    -1,    16,
       17,    -1,    19,    20,     7,     8,    -1,    10,    11,    12,
-      13,    14,    -1,    16,    17,   137,    19,    20,   140,    -1,
-      -1,   143,    -1,   145,    -1,    -1,    -1,    44,    -1,    -1,
-      -1,   137,    -1,    -1,   140,    -1,    -1,   143,    -1,   145,
-      -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     137,    -1,    -1,   140,    -1,    -1,   143,    -1,   145,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   137,    -1,    -1,   140,
-      -1,    -1,   143,    -1,   145,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   137,    -1,    -1,   140,    -1,
-      -1,   143,    -1,   145,    -1,    -1,    -1,    -1,    -1,    -1,
+      13,    14,    -1,    16,    17,    -1,    19,    20,   138,    -1,
+      -1,   141,    -1,    -1,   144,    -1,   146,    44,    -1,    -1,
+      -1,    -1,    -1,    -1,   138,    -1,    -1,   141,    -1,    -1,
+     144,    44,   146,     7,     8,    -1,    10,    11,    12,    13,
+      14,    -1,    16,    17,    -1,    19,    20,    -1,     7,     8,
+      -1,    10,    11,    12,    13,    14,    -1,    16,    17,   138,
+      19,    20,   141,    -1,    -1,   144,    -1,   146,    -1,    -1,
+      44,    -1,    -1,   138,    -1,    -1,   141,    -1,    -1,   144,
+      -1,   146,    -1,    -1,    -1,    44,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    32,    -1,    -1,    -1,    -1,    -1,    -1,
-     137,    -1,    -1,   140,    -1,    -1,   143,    -1,   145,    -1,
-      -1,    50,    51,    -1,   137,    -1,    -1,   140,    -1,    -1,
-     143,    -1,   145,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,    71,    72,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   105,   106,   107,    -1,
-      -1,   110,   111,   112,   113,   114,   115,   116,   117,   118,
-     119,   120,   121,   122,   123,   124,   125,   126,   127,   128
+      -1,   138,    -1,    -1,   141,    -1,    -1,   144,    -1,   146,
+      -1,    -1,    -1,    -1,    -1,   138,    -1,    -1,   141,    -1,
+      -1,   144,    -1,   146,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    32,    -1,
+      -1,    -1,    -1,    -1,   138,    -1,    -1,   141,    -1,    -1,
+     144,    -1,   146,    -1,    -1,    -1,    50,    51,    -1,   138,
+      -1,    -1,   141,    -1,    -1,   144,    -1,   146,    62,    63,
+      64,    65,    66,    67,    68,    69,    70,    71,    72,    73,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   105,   106,   107,    -1,    -1,   110,   111,   112,   113,
+     114,   115,   116,   117,   118,   119,   120,   121,   122,   123,
+     124,   125,   126,   127,   128
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2313,61 +2317,61 @@
 static const unsigned char yystos[] =
 {
        0,    16,    17,    19,    20,    21,    27,    28,    46,    49,
-      53,   156,   158,   159,   160,   188,   189,   190,   192,   191,
-      47,    61,   197,   134,    52,   134,    15,   134,    37,    38,
-      39,    40,    41,    42,    43,    45,   133,   161,   162,   163,
-       0,   190,    41,    43,   164,   207,    37,    38,    39,    42,
-     165,   204,   206,   213,   134,   134,   140,   198,    19,   196,
-       7,     8,    10,    11,    12,    13,    14,    44,   137,   140,
-     143,   145,   156,   159,   177,   178,   210,   163,   163,    29,
-      30,   187,   163,   163,    18,   214,   215,    26,   146,   205,
-     214,    19,    19,    19,   199,   138,     4,     4,     4,   145,
-      10,   146,   178,   183,   136,   138,   187,   187,    11,    12,
-      13,   154,   155,   178,   184,    55,    56,    57,    58,    59,
-      60,   166,   202,   202,   158,   218,   135,   142,    34,   178,
-     179,   181,   182,   141,   141,   146,   183,   135,   146,   182,
-     184,   178,    23,    24,     3,     4,     5,     6,     9,    22,
+      53,   157,   159,   160,   161,   189,   190,   191,   193,   192,
+      47,    61,   198,   135,    52,   135,    15,   135,    37,    38,
+      39,    40,    41,    42,    43,    45,   134,   162,   163,   164,
+       0,   191,    41,    43,   165,   208,    37,    38,    39,    42,
+     166,   205,   207,   214,   135,   135,   141,   199,    19,   197,
+       7,     8,    10,    11,    12,    13,    14,    44,   138,   141,
+     144,   146,   157,   160,   178,   179,   211,   164,   164,    29,
+      30,   188,   164,   164,    18,   215,   216,    26,   147,   206,
+     215,    19,    19,    19,   200,   139,     4,     4,     4,   146,
+      10,   147,   179,   184,   137,   139,   188,   188,    11,    12,
+      13,   155,   156,   179,   185,    55,    56,    57,    58,    59,
+      60,   167,   203,   203,   159,   219,   136,   143,    34,   179,
+     180,   182,   183,   142,   142,   147,   184,   136,   147,   183,
+     185,   179,    23,    24,     3,     4,     5,     6,     9,    22,
       35,    36,    68,    69,    70,    71,    72,    73,    74,    75,
       76,    77,    78,    79,    80,    81,    82,    83,    84,   110,
      111,   112,   113,   114,   115,   116,   117,   118,   119,   120,
-     121,   122,   124,   126,   127,   128,   140,   143,   145,   147,
-     149,   150,   151,   185,   210,   193,     4,    10,   178,   180,
-      25,   145,   203,    32,    50,    51,    62,    63,    64,    65,
+     121,   122,   124,   126,   127,   128,   141,   144,   146,   148,
+     150,   151,   152,   186,   211,   194,     4,    10,   179,   181,
+      25,   146,   204,    32,    50,    51,    62,    63,    64,    65,
       66,    67,    83,    84,   105,   106,   107,   110,   123,   124,
-     125,   126,   127,   128,   149,   150,   151,   216,   222,   223,
-     224,   225,    19,   168,   135,   139,   178,   178,   144,   146,
-     178,   139,   194,   195,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,   152,    23,    24,    91,    92,    93,
+     125,   126,   127,   128,   150,   151,   152,   217,   223,   224,
+     225,   226,    19,   169,   136,   140,   179,   179,   145,   147,
+     179,   140,   195,   196,    85,    86,    87,    88,    89,    90,
+      91,    92,    93,    94,   153,    23,    24,    91,    92,    93,
       94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-     104,   153,   138,   138,   138,   138,   138,   142,   184,   186,
-     145,   186,   146,   186,    19,   138,   138,   138,   135,   175,
-     159,    50,    10,   178,   212,    11,    14,    11,   154,   166,
-     152,   153,   178,   178,   212,   178,   178,   219,   212,   212,
-     212,   212,   212,   178,   178,   212,   166,   108,   109,   112,
-     113,   130,   131,   167,    34,   179,   170,   142,   144,   144,
-     170,   175,   175,   138,   138,   184,   184,   184,   184,   184,
-     135,   142,   146,   178,   186,   144,   146,   184,   184,   184,
-      31,    48,   173,   176,   138,     3,     4,     9,    22,    23,
-      24,    35,    36,    52,   143,   185,   209,   210,   211,   211,
-     211,   211,   180,   178,   178,   135,   172,   135,   172,   211,
-     140,   135,   135,   135,   135,   135,   135,   211,   211,    33,
-     180,   178,   212,   129,   167,   169,   184,   184,   221,   135,
-     135,   135,   135,   184,   144,   146,   135,   135,    33,    19,
-       4,   175,    34,   178,   200,   201,    54,   208,   186,   135,
-     135,   211,   211,   211,    11,    48,    11,   221,   211,   140,
-     212,   178,   212,   212,   212,   135,   135,   178,   211,   211,
-     135,   135,   135,   135,   139,   184,   184,   184,   184,   144,
-     184,   184,   178,   168,   135,   139,    19,   144,    14,    14,
-     138,   135,   135,   211,     4,   211,   135,   211,   135,   135,
-     135,   211,   211,   138,   178,   184,   184,   212,   135,   139,
-     135,   135,   139,   139,   139,   156,   157,    34,   178,   170,
-     135,   211,   211,   178,   220,   211,   211,   135,   172,   172,
-     211,   135,   212,   212,   212,   220,   211,   139,   139,   184,
-     184,   184,   168,   173,   174,    19,   135,   140,   211,   135,
-     139,   142,   211,   139,   139,   139,   139,   157,    48,   171,
-      14,   142,   154,   217,   168,   178,   170,   142,   170,     4,
-     211,   209,   142,   154,   211,    33,   135,   209,   168,    14,
-      14,   135,   211,   211,    14,    66,   211,    14,   211
+     104,   154,   139,   139,   139,   139,   139,   143,   185,   187,
+     146,   187,   147,   187,    19,   139,   139,   139,   136,   176,
+     160,    50,    10,   179,   213,    11,    14,    11,   155,   167,
+     153,   154,   179,   179,   213,   179,   179,   220,   213,   213,
+     213,   213,   213,   179,   179,   213,   167,   108,   109,   112,
+     113,   130,   131,   168,    34,   180,   171,   143,   145,   145,
+     171,   176,   176,   139,   139,   185,   185,   185,   185,   185,
+     136,   143,   147,   179,   187,   145,   147,   185,   185,   185,
+      31,    48,   174,   177,   139,     3,     4,     9,    22,    23,
+      24,    35,    36,    52,   144,   186,   210,   211,   212,   212,
+     212,   212,   181,   179,   179,   136,   173,   136,   173,   212,
+     141,   136,   136,   136,   136,   136,   136,   212,   212,    33,
+     181,   179,   213,   129,   132,   168,   170,   185,   185,   222,
+     136,   136,   136,   136,   185,   145,   147,   136,   136,    33,
+      19,     4,   176,    34,   179,   201,   202,    54,   209,   187,
+     136,   136,   212,   212,   212,    11,    48,    11,   222,   212,
+     141,   213,   179,   213,   213,   213,   136,   136,   179,   212,
+     212,   136,   136,   136,   136,   140,   185,   185,   185,   185,
+     145,   185,   185,   179,   169,   136,   140,    19,   145,    14,
+      14,   139,   136,   136,   212,     4,   212,   136,   212,   136,
+     136,   136,   212,   212,   139,   179,   185,   185,   213,   136,
+     140,   136,   136,   140,   140,   140,   157,   158,    34,   179,
+     171,   136,   212,   212,   179,   221,   212,   212,   136,   173,
+     173,   212,   136,   213,   213,   213,   221,   212,   140,   140,
+     185,   185,   185,   169,   174,   175,    19,   136,   141,   212,
+     136,   140,   143,   212,   140,   140,   140,   140,   158,    48,
+     172,    14,   143,   155,   218,   169,   179,   171,   143,   171,
+       4,   212,   210,   143,   155,   212,    33,   136,   210,   169,
+      14,    14,   136,   212,   212,    14,    66,   212,    14,   212
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -3370,25 +3374,30 @@
     { (yyval.ParamAttrs) = FunctionType::NoReturnAttribute; ;}
     break;
 
-  case 101:
-#line 1210 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.ParamAttrs) = FunctionType::NoAttributeSet; ;}
+  case 100:
+#line 1207 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = FunctionType::NoUnwindAttribute; ;}
     break;
 
   case 102:
 #line 1211 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.ParamAttrs) = FunctionType::NoAttributeSet; ;}
+    break;
+
+  case 103:
+#line 1212 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
                 (yyval.ParamAttrs) = FunctionType::ParameterAttributes((yyvsp[-1].ParamAttrs) | (yyvsp[0].ParamAttrs));
               ;}
     break;
 
-  case 103:
-#line 1218 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 104:
+#line 1219 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 104:
-#line 1219 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 105:
+#line 1220 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3397,13 +3406,13 @@
 ;}
     break;
 
-  case 105:
-#line 1225 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 106:
+#line 1226 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.UIntVal) = 0; ;}
     break;
 
-  case 106:
-#line 1226 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 107:
+#line 1227 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.UIntVal) = (yyvsp[0].UInt64Val);
   if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
@@ -3412,8 +3421,8 @@
 ;}
     break;
 
-  case 107:
-#line 1234 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 108:
+#line 1235 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   for (unsigned i = 0, e = strlen((yyvsp[0].StrVal)); i != e; ++i)
     if ((yyvsp[0].StrVal)[i] == '"' || (yyvsp[0].StrVal)[i] == '\\')
@@ -3423,19 +3432,14 @@
 ;}
     break;
 
-  case 108:
-#line 1242 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = 0; ;}
-    break;
-
   case 109:
 #line 1243 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
+    { (yyval.StrVal) = 0; ;}
     break;
 
   case 110:
-#line 1248 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
-    {;}
+#line 1244 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
     break;
 
   case 111:
@@ -3445,6 +3449,11 @@
 
   case 112:
 #line 1250 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+    {;}
+    break;
+
+  case 113:
+#line 1251 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV->setSection((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
@@ -3452,8 +3461,8 @@
   ;}
     break;
 
-  case 113:
-#line 1255 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 114:
+#line 1256 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp[0].UInt64Val)))
       GEN_ERROR("Alignment must be a power of two");
@@ -3462,24 +3471,24 @@
   ;}
     break;
 
-  case 118:
-#line 1271 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 119:
+#line 1272 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(OpaqueType::get());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 119:
-#line 1275 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 120:
+#line 1276 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder((yyvsp[0].PrimType));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 120:
-#line 1279 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 121:
+#line 1280 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                             // Pointer type?
     if (*(yyvsp[-1].TypeVal) == Type::LabelTy)
       GEN_ERROR("Cannot form a pointer to a basic block");
@@ -3489,8 +3498,8 @@
   ;}
     break;
 
-  case 121:
-#line 1286 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 122:
+#line 1287 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {            // Named types are also simple types...
     const Type* tmp = getTypeVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
@@ -3498,8 +3507,8 @@
   ;}
     break;
 
-  case 122:
-#line 1291 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 123:
+#line 1292 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Type UpReference
     if ((yyvsp[0].UInt64Val) > (uint64_t)~0U) GEN_ERROR("Value out of range");
     OpaqueType *OT = OpaqueType::get();        // Use temporary placeholder
@@ -3510,8 +3519,8 @@
   ;}
     break;
 
-  case 123:
-#line 1299 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 124:
+#line 1300 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Params;
     std::vector<FunctionType::ParameterAttributes> Attrs;
@@ -3533,8 +3542,8 @@
   ;}
     break;
 
-  case 124:
-#line 1318 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 125:
+#line 1319 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Params;
     std::vector<FunctionType::ParameterAttributes> Attrs;
@@ -3555,8 +3564,8 @@
   ;}
     break;
 
-  case 125:
-#line 1337 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 126:
+#line 1338 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {          // Sized array type?
     (yyval.TypeVal) = new PATypeHolder(HandleUpRefs(ArrayType::get(*(yyvsp[-1].TypeVal), (unsigned)(yyvsp[-3].UInt64Val))));
     delete (yyvsp[-1].TypeVal);
@@ -3564,8 +3573,8 @@
   ;}
     break;
 
-  case 126:
-#line 1342 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 127:
+#line 1343 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {          // Vector type?
      const llvm::Type* ElemTy = (yyvsp[-1].TypeVal)->get();
      if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
@@ -3580,8 +3589,8 @@
   ;}
     break;
 
-  case 127:
-#line 1354 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 128:
+#line 1355 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                        // Structure type?
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-1].TypeList)->begin(),
@@ -3594,16 +3603,16 @@
   ;}
     break;
 
-  case 128:
-#line 1364 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 129:
+#line 1365 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                                  // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>()));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 129:
-#line 1368 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 130:
+#line 1369 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     std::vector<const Type*> Elements;
     for (std::list<llvm::PATypeHolder>::iterator I = (yyvsp[-2].TypeList)->begin(),
@@ -3616,24 +3625,24 @@
   ;}
     break;
 
-  case 130:
-#line 1378 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 131:
+#line 1379 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                         // Empty structure type?
     (yyval.TypeVal) = new PATypeHolder(StructType::get(std::vector<const Type*>(), true));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 131:
-#line 1385 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 132:
+#line 1386 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     (yyval.TypeWithAttrs).Ty = (yyvsp[-1].TypeVal); 
     (yyval.TypeWithAttrs).Attrs = (yyvsp[0].ParamAttrs); 
   ;}
     break;
 
-  case 132:
-#line 1392 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 133:
+#line 1393 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -3643,15 +3652,15 @@
   ;}
     break;
 
-  case 133:
-#line 1399 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 134:
+#line 1400 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeVal) = new PATypeHolder(Type::VoidTy);
   ;}
     break;
 
-  case 134:
-#line 1404 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 135:
+#line 1405 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     (yyval.TypeWithAttrsList)->push_back((yyvsp[0].TypeWithAttrs));
@@ -3659,16 +3668,16 @@
   ;}
     break;
 
-  case 135:
-#line 1409 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 136:
+#line 1410 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList))->push_back((yyvsp[0].TypeWithAttrs));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 137:
-#line 1417 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 138:
+#line 1418 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList)=(yyvsp[-2].TypeWithAttrsList);
     TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet;
@@ -3678,8 +3687,8 @@
   ;}
     break;
 
-  case 138:
-#line 1424 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 139:
+#line 1425 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList;
     TypeWithAttrs TWA; TWA.Attrs = FunctionType::NoAttributeSet;
@@ -3689,16 +3698,16 @@
   ;}
     break;
 
-  case 139:
-#line 1431 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 140:
+#line 1432 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeWithAttrsList) = new TypeWithAttrsList();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 140:
-#line 1439 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 141:
+#line 1440 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TypeList) = new std::list<PATypeHolder>();
     (yyval.TypeList)->push_back(*(yyvsp[0].TypeVal)); 
@@ -3707,8 +3716,8 @@
   ;}
     break;
 
-  case 141:
-#line 1445 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 142:
+#line 1446 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(*(yyvsp[0].TypeVal)); 
     delete (yyvsp[0].TypeVal);
@@ -3716,8 +3725,8 @@
   ;}
     break;
 
-  case 142:
-#line 1457 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 143:
+#line 1458 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -3748,8 +3757,8 @@
   ;}
     break;
 
-  case 143:
-#line 1485 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 144:
+#line 1486 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -3768,8 +3777,8 @@
   ;}
     break;
 
-  case 144:
-#line 1501 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 145:
+#line 1502 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -3801,8 +3810,8 @@
   ;}
     break;
 
-  case 145:
-#line 1530 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 146:
+#line 1531 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized arr
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -3833,8 +3842,8 @@
   ;}
     break;
 
-  case 146:
-#line 1558 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 147:
+#line 1559 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-3].TypeVal)->get());
     if (STy == 0)
@@ -3862,8 +3871,8 @@
   ;}
     break;
 
-  case 147:
-#line 1583 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 148:
+#line 1584 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -3885,8 +3894,8 @@
   ;}
     break;
 
-  case 148:
-#line 1602 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 149:
+#line 1603 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const StructType *STy = dyn_cast<StructType>((yyvsp[-5].TypeVal)->get());
     if (STy == 0)
@@ -3915,8 +3924,8 @@
   ;}
     break;
 
-  case 149:
-#line 1628 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 150:
+#line 1629 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
@@ -3939,8 +3948,8 @@
   ;}
     break;
 
-  case 150:
-#line 1648 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 151:
+#line 1649 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -3955,8 +3964,8 @@
   ;}
     break;
 
-  case 151:
-#line 1660 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 152:
+#line 1661 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -3966,8 +3975,8 @@
   ;}
     break;
 
-  case 152:
-#line 1667 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 153:
+#line 1668 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4036,8 +4045,8 @@
   ;}
     break;
 
-  case 153:
-#line 1733 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 154:
+#line 1734 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4050,8 +4059,8 @@
   ;}
     break;
 
-  case 154:
-#line 1743 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 155:
+#line 1744 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4064,8 +4073,8 @@
   ;}
     break;
 
-  case 155:
-#line 1753 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 156:
+#line 1754 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].SInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
@@ -4074,8 +4083,8 @@
   ;}
     break;
 
-  case 156:
-#line 1759 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 157:
+#line 1760 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth();
     if ((yyvsp[0].APIntVal)->getBitWidth() > BitWidth) {
@@ -4088,8 +4097,8 @@
   ;}
     break;
 
-  case 157:
-#line 1769 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 158:
+#line 1770 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // integral constants
     if (!ConstantInt::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].UInt64Val)))
       GEN_ERROR("Constant value doesn't fit in type");
@@ -4098,8 +4107,8 @@
   ;}
     break;
 
-  case 158:
-#line 1775 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 159:
+#line 1776 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {      // arbitrary precision integer constants
     uint32_t BitWidth = cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth();
     if ((yyvsp[0].APIntVal)->getBitWidth() > BitWidth) {
@@ -4112,8 +4121,8 @@
   ;}
     break;
 
-  case 159:
-#line 1785 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 160:
+#line 1786 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                      // Boolean constants
     assert(cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?");
     (yyval.ConstVal) = ConstantInt::getTrue();
@@ -4121,8 +4130,8 @@
   ;}
     break;
 
-  case 160:
-#line 1790 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 161:
+#line 1791 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                     // Boolean constants
     assert(cast<IntegerType>((yyvsp[-1].PrimType))->getBitWidth() == 1 && "Not Bool?");
     (yyval.ConstVal) = ConstantInt::getFalse();
@@ -4130,8 +4139,8 @@
   ;}
     break;
 
-  case 161:
-#line 1795 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 162:
+#line 1796 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Float & Double constants
     if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType), (yyvsp[0].FPVal)))
       GEN_ERROR("Floating point constant invalid for type");
@@ -4140,8 +4149,8 @@
   ;}
     break;
 
-  case 162:
-#line 1803 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 163:
+#line 1804 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4156,8 +4165,8 @@
   ;}
     break;
 
-  case 163:
-#line 1815 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 164:
+#line 1816 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[-2].ConstVal)->getType()))
       GEN_ERROR("GetElementPtr requires a pointer operand");
@@ -4182,8 +4191,8 @@
   ;}
     break;
 
-  case 164:
-#line 1837 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 165:
+#line 1838 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-5].ConstVal)->getType() != Type::Int1Ty)
       GEN_ERROR("Select condition must be of boolean type");
@@ -4194,8 +4203,8 @@
   ;}
     break;
 
-  case 165:
-#line 1845 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 166:
+#line 1846 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Binary operator types must match");
@@ -4204,8 +4213,8 @@
   ;}
     break;
 
-  case 166:
-#line 1851 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 167:
+#line 1852 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("Logical operator types must match");
@@ -4219,8 +4228,8 @@
   ;}
     break;
 
-  case 167:
-#line 1862 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 168:
+#line 1863 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("icmp operand types must match");
@@ -4228,8 +4237,8 @@
   ;}
     break;
 
-  case 168:
-#line 1867 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 169:
+#line 1868 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-3].ConstVal)->getType() != (yyvsp[-1].ConstVal)->getType())
       GEN_ERROR("fcmp operand types must match");
@@ -4237,8 +4246,8 @@
   ;}
     break;
 
-  case 169:
-#line 1872 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 170:
+#line 1873 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -4247,8 +4256,8 @@
   ;}
     break;
 
-  case 170:
-#line 1878 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 171:
+#line 1879 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -4257,8 +4266,8 @@
   ;}
     break;
 
-  case 171:
-#line 1884 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 172:
+#line 1885 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-5].ConstVal), (yyvsp[-3].ConstVal), (yyvsp[-1].ConstVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -4267,16 +4276,16 @@
   ;}
     break;
 
-  case 172:
-#line 1893 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 173:
+#line 1894 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 173:
-#line 1897 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 174:
+#line 1898 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ConstVector) = new std::vector<Constant*>();
     (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
@@ -4284,18 +4293,18 @@
   ;}
     break;
 
-  case 174:
-#line 1905 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 175:
+#line 1906 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = false; ;}
     break;
 
-  case 175:
-#line 1905 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 176:
+#line 1906 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.BoolVal) = true; ;}
     break;
 
-  case 176:
-#line 1916 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 177:
+#line 1917 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4303,8 +4312,8 @@
   ;}
     break;
 
-  case 177:
-#line 1921 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 178:
+#line 1922 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ModuleVal) = ParserResult = CurModule.CurrentModule;
     CurModule.ModuleDone();
@@ -4312,40 +4321,40 @@
   ;}
     break;
 
-  case 180:
-#line 1934 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 181:
+#line 1935 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = false; ;}
     break;
 
-  case 181:
-#line 1934 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 182:
+#line 1935 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.FunctionDone();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 182:
-#line 1938 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 183:
+#line 1939 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { CurFun.isDeclare = true; ;}
     break;
 
-  case 183:
-#line 1938 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 184:
+#line 1939 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 184:
-#line 1941 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 185:
+#line 1942 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 185:
-#line 1944 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 186:
+#line 1945 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     // Emit an error if there are any unresolved types left.
     if (!CurModule.LateResolveTypes.empty()) {
@@ -4360,8 +4369,8 @@
   ;}
     break;
 
-  case 186:
-#line 1956 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 187:
+#line 1957 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -4388,8 +4397,8 @@
   ;}
     break;
 
-  case 187:
-#line 1980 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 188:
+#line 1981 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     ResolveTypeTo((yyvsp[-2].StrVal), (yyvsp[0].PrimType));
 
@@ -4403,8 +4412,8 @@
   ;}
     break;
 
-  case 188:
-#line 1991 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 189:
+#line 1992 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     /* "Externally Visible" Linkage */
     if ((yyvsp[0].ConstVal) == 0) 
@@ -4415,15 +4424,15 @@
   ;}
     break;
 
-  case 189:
-#line 1998 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 190:
+#line 1999 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 190:
-#line 2001 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 191:
+#line 2002 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[0].ConstVal) == 0) 
       GEN_ERROR("Global value initializer is not a constant");
@@ -4432,15 +4441,15 @@
   ;}
     break;
 
-  case 191:
-#line 2006 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 192:
+#line 2007 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
   ;}
     break;
 
-  case 192:
-#line 2009 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 193:
+#line 2010 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -4450,30 +4459,30 @@
   ;}
     break;
 
-  case 193:
-#line 2015 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 194:
+#line 2016 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurGV = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 194:
-#line 2019 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 195:
+#line 2020 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { 
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 195:
-#line 2022 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 196:
+#line 2023 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 196:
-#line 2028 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 197:
+#line 2029 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   const std::string &AsmSoFar = CurModule.CurrentModule->getModuleInlineAsm();
   char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
@@ -4488,24 +4497,24 @@
 ;}
     break;
 
-  case 197:
-#line 2041 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 198:
+#line 2042 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
   ;}
     break;
 
-  case 198:
-#line 2045 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 199:
+#line 2046 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
     free((yyvsp[0].StrVal));
   ;}
     break;
 
-  case 200:
-#line 2052 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 201:
+#line 2053 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4513,8 +4522,8 @@
         ;}
     break;
 
-  case 201:
-#line 2057 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 202:
+#line 2058 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
           free((yyvsp[0].StrVal));
@@ -4522,15 +4531,15 @@
         ;}
     break;
 
-  case 202:
-#line 2062 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 203:
+#line 2063 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
           CHECK_FOR_ERROR
         ;}
     break;
 
-  case 203:
-#line 2071 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 204:
+#line 2072 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -4543,8 +4552,8 @@
   ;}
     break;
 
-  case 204:
-#line 2081 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 205:
+#line 2082 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -4557,16 +4566,16 @@
   ;}
     break;
 
-  case 205:
-#line 2092 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 206:
+#line 2093 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[0].ArgList);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 206:
-#line 2096 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 207:
+#line 2097 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = (yyvsp[-2].ArgList);
     struct ArgListEntry E;
@@ -4578,8 +4587,8 @@
   ;}
     break;
 
-  case 207:
-#line 2105 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 208:
+#line 2106 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = new ArgListType;
     struct ArgListEntry E;
@@ -4591,16 +4600,16 @@
   ;}
     break;
 
-  case 208:
-#line 2114 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 209:
+#line 2115 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ArgList) = 0;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 209:
-#line 2120 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 210:
+#line 2121 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   UnEscapeLexed((yyvsp[-6].StrVal));
   std::string FunctionName((yyvsp[-6].StrVal));
@@ -4713,8 +4722,8 @@
 ;}
     break;
 
-  case 212:
-#line 2233 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 213:
+#line 2234 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = CurFun.CurrentFunction;
 
@@ -4725,16 +4734,16 @@
 ;}
     break;
 
-  case 215:
-#line 2244 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 216:
+#line 2245 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
   (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
   CHECK_FOR_ERROR
 ;}
     break;
 
-  case 216:
-#line 2249 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 217:
+#line 2250 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     CurFun.CurrentFunction->setLinkage((yyvsp[-2].Linkage));
     CurFun.CurrentFunction->setVisibility((yyvsp[-1].Visibility));
@@ -4744,88 +4753,88 @@
   ;}
     break;
 
-  case 217:
-#line 2261 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 218:
+#line 2262 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 218:
-#line 2265 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 219:
+#line 2266 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 219:
-#line 2270 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 220:
+#line 2271 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    // A reference to a direct constant
     (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 220:
-#line 2274 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 221:
+#line 2275 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 221:
-#line 2278 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 222:
+#line 2279 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                     // Perhaps it's an FP constant?
     (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 222:
-#line 2282 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 223:
+#line 2283 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getTrue());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 223:
-#line 2286 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 224:
+#line 2287 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create(ConstantInt::getFalse());
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 224:
-#line 2290 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 225:
+#line 2291 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createNull();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 225:
-#line 2294 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 226:
+#line 2295 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createUndef();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 226:
-#line 2298 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 227:
+#line 2299 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {     // A vector zero constant.
     (yyval.ValIDVal) = ValID::createZeroInit();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 227:
-#line 2302 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 228:
+#line 2303 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Nonempty unsized packed vector
     const Type *ETy = (*(yyvsp[-1].ConstVector))[0]->getType();
     int NumElements = (yyvsp[-1].ConstVector)->size(); 
@@ -4853,16 +4862,16 @@
   ;}
     break;
 
-  case 228:
-#line 2327 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 229:
+#line 2328 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 229:
-#line 2331 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 230:
+#line 2332 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
     std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
@@ -4875,40 +4884,40 @@
   ;}
     break;
 
-  case 230:
-#line 2345 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 231:
+#line 2346 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {  // Is it an integer reference...?
     (yyval.ValIDVal) = ValID::createLocalID((yyvsp[0].UIntVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 231:
-#line 2349 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 232:
+#line 2350 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValIDVal) = ValID::createGlobalID((yyvsp[0].UIntVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 232:
-#line 2353 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 233:
+#line 2354 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createLocalName((yyvsp[0].StrVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 233:
-#line 2357 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 234:
+#line 2358 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                   // Is it a named reference...?
     (yyval.ValIDVal) = ValID::createGlobalName((yyvsp[0].StrVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 236:
-#line 2369 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 237:
+#line 2370 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -4918,24 +4927,24 @@
   ;}
     break;
 
-  case 237:
-#line 2378 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 238:
+#line 2379 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 238:
-#line 2382 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 239:
+#line 2383 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { // Do not allow functions with 0 basic blocks   
     (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 239:
-#line 2391 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 240:
+#line 2392 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
     CHECK_FOR_ERROR
@@ -4946,8 +4955,8 @@
   ;}
     break;
 
-  case 240:
-#line 2400 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 241:
+#line 2401 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (CastInst *CI1 = dyn_cast<CastInst>((yyvsp[0].InstVal)))
       if (CastInst *CI2 = dyn_cast<CastInst>(CI1->getOperand(0)))
@@ -4959,40 +4968,40 @@
   ;}
     break;
 
-  case 241:
-#line 2409 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 242:
+#line 2410 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {          // Empty space between instruction lists
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalID(CurFun.NextValNum));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 242:
-#line 2413 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 243:
+#line 2414 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {             // Labelled (named) basic block
     (yyval.BasicBlockVal) = defineBBVal(ValID::createLocalName((yyvsp[0].StrVal)));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 243:
-#line 2418 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 244:
+#line 2419 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {              // Return with a result...
     (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal));
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 244:
-#line 2422 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 245:
+#line 2423 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                                    // Return with no result...
     (yyval.TermInstVal) = new ReturnInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 245:
-#line 2426 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 246:
+#line 2427 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {                           // Unconditional Branch...
     BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
     CHECK_FOR_ERROR
@@ -5000,8 +5009,8 @@
   ;}
     break;
 
-  case 246:
-#line 2431 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 247:
+#line 2432 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {  
     assert(cast<IntegerType>((yyvsp[-7].PrimType))->getBitWidth() == 1 && "Not Bool?");
     BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
@@ -5014,8 +5023,8 @@
   ;}
     break;
 
-  case 247:
-#line 2441 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 248:
+#line 2442 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-7].PrimType), (yyvsp[-6].ValIDVal));
     CHECK_FOR_ERROR
@@ -5037,8 +5046,8 @@
   ;}
     break;
 
-  case 248:
-#line 2460 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 249:
+#line 2461 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     Value* tmpVal = getVal((yyvsp[-6].PrimType), (yyvsp[-5].ValIDVal));
     CHECK_FOR_ERROR
@@ -5050,8 +5059,8 @@
   ;}
     break;
 
-  case 249:
-#line 2470 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 250:
+#line 2471 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -5122,24 +5131,24 @@
   ;}
     break;
 
-  case 250:
-#line 2538 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 251:
+#line 2539 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnwindInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 251:
-#line 2542 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 252:
+#line 2543 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.TermInstVal) = new UnreachableInst();
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 252:
-#line 2549 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 253:
+#line 2550 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = (yyvsp[-5].JumpTable);
     Constant *V = cast<Constant>(getExistingVal((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -5153,8 +5162,8 @@
   ;}
     break;
 
-  case 253:
-#line 2560 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 254:
+#line 2561 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.JumpTable) = new std::vector<std::pair<Constant*, BasicBlock*> >();
     Constant *V = cast<Constant>(getExistingVal((yyvsp[-4].PrimType), (yyvsp[-3].ValIDVal)));
@@ -5169,8 +5178,8 @@
   ;}
     break;
 
-  case 254:
-#line 2573 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 255:
+#line 2574 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     // Is this definition named?? if so, assign the name...
     setValueName((yyvsp[0].InstVal), (yyvsp[-1].StrVal));
@@ -5181,8 +5190,8 @@
   ;}
     break;
 
-  case 255:
-#line 2583 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 256:
+#line 2584 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    // Used for PHI nodes
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-5].TypeVal))->getDescription());
@@ -5196,8 +5205,8 @@
   ;}
     break;
 
-  case 256:
-#line 2594 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 257:
+#line 2595 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.PHIList) = (yyvsp[-6].PHIList);
     Value* tmpVal = getVal((yyvsp[-6].PHIList)->front().first->getType(), (yyvsp[-3].ValIDVal));
@@ -5208,8 +5217,8 @@
   ;}
     break;
 
-  case 257:
-#line 2604 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 258:
+#line 2605 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {    
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5221,8 +5230,8 @@
   ;}
     break;
 
-  case 258:
-#line 2613 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 259:
+#line 2614 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5234,18 +5243,18 @@
   ;}
     break;
 
-  case 259:
-#line 2622 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 260:
+#line 2623 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueRefList) = new ValueRefList(); ;}
     break;
 
-  case 260:
-#line 2625 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 261:
+#line 2626 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     { (yyval.ValueList) = new std::vector<Value*>(); ;}
     break;
 
-  case 261:
-#line 2626 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 262:
+#line 2627 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.ValueList) = (yyvsp[-2].ValueList);
     (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
@@ -5253,24 +5262,24 @@
   ;}
     break;
 
-  case 262:
-#line 2633 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 263:
+#line 2634 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 263:
-#line 2637 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 264:
+#line 2638 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 264:
-#line 2642 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 265:
+#line 2643 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5294,8 +5303,8 @@
   ;}
     break;
 
-  case 265:
-#line 2663 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 266:
+#line 2664 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5315,8 +5324,8 @@
   ;}
     break;
 
-  case 266:
-#line 2680 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 267:
+#line 2681 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5333,8 +5342,8 @@
   ;}
     break;
 
-  case 267:
-#line 2694 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 268:
+#line 2695 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-3].TypeVal))->getDescription());
@@ -5351,8 +5360,8 @@
   ;}
     break;
 
-  case 268:
-#line 2708 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 269:
+#line 2709 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -5367,8 +5376,8 @@
   ;}
     break;
 
-  case 269:
-#line 2720 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 270:
+#line 2721 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if ((yyvsp[-4].ValueVal)->getType() != Type::Int1Ty)
       GEN_ERROR("select condition must be boolean");
@@ -5379,8 +5388,8 @@
   ;}
     break;
 
-  case 270:
-#line 2728 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 271:
+#line 2729 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[0].TypeVal))->getDescription());
@@ -5390,8 +5399,8 @@
   ;}
     break;
 
-  case 271:
-#line 2735 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 272:
+#line 2736 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ExtractElementInst::isValidOperands((yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid extractelement operands");
@@ -5400,8 +5409,8 @@
   ;}
     break;
 
-  case 272:
-#line 2741 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 273:
+#line 2742 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!InsertElementInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid insertelement operands");
@@ -5410,8 +5419,8 @@
   ;}
     break;
 
-  case 273:
-#line 2747 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 274:
+#line 2748 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!ShuffleVectorInst::isValidOperands((yyvsp[-4].ValueVal), (yyvsp[-2].ValueVal), (yyvsp[0].ValueVal)))
       GEN_ERROR("Invalid shufflevector operands");
@@ -5420,8 +5429,8 @@
   ;}
     break;
 
-  case 274:
-#line 2753 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 275:
+#line 2754 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     const Type *Ty = (yyvsp[0].PHIList)->front().first->getType();
     if (!Ty->isFirstClassType())
@@ -5439,8 +5448,8 @@
   ;}
     break;
 
-  case 275:
-#line 2769 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 276:
+#line 2770 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
 
     // Handle the short syntax
@@ -5506,32 +5515,32 @@
   ;}
     break;
 
-  case 276:
-#line 2832 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 277:
+#line 2833 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.InstVal) = (yyvsp[0].InstVal);
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 277:
-#line 2837 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 278:
+#line 2838 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = true;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 278:
-#line 2841 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 279:
+#line 2842 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     (yyval.BoolVal) = false;
     CHECK_FOR_ERROR
   ;}
     break;
 
-  case 279:
-#line 2848 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 280:
+#line 2849 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5541,8 +5550,8 @@
   ;}
     break;
 
-  case 280:
-#line 2855 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 281:
+#line 2856 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
@@ -5553,8 +5562,8 @@
   ;}
     break;
 
-  case 281:
-#line 2863 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 282:
+#line 2864 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5564,8 +5573,8 @@
   ;}
     break;
 
-  case 282:
-#line 2870 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 283:
+#line 2871 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-4].TypeVal))->getDescription());
@@ -5576,8 +5585,8 @@
   ;}
     break;
 
-  case 283:
-#line 2878 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 284:
+#line 2879 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!isa<PointerType>((yyvsp[0].ValueVal)->getType()))
       GEN_ERROR("Trying to free nonpointer type " + 
@@ -5587,8 +5596,8 @@
   ;}
     break;
 
-  case 284:
-#line 2886 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 285:
+#line 2887 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5605,8 +5614,8 @@
   ;}
     break;
 
-  case 285:
-#line 2900 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 286:
+#line 2901 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-1].TypeVal))->getDescription());
@@ -5626,8 +5635,8 @@
   ;}
     break;
 
-  case 286:
-#line 2917 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+  case 287:
+#line 2918 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
     {
     if (!UpRefs.empty())
       GEN_ERROR("Invalid upreference in type: " + (*(yyvsp[-2].TypeVal))->getDescription());
@@ -5650,7 +5659,7 @@
     }
 
 /* Line 1126 of yacc.c.  */
-#line 5654 "llvmAsmParser.tab.c"
+#line 5663 "llvmAsmParser.tab.c"
 
   yyvsp -= yylen;
   yyssp -= yylen;
@@ -5918,7 +5927,7 @@
 }
 
 
-#line 2934 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
+#line 2935 "/proj/llvm/llvm-1/lib/AsmParser/llvmAsmParser.y"
 
 
 // common code from the two 'RunVMAsmParser' functions


Index: llvm/lib/AsmParser/llvmAsmParser.h.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.59 llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.60
--- llvm/lib/AsmParser/llvmAsmParser.h.cvs:1.59	Mon Mar 19 20:13:36 2007
+++ llvm/lib/AsmParser/llvmAsmParser.h.cvs	Wed Mar 21 21:14:08 2007
@@ -158,8 +158,9 @@
      NORETURN = 384,
      INREG = 385,
      SRET = 386,
-     DEFAULT = 387,
-     HIDDEN = 388
+     NOUNWIND = 387,
+     DEFAULT = 388,
+     HIDDEN = 389
    };
 #endif
 /* Tokens.  */
@@ -292,8 +293,9 @@
 #define NORETURN 384
 #define INREG 385
 #define SRET 386
-#define DEFAULT 387
-#define HIDDEN 388
+#define NOUNWIND 387
+#define DEFAULT 388
+#define HIDDEN 389
 
 
 
@@ -347,7 +349,7 @@
   llvm::FCmpInst::Predicate         FPredicate;
 } YYSTYPE;
 /* Line 1447 of yacc.c.  */
-#line 351 "llvmAsmParser.tab.h"
+#line 353 "llvmAsmParser.tab.h"
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 # define YYSTYPE_IS_TRIVIAL 1


Index: llvm/lib/AsmParser/llvmAsmParser.y.cvs
diff -u llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.77 llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.78
--- llvm/lib/AsmParser/llvmAsmParser.y.cvs:1.77	Tue Mar 20 12:19:31 2007
+++ llvm/lib/AsmParser/llvmAsmParser.y.cvs	Wed Mar 21 21:14:08 2007
@@ -1078,7 +1078,7 @@
 %token <OtherOpVal> EXTRACTELEMENT INSERTELEMENT SHUFFLEVECTOR
 
 // Function Attributes
-%token NORETURN INREG SRET
+%token NORETURN INREG SRET NOUNWIND
 
 // Visibility Styles
 %token DEFAULT HIDDEN
@@ -1204,6 +1204,7 @@
               ;
 
 FuncAttr      : NORETURN { $$ = FunctionType::NoReturnAttribute; }
+              | NOUNWIND { $$ = FunctionType::NoUnwindAttribute; }
               | ParamAttr
               ;
 





From reid at x10sys.com  Wed Mar 21 21:15:06 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 21:15:06 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Type.cpp
Message-ID: <200703220215.l2M2F66q001379@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

Type.cpp updated: 1.176 -> 1.177
---
Log message:

Add the NoUnwind function attribute.


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

 Type.cpp |    2 ++
 1 files changed, 2 insertions(+)


Index: llvm/lib/VMCore/Type.cpp
diff -u llvm/lib/VMCore/Type.cpp:1.176 llvm/lib/VMCore/Type.cpp:1.177
--- llvm/lib/VMCore/Type.cpp:1.176	Wed Feb 28 22:02:06 2007
+++ llvm/lib/VMCore/Type.cpp	Wed Mar 21 21:14:48 2007
@@ -1073,6 +1073,8 @@
     Result += "sext ";
   if (Attr & NoReturnAttribute)
     Result += "noreturn ";
+  if (Attr & NoUnwindAttribute)
+    Result += "nounwind ";
   if (Attr & InRegAttribute)
     Result += "inreg ";
   if (Attr & StructRetAttribute)





From reid at x10sys.com  Wed Mar 21 21:15:37 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 21:15:37 -0500
Subject: [llvm-commits] CVS: llvm/test/Feature/paramattrs.ll
Message-ID: <200703220215.l2M2FbKI001396@zion.cs.uiuc.edu>



Changes in directory llvm/test/Feature:

paramattrs.ll updated: 1.5 -> 1.6
---
Log message:

Add tests for nounwind and noreturn function attributes.


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

 paramattrs.ll |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/test/Feature/paramattrs.ll
diff -u llvm/test/Feature/paramattrs.ll:1.5 llvm/test/Feature/paramattrs.ll:1.6
--- llvm/test/Feature/paramattrs.ll:1.5	Tue Jan 30 10:16:01 2007
+++ llvm/test/Feature/paramattrs.ll	Wed Mar 21 21:15:17 2007
@@ -8,9 +8,9 @@
 declare i16 @"test"(i16 sext %arg) sext 
 declare i8 @"test2" (i16 zext %a2) zext 
 
-implementation
+declare void @exit(i32) noreturn nounwind
 
-define i32 @main(i32 %argc, i8 **%argv) {
+define i32 @main(i32 %argc, i8 **%argv) nounwind inreg {
     %val = trunc i32 %argc to i16
     %res1 = call i16 (i16 sext) sext *@test(i16 %val)
     %two = add i16 %res1, %res1





From reid at x10sys.com  Wed Mar 21 21:19:14 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 21:19:14 -0500
Subject: [llvm-commits] CVS: llvm/docs/LangRef.html
Message-ID: <200703220219.l2M2JElN001925@zion.cs.uiuc.edu>



Changes in directory llvm/docs:

LangRef.html updated: 1.213 -> 1.214
---
Log message:

Add noreturn function attribute.


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

 LangRef.html |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)


Index: llvm/docs/LangRef.html
diff -u llvm/docs/LangRef.html:1.213 llvm/docs/LangRef.html:1.214
--- llvm/docs/LangRef.html:1.213	Wed Mar 21 21:02:11 2007
+++ llvm/docs/LangRef.html	Wed Mar 21 21:18:56 2007
@@ -739,6 +739,10 @@
     <dt><tt>sret</tt></dt>
     <dd>This indicates that the parameter specifies the address of a structure
     that is the return value of the function in the source program.</dd>
+    <dt><tt>noreturn</tt></dt>
+    <dd>This function attribute indicates that the function never returns. This
+    indicates to LLVM that every call to this function should be treated as if
+    an <tt>unreachable</tt> instruction immediately followed the call.</dd> 
     <dt><tt>nounwind</tt></dt>
     <dd>This function attribute indicates that the function type does not use
     the unwind instruction and does not allow stack unwinding to propagate
@@ -4606,7 +4610,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.org">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2007/03/22 02:02:11 $
+  Last modified: $Date: 2007/03/22 02:18:56 $
 </address>
 </body>
 </html>





From reid at x10sys.com  Wed Mar 21 21:53:26 2007
From: reid at x10sys.com (Reid Spencer)
Date: Wed, 21 Mar 2007 21:53:26 -0500
Subject: [llvm-commits] CVS:
	llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll
Message-ID: <200703220253.l2M2rQJU014477@zion.cs.uiuc.edu>



Changes in directory llvm/test/Transforms/InstCombine:

2007-03-21-SignedRangeTest.ll updated: 1.1 -> 1.2
---
Log message:

Make this test actually match the generated code.


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

 2007-03-21-SignedRangeTest.ll |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll
diff -u llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll:1.1 llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll:1.2
--- llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll:1.1	Wed Mar 21 19:49:40 2007
+++ llvm/test/Transforms/InstCombine/2007-03-21-SignedRangeTest.ll	Wed Mar 21 21:53:05 2007
@@ -1,5 +1,5 @@
 ; For PR1248
-; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | grep 'ugt i32 %tmp6, 11'
+; RUN: llvm-as %s -o - | opt -instcombine | llvm-dis | grep 'ugt i32 .*, 11'
 define i1 @test(i32 %tmp6) {
   %tmp7 = sdiv i32 %tmp6, 12     ; <i32> [#uses=1]
   icmp ne i32 %tmp7, -6           ; <i1>:1 [#uses=1]





From evan.cheng at apple.com  Thu Mar 22 02:42:00 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Thu, 22 Mar 2007 00:42:00 -0700
Subject: [llvm-commits] CVS: llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
	UpgradeLexer.l.cvs UpgradeParser.cpp.cvs UpgradeParser.h.cvs
	UpgradeParser.y.cvs
In-Reply-To: <200703211716.l2LHG8iN000389@zion.cs.uiuc.edu>
References: <200703211716.l2LHG8iN000389@zion.cs.uiuc.edu>
Message-ID: <02427838-A0E6-4A20-9949-3C10B6B73896@apple.com>

Reid,

Shouldn't Signedness::dump be wrapped in #ifndef NDEBUG? I think this  
is breaking non-debug builds.

Evan

On Mar 21, 2007, at 10:16 AM, Reid Spencer wrote:

>
>
> Changes in directory llvm/tools/llvm-upgrade:
>
> UpgradeLexer.cpp.cvs updated: 1.22 -> 1.23
> UpgradeLexer.l.cvs updated: 1.19 -> 1.20
> UpgradeParser.cpp.cvs updated: 1.66 -> 1.67
> UpgradeParser.h.cvs updated: 1.50 -> 1.51
> UpgradeParser.y.cvs updated: 1.65 -> 1.66
> ---
> Log message:
>
> Regenerate.
>
>
> ---
> Diffs of the changes:  (+1558 -905)
>
>  UpgradeLexer.cpp.cvs  |  379 +++++++-------
>  UpgradeLexer.l.cvs    |   43 -
>  UpgradeParser.cpp.cvs | 1282 ++++++++++++++++++++++++++++++ 
> +-------------------
>  UpgradeParser.h.cvs   |    4
>  UpgradeParser.y.cvs   |  755 ++++++++++++++++++++---------
>  5 files changed, 1558 insertions(+), 905 deletions(-)
>
>
> Index: llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
> diff -u llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs:1.22 llvm/ 
> tools/llvm-upgrade/UpgradeLexer.cpp.cvs:1.23
> --- llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs:1.22	Wed Mar 14  
> 22:26:42 2007
> +++ llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs	Wed Mar 21  
> 12:15:50 2007
> @@ -20,7 +20,7 @@
>  /* A lexical scanner generated by flex*/
>
>  /* Scanner skeleton version:
> - * $Header: /var/cvs/llvm/llvm/tools/llvm-upgrade/ 
> UpgradeLexer.cpp.cvs,v 1.22 2007/03/15 03:26:42 reid Exp $
> + * $Header: /var/cvs/llvm/llvm/tools/llvm-upgrade/ 
> UpgradeLexer.cpp.cvs,v 1.23 2007/03/21 17:15:50 reid Exp $
>   */
>
>  #define FLEX_SCANNER
> @@ -976,7 +976,12 @@
>
>  #define RET_TY(sym,NewTY,sign) \
>    Upgradelval.PrimType.T = NewTY; \
> -  Upgradelval.PrimType.S = sign; \
> +  switch (sign) { \
> +    case 0: Upgradelval.PrimType.S.makeSignless(); break; \
> +    case 1: Upgradelval.PrimType.S.makeUnsigned(); break; \
> +    case 2: Upgradelval.PrimType.S.makeSigned(); break; \
> +    default: assert(0 && "Invalid sign kind"); break; \
> +  }\
>    return sym
>
>  namespace llvm {
> @@ -1085,7 +1090,7 @@
>  /* HexIntConstant - Hexadecimal constant generated by the CFE to  
> avoid forcing
>   * it to deal with 64 bit numbers.
>   */
> -#line 1089 "UpgradeLexer.cpp"
> +#line 1094 "UpgradeLexer.cpp"
>
>  /* Macros after this point can all be overridden by user  
> definitions in
>   * section 1.
> @@ -1236,10 +1241,10 @@
>  	register char *yy_cp = NULL, *yy_bp = NULL;
>  	register int yy_act;
>
> -#line 189 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 194 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>
>
> -#line 1243 "UpgradeLexer.cpp"
> +#line 1248 "UpgradeLexer.cpp"
>
>  	if ( yy_init )
>  		{
> @@ -1332,742 +1337,742 @@
>  	{ /* beginning of action switch */
>  case 1:
>  YY_RULE_SETUP
> -#line 191 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 196 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { /* Ignore comments for now */ }
>  	YY_BREAK
>  case 2:
>  YY_RULE_SETUP
> -#line 193 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 198 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return BEGINTOK; }
>  	YY_BREAK
>  case 3:
>  YY_RULE_SETUP
> -#line 194 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 199 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return ENDTOK; }
>  	YY_BREAK
>  case 4:
>  YY_RULE_SETUP
> -#line 195 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 200 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return TRUETOK;  }
>  	YY_BREAK
>  case 5:
>  YY_RULE_SETUP
> -#line 196 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 201 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return FALSETOK; }
>  	YY_BREAK
>  case 6:
>  YY_RULE_SETUP
> -#line 197 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 202 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return DECLARE; }
>  	YY_BREAK
>  case 7:
>  YY_RULE_SETUP
> -#line 198 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return GLOBAL; }
>  	YY_BREAK
>  case 8:
>  YY_RULE_SETUP
> -#line 199 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 204 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return CONSTANT; }
>  	YY_BREAK
>  case 9:
>  YY_RULE_SETUP
> -#line 200 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 205 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return INTERNAL; }
>  	YY_BREAK
>  case 10:
>  YY_RULE_SETUP
> -#line 201 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 206 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return LINKONCE; }
>  	YY_BREAK
>  case 11:
>  YY_RULE_SETUP
> -#line 202 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 207 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return WEAK; }
>  	YY_BREAK
>  case 12:
>  YY_RULE_SETUP
> -#line 203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 208 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return APPENDING; }
>  	YY_BREAK
>  case 13:
>  YY_RULE_SETUP
> -#line 204 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 209 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return DLLIMPORT; }
>  	YY_BREAK
>  case 14:
>  YY_RULE_SETUP
> -#line 205 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 210 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return DLLEXPORT; }
>  	YY_BREAK
>  case 15:
>  YY_RULE_SETUP
> -#line 206 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 211 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return EXTERN_WEAK; }
>  	YY_BREAK
>  case 16:
>  YY_RULE_SETUP
> -#line 207 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 212 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return EXTERNAL; }    /* Deprecated, turn into external */
>  	YY_BREAK
>  case 17:
>  YY_RULE_SETUP
> -#line 208 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 213 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return EXTERNAL; }
>  	YY_BREAK
>  case 18:
>  YY_RULE_SETUP
> -#line 209 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 214 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return IMPLEMENTATION; }
>  	YY_BREAK
>  case 19:
>  YY_RULE_SETUP
> -#line 210 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 215 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return ZEROINITIALIZER; }
>  	YY_BREAK
>  case 20:
>  YY_RULE_SETUP
> -#line 211 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 216 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return DOTDOTDOT; }
>  	YY_BREAK
>  case 21:
>  YY_RULE_SETUP
> -#line 212 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 217 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return UNDEF; }
>  	YY_BREAK
>  case 22:
>  YY_RULE_SETUP
> -#line 213 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 218 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return NULL_TOK; }
>  	YY_BREAK
>  case 23:
>  YY_RULE_SETUP
> -#line 214 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 219 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return TO; }
>  	YY_BREAK
>  case 24:
>  YY_RULE_SETUP
> -#line 215 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 220 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return EXCEPT; }
>  	YY_BREAK
>  case 25:
>  YY_RULE_SETUP
> -#line 216 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 221 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return NOT; }  /* Deprecated, turned into XOR */
>  	YY_BREAK
>  case 26:
>  YY_RULE_SETUP
> -#line 217 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 222 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return TAIL; }
>  	YY_BREAK
>  case 27:
>  YY_RULE_SETUP
> -#line 218 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return TARGET; }
>  	YY_BREAK
>  case 28:
>  YY_RULE_SETUP
> -#line 219 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 224 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return TRIPLE; }
>  	YY_BREAK
>  case 29:
>  YY_RULE_SETUP
> -#line 220 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 225 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return DEPLIBS; }
>  	YY_BREAK
>  case 30:
>  YY_RULE_SETUP
> -#line 221 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 226 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return ENDIAN; }
>  	YY_BREAK
>  case 31:
>  YY_RULE_SETUP
> -#line 222 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 227 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return POINTERSIZE; }
>  	YY_BREAK
>  case 32:
>  YY_RULE_SETUP
> -#line 223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return DATALAYOUT; }
>  	YY_BREAK
>  case 33:
>  YY_RULE_SETUP
> -#line 224 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 229 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return LITTLE; }
>  	YY_BREAK
>  case 34:
>  YY_RULE_SETUP
> -#line 225 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 230 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return BIG; }
>  	YY_BREAK
>  case 35:
>  YY_RULE_SETUP
> -#line 226 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return VOLATILE; }
>  	YY_BREAK
>  case 36:
>  YY_RULE_SETUP
> -#line 227 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 232 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return ALIGN;  }
>  	YY_BREAK
>  case 37:
>  YY_RULE_SETUP
> -#line 228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 233 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return SECTION; }
>  	YY_BREAK
>  case 38:
>  YY_RULE_SETUP
> -#line 229 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 234 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return MODULE; }
>  	YY_BREAK
>  case 39:
>  YY_RULE_SETUP
> -#line 230 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 235 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return ASM_TOK; }
>  	YY_BREAK
>  case 40:
>  YY_RULE_SETUP
> -#line 231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 236 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return SIDEEFFECT; }
>  	YY_BREAK
>  case 41:
>  YY_RULE_SETUP
> -#line 233 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 238 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return CC_TOK; }
>  	YY_BREAK
>  case 42:
>  YY_RULE_SETUP
> -#line 234 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 239 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return CCC_TOK; }
>  	YY_BREAK
>  case 43:
>  YY_RULE_SETUP
> -#line 235 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 240 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return CSRETCC_TOK; }
>  	YY_BREAK
>  case 44:
>  YY_RULE_SETUP
> -#line 236 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 241 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return FASTCC_TOK; }
>  	YY_BREAK
>  case 45:
>  YY_RULE_SETUP
> -#line 237 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 242 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return COLDCC_TOK; }
>  	YY_BREAK
>  case 46:
>  YY_RULE_SETUP
> -#line 238 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 243 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return X86_STDCALLCC_TOK; }
>  	YY_BREAK
>  case 47:
>  YY_RULE_SETUP
> -#line 239 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 244 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return X86_FASTCALLCC_TOK; }
>  	YY_BREAK
>  case 48:
>  YY_RULE_SETUP
> -#line 241 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(SBYTE,  Type::Int8Ty,  Signed);  }
> +#line 246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(SBYTE,  Type::Int8Ty,  2); }
>  	YY_BREAK
>  case 49:
>  YY_RULE_SETUP
> -#line 242 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(UBYTE,  Type::Int8Ty,  Unsigned); }
> +#line 247 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(UBYTE,  Type::Int8Ty,  1); }
>  	YY_BREAK
>  case 50:
>  YY_RULE_SETUP
> -#line 243 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(UBYTE,  Type::Int8Ty,  Unsigned); }
> +#line 248 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(UBYTE,  Type::Int8Ty,  1); }
>  	YY_BREAK
>  case 51:
>  YY_RULE_SETUP
> -#line 244 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(SHORT,  Type::Int16Ty, Signed);  }
> +#line 249 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(SHORT,  Type::Int16Ty, 2); }
>  	YY_BREAK
>  case 52:
>  YY_RULE_SETUP
> -#line 245 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(USHORT, Type::Int16Ty, Unsigned); }
> +#line 250 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(USHORT, Type::Int16Ty, 1); }
>  	YY_BREAK
>  case 53:
>  YY_RULE_SETUP
> -#line 246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(USHORT, Type::Int16Ty, Unsigned); }
> +#line 251 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(USHORT, Type::Int16Ty, 1); }
>  	YY_BREAK
>  case 54:
>  YY_RULE_SETUP
> -#line 247 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(INT,    Type::Int32Ty, Signed);  }
> +#line 252 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(INT,    Type::Int32Ty, 2); }
>  	YY_BREAK
>  case 55:
>  YY_RULE_SETUP
> -#line 248 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(UINT,   Type::Int32Ty, Unsigned); }
> +#line 253 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(UINT,   Type::Int32Ty, 1); }
>  	YY_BREAK
>  case 56:
>  YY_RULE_SETUP
> -#line 249 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(UINT,   Type::Int32Ty, Unsigned); }
> +#line 254 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(UINT,   Type::Int32Ty, 1); }
>  	YY_BREAK
>  case 57:
>  YY_RULE_SETUP
> -#line 250 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(LONG,   Type::Int64Ty, Signed);  }
> +#line 255 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(LONG,   Type::Int64Ty, 2); }
>  	YY_BREAK
>  case 58:
>  YY_RULE_SETUP
> -#line 251 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(ULONG,  Type::Int64Ty, Unsigned); }
> +#line 256 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(ULONG,  Type::Int64Ty, 1); }
>  	YY_BREAK
>  case 59:
>  YY_RULE_SETUP
> -#line 252 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(ULONG,  Type::Int64Ty, Unsigned); }
> +#line 257 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(ULONG,  Type::Int64Ty, 1); }
>  	YY_BREAK
>  case 60:
>  YY_RULE_SETUP
> -#line 253 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(VOID,   Type::VoidTy,  Signless  ); }
> +#line 258 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(VOID,   Type::VoidTy,  0); }
>  	YY_BREAK
>  case 61:
>  YY_RULE_SETUP
> -#line 254 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(BOOL,   Type::Int1Ty,  Unsigned  ); }
> +#line 259 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(BOOL,   Type::Int1Ty,  1); }
>  	YY_BREAK
>  case 62:
>  YY_RULE_SETUP
> -#line 255 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(BOOL,   Type::Int1Ty,  Unsigned  ); }
> +#line 260 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(BOOL,   Type::Int1Ty,  1); }
>  	YY_BREAK
>  case 63:
>  YY_RULE_SETUP
> -#line 256 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(FLOAT,  Type::FloatTy, Signless ); }
> +#line 261 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(FLOAT,  Type::FloatTy, 0); }
>  	YY_BREAK
>  case 64:
>  YY_RULE_SETUP
> -#line 257 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(DOUBLE, Type::DoubleTy,Signless); }
> +#line 262 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(DOUBLE, Type::DoubleTy,0); }
>  	YY_BREAK
>  case 65:
>  YY_RULE_SETUP
> -#line 258 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> -{ RET_TY(LABEL,  Type::LabelTy, Signless ); }
> +#line 263 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +{ RET_TY(LABEL,  Type::LabelTy, 0); }
>  	YY_BREAK
>  case 66:
>  YY_RULE_SETUP
> -#line 259 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 264 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return TYPE;   }
>  	YY_BREAK
>  case 67:
>  YY_RULE_SETUP
> -#line 260 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 265 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return OPAQUE; }
>  	YY_BREAK
>  case 68:
>  YY_RULE_SETUP
> -#line 262 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 267 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, AddOp, ADD); }
>  	YY_BREAK
>  case 69:
>  YY_RULE_SETUP
> -#line 263 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 268 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, SubOp, SUB); }
>  	YY_BREAK
>  case 70:
>  YY_RULE_SETUP
> -#line 264 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 269 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, MulOp, MUL); }
>  	YY_BREAK
>  case 71:
>  YY_RULE_SETUP
> -#line 265 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 270 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, DivOp,  DIV); }
>  	YY_BREAK
>  case 72:
>  YY_RULE_SETUP
> -#line 266 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 271 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, UDivOp, UDIV); }
>  	YY_BREAK
>  case 73:
>  YY_RULE_SETUP
> -#line 267 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 272 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, SDivOp, SDIV); }
>  	YY_BREAK
>  case 74:
>  YY_RULE_SETUP
> -#line 268 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 273 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, FDivOp, FDIV); }
>  	YY_BREAK
>  case 75:
>  YY_RULE_SETUP
> -#line 269 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 274 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, RemOp,  REM); }
>  	YY_BREAK
>  case 76:
>  YY_RULE_SETUP
> -#line 270 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 275 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, URemOp, UREM); }
>  	YY_BREAK
>  case 77:
>  YY_RULE_SETUP
> -#line 271 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 276 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, SRemOp, SREM); }
>  	YY_BREAK
>  case 78:
>  YY_RULE_SETUP
> -#line 272 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 277 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, FRemOp, FREM); }
>  	YY_BREAK
>  case 79:
>  YY_RULE_SETUP
> -#line 273 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 278 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, AndOp, AND); }
>  	YY_BREAK
>  case 80:
>  YY_RULE_SETUP
> -#line 274 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 279 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, OrOp , OR ); }
>  	YY_BREAK
>  case 81:
>  YY_RULE_SETUP
> -#line 275 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 280 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, XorOp, XOR); }
>  	YY_BREAK
>  case 82:
>  YY_RULE_SETUP
> -#line 276 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 281 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, SetNE, SETNE); }
>  	YY_BREAK
>  case 83:
>  YY_RULE_SETUP
> -#line 277 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 282 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
>  	YY_BREAK
>  case 84:
>  YY_RULE_SETUP
> -#line 278 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 283 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, SetLT, SETLT); }
>  	YY_BREAK
>  case 85:
>  YY_RULE_SETUP
> -#line 279 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 284 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, SetGT, SETGT); }
>  	YY_BREAK
>  case 86:
>  YY_RULE_SETUP
> -#line 280 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 285 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, SetLE, SETLE); }
>  	YY_BREAK
>  case 87:
>  YY_RULE_SETUP
> -#line 281 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 286 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, SetGE, SETGE); }
>  	YY_BREAK
>  case 88:
>  YY_RULE_SETUP
> -#line 282 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 287 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, ShlOp, SHL); }
>  	YY_BREAK
>  case 89:
>  YY_RULE_SETUP
> -#line 283 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 288 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, ShrOp, SHR); }
>  	YY_BREAK
>  case 90:
>  YY_RULE_SETUP
> -#line 284 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 289 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, LShrOp, LSHR); }
>  	YY_BREAK
>  case 91:
>  YY_RULE_SETUP
> -#line 285 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 290 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(BinaryOpVal, AShrOp, ASHR); }
>  	YY_BREAK
>  case 92:
>  YY_RULE_SETUP
> -#line 287 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 292 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(OtherOpVal, ICmpOp, ICMP); }
>  	YY_BREAK
>  case 93:
>  YY_RULE_SETUP
> -#line 288 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 293 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(OtherOpVal, FCmpOp, FCMP); }
>  	YY_BREAK
>  case 94:
>  YY_RULE_SETUP
> -#line 290 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 295 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return EQ; }
>  	YY_BREAK
>  case 95:
>  YY_RULE_SETUP
> -#line 291 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 296 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return NE; }
>  	YY_BREAK
>  case 96:
>  YY_RULE_SETUP
> -#line 292 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 297 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return SLT; }
>  	YY_BREAK
>  case 97:
>  YY_RULE_SETUP
> -#line 293 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 298 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return SGT; }
>  	YY_BREAK
>  case 98:
>  YY_RULE_SETUP
> -#line 294 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 299 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return SLE; }
>  	YY_BREAK
>  case 99:
>  YY_RULE_SETUP
> -#line 295 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 300 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return SGE; }
>  	YY_BREAK
>  case 100:
>  YY_RULE_SETUP
> -#line 296 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 301 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return ULT; }
>  	YY_BREAK
>  case 101:
>  YY_RULE_SETUP
> -#line 297 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 302 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return UGT; }
>  	YY_BREAK
>  case 102:
>  YY_RULE_SETUP
> -#line 298 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 303 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return ULE; }
>  	YY_BREAK
>  case 103:
>  YY_RULE_SETUP
> -#line 299 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 304 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return UGE; }
>  	YY_BREAK
>  case 104:
>  YY_RULE_SETUP
> -#line 300 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 305 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return OEQ; }
>  	YY_BREAK
>  case 105:
>  YY_RULE_SETUP
> -#line 301 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 306 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return ONE; }
>  	YY_BREAK
>  case 106:
>  YY_RULE_SETUP
> -#line 302 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 307 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return OLT; }
>  	YY_BREAK
>  case 107:
>  YY_RULE_SETUP
> -#line 303 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 308 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return OGT; }
>  	YY_BREAK
>  case 108:
>  YY_RULE_SETUP
> -#line 304 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 309 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return OLE; }
>  	YY_BREAK
>  case 109:
>  YY_RULE_SETUP
> -#line 305 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 310 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return OGE; }
>  	YY_BREAK
>  case 110:
>  YY_RULE_SETUP
> -#line 306 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 311 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return ORD; }
>  	YY_BREAK
>  case 111:
>  YY_RULE_SETUP
> -#line 307 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 312 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return UNO; }
>  	YY_BREAK
>  case 112:
>  YY_RULE_SETUP
> -#line 308 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 313 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return UEQ; }
>  	YY_BREAK
>  case 113:
>  YY_RULE_SETUP
> -#line 309 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 314 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return UNE; }
>  	YY_BREAK
>  case 114:
>  YY_RULE_SETUP
> -#line 311 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 316 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(OtherOpVal, PHIOp, PHI_TOK); }
>  	YY_BREAK
>  case 115:
>  YY_RULE_SETUP
> -#line 312 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 317 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(OtherOpVal, CallOp, CALL); }
>  	YY_BREAK
>  case 116:
>  YY_RULE_SETUP
> -#line 313 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 318 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(CastOpVal, CastOp, CAST);  }
>  	YY_BREAK
>  case 117:
>  YY_RULE_SETUP
> -#line 314 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 319 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(CastOpVal, TruncOp, TRUNC); }
>  	YY_BREAK
>  case 118:
>  YY_RULE_SETUP
> -#line 315 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 320 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(CastOpVal, ZExtOp , ZEXT); }
>  	YY_BREAK
>  case 119:
>  YY_RULE_SETUP
> -#line 316 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 321 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(CastOpVal, SExtOp, SEXT); }
>  	YY_BREAK
>  case 120:
>  YY_RULE_SETUP
> -#line 317 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 322 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(CastOpVal, FPTruncOp, FPTRUNC); }
>  	YY_BREAK
>  case 121:
>  YY_RULE_SETUP
> -#line 318 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 323 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(CastOpVal, FPExtOp, FPEXT); }
>  	YY_BREAK
>  case 122:
>  YY_RULE_SETUP
> -#line 319 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 324 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(CastOpVal, FPToUIOp, FPTOUI); }
>  	YY_BREAK
>  case 123:
>  YY_RULE_SETUP
> -#line 320 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 325 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(CastOpVal, FPToSIOp, FPTOSI); }
>  	YY_BREAK
>  case 124:
>  YY_RULE_SETUP
> -#line 321 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 326 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(CastOpVal, UIToFPOp, UITOFP); }
>  	YY_BREAK
>  case 125:
>  YY_RULE_SETUP
> -#line 322 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 327 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(CastOpVal, SIToFPOp, SITOFP); }
>  	YY_BREAK
>  case 126:
>  YY_RULE_SETUP
> -#line 323 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 328 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(CastOpVal, PtrToIntOp, PTRTOINT); }
>  	YY_BREAK
>  case 127:
>  YY_RULE_SETUP
> -#line 324 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 329 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(CastOpVal, IntToPtrOp, INTTOPTR); }
>  	YY_BREAK
>  case 128:
>  YY_RULE_SETUP
> -#line 325 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 330 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(CastOpVal, BitCastOp, BITCAST); }
>  	YY_BREAK
>  case 129:
>  YY_RULE_SETUP
> -#line 326 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 331 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(OtherOpVal, SelectOp, SELECT); }
>  	YY_BREAK
>  case 130:
>  YY_RULE_SETUP
> -#line 327 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 332 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return VANEXT_old; }
>  	YY_BREAK
>  case 131:
>  YY_RULE_SETUP
> -#line 328 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 333 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return VAARG_old; }
>  	YY_BREAK
>  case 132:
>  YY_RULE_SETUP
> -#line 329 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 334 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(OtherOpVal, VAArg , VAARG); }
>  	YY_BREAK
>  case 133:
>  YY_RULE_SETUP
> -#line 330 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 335 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(TermOpVal, RetOp, RET); }
>  	YY_BREAK
>  case 134:
>  YY_RULE_SETUP
> -#line 331 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 336 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(TermOpVal, BrOp, BR); }
>  	YY_BREAK
>  case 135:
>  YY_RULE_SETUP
> -#line 332 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 337 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(TermOpVal, SwitchOp, SWITCH); }
>  	YY_BREAK
>  case 136:
>  YY_RULE_SETUP
> -#line 333 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 338 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(TermOpVal, InvokeOp, INVOKE); }
>  	YY_BREAK
>  case 137:
>  YY_RULE_SETUP
> -#line 334 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 339 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return UNWIND; }
>  	YY_BREAK
>  case 138:
>  YY_RULE_SETUP
> -#line 335 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 340 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(TermOpVal, UnreachableOp, UNREACHABLE); }
>  	YY_BREAK
>  case 139:
>  YY_RULE_SETUP
> -#line 337 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 342 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(MemOpVal, MallocOp, MALLOC); }
>  	YY_BREAK
>  case 140:
>  YY_RULE_SETUP
> -#line 338 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 343 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(MemOpVal, AllocaOp, ALLOCA); }
>  	YY_BREAK
>  case 141:
>  YY_RULE_SETUP
> -#line 339 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 344 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(MemOpVal, FreeOp, FREE); }
>  	YY_BREAK
>  case 142:
>  YY_RULE_SETUP
> -#line 340 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 345 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(MemOpVal, LoadOp, LOAD); }
>  	YY_BREAK
>  case 143:
>  YY_RULE_SETUP
> -#line 341 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 346 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(MemOpVal, StoreOp, STORE); }
>  	YY_BREAK
>  case 144:
>  YY_RULE_SETUP
> -#line 342 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 347 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(MemOpVal, GetElementPtrOp, GETELEMENTPTR); }
>  	YY_BREAK
>  case 145:
>  YY_RULE_SETUP
> -#line 344 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 349 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(OtherOpVal, ExtractElementOp, EXTRACTELEMENT); }
>  	YY_BREAK
>  case 146:
>  YY_RULE_SETUP
> -#line 345 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 350 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(OtherOpVal, InsertElementOp, INSERTELEMENT); }
>  	YY_BREAK
>  case 147:
>  YY_RULE_SETUP
> -#line 346 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 351 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { RET_TOK(OtherOpVal, ShuffleVectorOp, SHUFFLEVECTOR); }
>  	YY_BREAK
>  case 148:
>  YY_RULE_SETUP
> -#line 349 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 354 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  {
>                    UnEscapeLexed(yytext+1);
>                    Upgradelval.StrVal = strdup(yytext 
> +1);             // Skip %
> @@ -2076,7 +2081,7 @@
>  	YY_BREAK
>  case 149:
>  YY_RULE_SETUP
> -#line 354 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 359 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  {
>                    yytext[strlen(yytext)-1] = 0;  // nuke colon
>                    UnEscapeLexed(yytext);
> @@ -2086,7 +2091,7 @@
>  	YY_BREAK
>  case 150:
>  YY_RULE_SETUP
> -#line 360 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 365 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  {
>                    yytext[strlen(yytext)-2] = 0;  // nuke colon,  
> end quote
>                    UnEscapeLexed(yytext+1);
> @@ -2096,7 +2101,7 @@
>  	YY_BREAK
>  case 151:
>  YY_RULE_SETUP
> -#line 367 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 372 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { // Note that we cannot unescape a string constant here!  The
>                     // string constant might contain a \00 which  
> would not be
>                     // understood by the string stuff.  It is valid  
> to make a
> @@ -2109,12 +2114,12 @@
>  	YY_BREAK
>  case 152:
>  YY_RULE_SETUP
> -#line 378 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 383 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { Upgradelval.UInt64Val = atoull(yytext); return EUINT64VAL; }
>  	YY_BREAK
>  case 153:
>  YY_RULE_SETUP
> -#line 379 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 384 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  {
>                    uint64_t Val = atoull(yytext+1);
>                    // +1:  we have bigger negative range
> @@ -2126,7 +2131,7 @@
>  	YY_BREAK
>  case 154:
>  YY_RULE_SETUP
> -#line 387 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 392 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  {
>                     Upgradelval.UInt64Val = HexIntToVal(yytext+3);
>                     return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
> @@ -2134,7 +2139,7 @@
>  	YY_BREAK
>  case 155:
>  YY_RULE_SETUP
> -#line 392 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 397 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  {
>                    uint64_t Val = atoull(yytext+1);
>                    if ((unsigned)Val != Val)
> @@ -2145,7 +2150,7 @@
>  	YY_BREAK
>  case 156:
>  YY_RULE_SETUP
> -#line 399 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 404 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  {
>                    uint64_t Val = atoull(yytext+2);
>                    // +1:  we have bigger negative range
> @@ -2157,16 +2162,16 @@
>  	YY_BREAK
>  case 157:
>  YY_RULE_SETUP
> -#line 408 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 413 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { Upgradelval.FPVal = atof(yytext); return FPVAL; }
>  	YY_BREAK
>  case 158:
>  YY_RULE_SETUP
> -#line 409 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 414 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { Upgradelval.FPVal = HexToFP(yytext); return FPVAL; }
>  	YY_BREAK
>  case YY_STATE_EOF(INITIAL):
> -#line 411 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 416 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  {
>                    /* Make sure to free the internal buffers for  
> flex when we are
>                     * done reading our input!
> @@ -2177,20 +2182,20 @@
>  	YY_BREAK
>  case 159:
>  YY_RULE_SETUP
> -#line 419 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 424 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { /* Ignore whitespace */ }
>  	YY_BREAK
>  case 160:
>  YY_RULE_SETUP
> -#line 420 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 425 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  { return yytext[0]; }
>  	YY_BREAK
>  case 161:
>  YY_RULE_SETUP
> -#line 422 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 427 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>  YY_FATAL_ERROR( "flex scanner jammed" );
>  	YY_BREAK
> -#line 2194 "UpgradeLexer.cpp"
> +#line 2199 "UpgradeLexer.cpp"
>
>  	case YY_END_OF_BUFFER:
>  		{
> @@ -3068,5 +3073,5 @@
>  	return 0;
>  	}
>  #endif
> -#line 422 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> +#line 427 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
>
>
>
> Index: llvm/tools/llvm-upgrade/UpgradeLexer.l.cvs
> diff -u llvm/tools/llvm-upgrade/UpgradeLexer.l.cvs:1.19 llvm/tools/ 
> llvm-upgrade/UpgradeLexer.l.cvs:1.20
> --- llvm/tools/llvm-upgrade/UpgradeLexer.l.cvs:1.19	Wed Feb  7  
> 18:21:40 2007
> +++ llvm/tools/llvm-upgrade/UpgradeLexer.l.cvs	Wed Mar 21 12:15:50  
> 2007
> @@ -51,7 +51,12 @@
>
>  #define RET_TY(sym,NewTY,sign) \
>    Upgradelval.PrimType.T = NewTY; \
> -  Upgradelval.PrimType.S = sign; \
> +  switch (sign) { \
> +    case 0: Upgradelval.PrimType.S.makeSignless(); break; \
> +    case 1: Upgradelval.PrimType.S.makeUnsigned(); break; \
> +    case 2: Upgradelval.PrimType.S.makeSigned(); break; \
> +    default: assert(0 && "Invalid sign kind"); break; \
> +  }\
>    return sym
>
>  namespace llvm {
> @@ -238,24 +243,24 @@
>  x86_stdcallcc   { return X86_STDCALLCC_TOK; }
>  x86_fastcallcc  { return X86_FASTCALLCC_TOK; }
>
> -sbyte           { RET_TY(SBYTE,  Type::Int8Ty,  Signed);  }
> -ubyte           { RET_TY(UBYTE,  Type::Int8Ty,  Unsigned); }
> -i8              { RET_TY(UBYTE,  Type::Int8Ty,  Unsigned); }
> -short           { RET_TY(SHORT,  Type::Int16Ty, Signed);  }
> -ushort          { RET_TY(USHORT, Type::Int16Ty, Unsigned); }
> -i16             { RET_TY(USHORT, Type::Int16Ty, Unsigned); }
> -int             { RET_TY(INT,    Type::Int32Ty, Signed);  }
> -uint            { RET_TY(UINT,   Type::Int32Ty, Unsigned); }
> -i32             { RET_TY(UINT,   Type::Int32Ty, Unsigned); }
> -long            { RET_TY(LONG,   Type::Int64Ty, Signed);  }
> -ulong           { RET_TY(ULONG,  Type::Int64Ty, Unsigned); }
> -i64             { RET_TY(ULONG,  Type::Int64Ty, Unsigned); }
> -void            { RET_TY(VOID,   Type::VoidTy,  Signless  ); }
> -bool            { RET_TY(BOOL,   Type::Int1Ty,  Unsigned  ); }
> -i1              { RET_TY(BOOL,   Type::Int1Ty,  Unsigned  ); }
> -float           { RET_TY(FLOAT,  Type::FloatTy, Signless ); }
> -double          { RET_TY(DOUBLE, Type::DoubleTy,Signless); }
> -label           { RET_TY(LABEL,  Type::LabelTy, Signless ); }
> +sbyte           { RET_TY(SBYTE,  Type::Int8Ty,  2); }
> +ubyte           { RET_TY(UBYTE,  Type::Int8Ty,  1); }
> +i8              { RET_TY(UBYTE,  Type::Int8Ty,  1); }
> +short           { RET_TY(SHORT,  Type::Int16Ty, 2); }
> +ushort          { RET_TY(USHORT, Type::Int16Ty, 1); }
> +i16             { RET_TY(USHORT, Type::Int16Ty, 1); }
> +int             { RET_TY(INT,    Type::Int32Ty, 2); }
> +uint            { RET_TY(UINT,   Type::Int32Ty, 1); }
> +i32             { RET_TY(UINT,   Type::Int32Ty, 1); }
> +long            { RET_TY(LONG,   Type::Int64Ty, 2); }
> +ulong           { RET_TY(ULONG,  Type::Int64Ty, 1); }
> +i64             { RET_TY(ULONG,  Type::Int64Ty, 1); }
> +void            { RET_TY(VOID,   Type::VoidTy,  0); }
> +bool            { RET_TY(BOOL,   Type::Int1Ty,  1); }
> +i1              { RET_TY(BOOL,   Type::Int1Ty,  1); }
> +float           { RET_TY(FLOAT,  Type::FloatTy, 0); }
> +double          { RET_TY(DOUBLE, Type::DoubleTy,0); }
> +label           { RET_TY(LABEL,  Type::LabelTy, 0); }
>  type            { return TYPE;   }
>  opaque          { return OPAQUE; }
>
>
>
> Index: llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
> diff -u llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.66 llvm/ 
> tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.67
> --- llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.66	Wed Mar 14  
> 22:26:42 2007
> +++ llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs	Wed Mar 21  
> 12:15:50 2007
> @@ -427,7 +427,7 @@
>  //
>  typedef std::vector<Value *> ValueList;           // Numbered defs
>
> -typedef std::pair<std::string,const Type*> RenameMapKey;
> +typedef std::pair<std::string,TypeInfo> RenameMapKey;
>  typedef std::map<RenameMapKey,std::string> RenameMapType;
>
>  static void
> @@ -438,7 +438,10 @@
>    Module *CurrentModule;
>    std::map<const Type *, ValueList> Values; // Module level  
> numbered definitions
>    std::map<const Type *,ValueList> LateResolveValues;
> -  std::vector<PATypeHolder>    Types;
> +  std::vector<PATypeHolder> Types;
> +  std::vector<Signedness> TypeSigns;
> +  std::map<std::string,Signedness> NamedTypeSigns;
> +  std::map<std::string,Signedness> NamedValueSigns;
>    std::map<ValID, PATypeHolder> LateResolveTypes;
>    static Module::Endianness Endian;
>    static Module::PointerSize PointerSize;
> @@ -495,6 +498,9 @@
>
>      Values.clear();         // Clear out function local definitions
>      Types.clear();
> +    TypeSigns.clear();
> +    NamedTypeSigns.clear();
> +    NamedValueSigns.clear();
>      CurrentModule = 0;
>    }
>
> @@ -568,6 +574,24 @@
>
>  static bool inFunctionScope() { return CurFun.CurrentFunction != 0; }
>
> +/// This function is just a utility to make a Key value for the  
> rename map.
> +/// The Key is a combination of the name, type, Signedness of the  
> original
> +/// value (global/function). This just constructs the key and  
> ensures that
> +/// named Signedness values are resolved to the actual Signedness.
> +/// @brief Make a key for the RenameMaps
> +static RenameMapKey makeRenameMapKey(const std::string &Name,  
> const Type* Ty,
> +                                     const Signedness &Sign) {
> +  TypeInfo TI;
> +  TI.T = Ty;
> +  if (Sign.isNamed())
> +    // Don't allow Named Signedness nodes because they won't  
> match. The actual
> +    // Signedness must be looked up in the NamedTypeSigns map.
> +    TI.S.copy(CurModule.NamedTypeSigns[Sign.getName()]);
> +  else
> +    TI.S.copy(Sign);
> +  return std::make_pair(Name, TI);
> +}
> +
>
>  // 
> ===------------------------------------------------------------------- 
> ---===//
>  //               Code to handle definitions of all the types
> @@ -593,7 +617,6 @@
>      break;
>    case ValID::NameVal:                 // Is it a named definition?
>      if (const Type *N = CurModule.CurrentModule->getTypeByName 
> (D.Name)) {
> -      D.destroy();  // Free old strdup'd memory...
>        return N;
>      }
>      break;
> @@ -608,7 +631,6 @@
>    //
>    if (DoNotImprovise) return 0;  // Do we just want a null to be  
> returned?
>
> -
>    if (inFunctionScope()) {
>      if (D.Type == ValID::NameVal) {
>        error("Reference to an undefined type: '" + D.getName() + "'");
> @@ -626,13 +648,94 @@
>    Type *Typ = OpaqueType::get();
>    CurModule.LateResolveTypes.insert(std::make_pair(D, Typ));
>    return Typ;
> - }
> +}
> +
> +/// This is like the getType method except that instead of looking  
> up the type
> +/// for a given ID, it looks up that type's sign.
> +/// @brief Get the signedness of a referenced type
> +static Signedness getTypeSign(const ValID &D) {
> +  switch (D.Type) {
> +  case ValID::NumberVal:               // Is it a numbered  
> definition?
> +    // Module constants occupy the lowest numbered slots...
> +    if ((unsigned)D.Num < CurModule.TypeSigns.size()) {
> +      return CurModule.TypeSigns[(unsigned)D.Num];
> +    }
> +    break;
> +  case ValID::NameVal: {               // Is it a named definition?
> +    std::map<std::string,Signedness>::const_iterator I =
> +      CurModule.NamedTypeSigns.find(D.Name);
> +    if (I != CurModule.NamedTypeSigns.end())
> +      return I->second;
> +    // Perhaps its a named forward .. just cache the name
> +    Signedness S;
> +    S.makeNamed(D.Name);
> +    return S;
> +  }
> +  default:
> +    break;
> +  }
> +  // If we don't find it, its signless
> +  Signedness S;
> +  S.makeSignless();
> +  return S;
> +}
> +
> +/// This function is analagous to getElementType in LLVM. It  
> provides the same
> +/// function except that it looks up the Signedness instead of the  
> type. This is
> +/// used when processing GEP instructions that need to extract the  
> type of an
> +/// indexed struct/array/ptr member.
> +/// @brief Look up an element's sign.
> +static Signedness getElementSign(const ValueInfo& VI,
> +                                 const std::vector<Value*>  
> &Indices) {
> +  const Type *Ptr = VI.V->getType();
> +  assert(isa<PointerType>(Ptr) && "Need pointer type");
> +
> +  unsigned CurIdx = 0;
> +  Signedness S(VI.S);
> +  while (const CompositeType *CT = dyn_cast<CompositeType>(Ptr)) {
> +    if (CurIdx == Indices.size())
> +      break;
> +
> +    Value *Index = Indices[CurIdx++];
> +    assert(!isa<PointerType>(CT) || CurIdx == 1 && "Invalid type");
> +    Ptr = CT->getTypeAtIndex(Index);
> +    if (const Type* Ty = Ptr->getForwardedType())
> +      Ptr = Ty;
> +    assert(S.isComposite() && "Bad Signedness type");
> +    if (isa<StructType>(CT)) {
> +      S = S.get(cast<ConstantInt>(Index)->getZExtValue());
> +    } else {
> +      S = S.get(0UL);
> +    }
> +    if (S.isNamed())
> +      S = CurModule.NamedTypeSigns[S.getName()];
> +  }
> +  Signedness Result;
> +  Result.makeComposite(S);
> +  return Result;
> +}
> +
> +/// This function just translates a ConstantInfo into a ValueInfo  
> and calls
> +/// getElementSign(ValueInfo,...). Its just a convenience.
> +/// @brief ConstantInfo version of getElementSign.
> +static Signedness getElementSign(const ConstInfo& CI,
> +                                 const std::vector<Constant*>  
> &Indices) {
> +  ValueInfo VI;
> +  VI.V = CI.C;
> +  VI.S.copy(CI.S);
> +  std::vector<Value*> Idx;
> +  for (unsigned i = 0; i < Indices.size(); ++i)
> +    Idx.push_back(Indices[i]);
> +  Signedness result = getElementSign(VI, Idx);
> +  VI.destroy();
> +  return result;
> +}
>
>  /// This function determines if two function types differ only in  
> their use of
>  /// the sret parameter attribute in the first argument. If they  
> are identical
>  /// in all other respects, it returns true. Otherwise, it returns  
> false.
> -bool FuncTysDifferOnlyBySRet(const FunctionType *F1,
> -                                   const FunctionType *F2) {
> +static bool FuncTysDifferOnlyBySRet(const FunctionType *F1,
> +                                    const FunctionType *F2) {
>    if (F1->getReturnType() != F2->getReturnType() ||
>        F1->getNumParams() != F2->getNumParams() ||
>        F1->getParamAttrs(0) != F2->getParamAttrs(0))
> @@ -647,10 +750,27 @@
>    return true;
>  }
>
> +/// This function determines if the type of V and Ty differ only  
> by the SRet
> +/// parameter attribute. This is a more generalized case of
> +/// FuncTysDIfferOnlyBySRet since it doesn't require FunctionType  
> arguments.
> +static bool TypesDifferOnlyBySRet(Value *V, const Type* Ty) {
> +  if (V->getType() == Ty)
> +    return true;
> +  const PointerType *PF1 = dyn_cast<PointerType>(Ty);
> +  const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
> +  if (PF1 && PF2) {
> +    const FunctionType* FT1 = dyn_cast<FunctionType>(PF1- 
> >getElementType());
> +    const FunctionType* FT2 = dyn_cast<FunctionType>(PF2- 
> >getElementType());
> +    if (FT1 && FT2)
> +      return FuncTysDifferOnlyBySRet(FT1, FT2);
> +  }
> +  return false;
> +}
> +
>  // The upgrade of csretcc to sret param attribute may have caused  
> a function
>  // to not be found because the param attribute changed the type of  
> the called
>  // function. This helper function, used in getExistingValue,  
> detects that
> -// situation and returns V if it occurs and 0 otherwise.
> +// situation and bitcasts the function to the correct type.
>  static Value* handleSRetFuncTypeMerge(Value *V, const Type* Ty) {
>    // Handle degenerate cases
>    if (!V)
> @@ -658,23 +778,21 @@
>    if (V->getType() == Ty)
>      return V;
>
> -  Value* Result = 0;
>    const PointerType *PF1 = dyn_cast<PointerType>(Ty);
>    const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
>    if (PF1 && PF2) {
> -    const FunctionType *FT1 =
> -      dyn_cast<FunctionType>(PF1->getElementType());
> -    const FunctionType *FT2 =
> -      dyn_cast<FunctionType>(PF2->getElementType());
> +    const FunctionType *FT1 = dyn_cast<FunctionType>(PF1- 
> >getElementType());
> +    const FunctionType *FT2 = dyn_cast<FunctionType>(PF2- 
> >getElementType());
>      if (FT1 && FT2 && FuncTysDifferOnlyBySRet(FT1, FT2))
>        if (FT2->paramHasAttr(1, FunctionType::StructRetAttribute))
> -        Result = V;
> +        return V;
>        else if (Constant *C = dyn_cast<Constant>(V))
> -        Result = ConstantExpr::getBitCast(C, PF1);
> +        return ConstantExpr::getBitCast(C, PF1);
>        else
> -        Result = new BitCastInst(V, PF1, "upgrd.cast", CurBB);
> +        return new BitCastInst(V, PF1, "upgrd.cast", CurBB);
> +
>    }
> -  return Result;
> +  return 0;
>  }
>
>  // getExistingValue - Look up the value specified by the provided  
> type and
> @@ -710,9 +828,8 @@
>
>    case ValID::NameVal: {                // Is it a named definition?
>      // Get the name out of the ID
> -    std::string Name(D.Name);
> -    Value* V = 0;
> -    RenameMapKey Key = std::make_pair(Name, Ty);
> +    RenameMapKey Key = makeRenameMapKey(D.Name, Ty, D.S);
> +    Value *V = 0;
>      if (inFunctionScope()) {
>        // See if the name was renamed
>        RenameMapType::const_iterator I = CurFun.RenameMap.find(Key);
> @@ -720,10 +837,12 @@
>        if (I != CurFun.RenameMap.end())
>          LookupName = I->second;
>        else
> -        LookupName = Name;
> +        LookupName = D.Name;
>        ValueSymbolTable &SymTab = CurFun.CurrentFunction- 
> >getValueSymbolTable();
>        V = SymTab.lookup(LookupName);
> -      V = handleSRetFuncTypeMerge(V, Ty);
> +      if (V && V->getType() != Ty)
> +        V = handleSRetFuncTypeMerge(V, Ty);
> +      assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong  
> type");
>      }
>      if (!V) {
>        RenameMapType::const_iterator I = CurModule.RenameMap.find 
> (Key);
> @@ -731,9 +850,11 @@
>        if (I != CurModule.RenameMap.end())
>          LookupName = I->second;
>        else
> -        LookupName = Name;
> +        LookupName = D.Name;
>        V = CurModule.CurrentModule->getValueSymbolTable().lookup 
> (LookupName);
> -      V = handleSRetFuncTypeMerge(V, Ty);
> +      if (V && V->getType() != Ty)
> +        V = handleSRetFuncTypeMerge(V, Ty);
> +      assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong  
> type");
>      }
>      if (!V)
>        return 0;
> @@ -866,14 +987,13 @@
>      break;
>    case ValID::NameVal:                  // Is it a named definition?
>      Name = ID.Name;
> -    if (Value *N = CurFun.CurrentFunction->
> -                   getValueSymbolTable().lookup(Name)) {
> +    if (Value *N = CurFun.CurrentFunction->getValueSymbolTable 
> ().lookup(Name)) {
>        if (N->getType() != Type::LabelTy) {
>          // Register names didn't use to conflict with basic block  
> names
>          // because of type planes. Now they all have to be unique.  
> So, we just
>          // rename the register and treat this name as if no basic  
> block
>          // had been found.
> -        RenameMapKey Key = std::make_pair(N->getName(),N->getType());
> +        RenameMapKey Key = makeRenameMapKey(ID.Name, N->getType(),  
> ID.S);
>          N->setName(makeNameUnique(N->getName()));
>          CurModule.RenameMap[Key] = N->getName();
>          BB = 0;
> @@ -984,19 +1104,33 @@
>    LateResolvers.clear();
>  }
>
> -// ResolveTypeTo - A brand new type was just declared.  This means  
> that (if
> -// name is not null) things referencing Name can be resolved.   
> Otherwise, things
> -// refering to the number can be resolved.  Do this now.
> -//
> -static void ResolveTypeTo(char *Name, const Type *ToTy) {
> +/// This function is used for type resolution and upref handling.  
> When a type
> +/// becomes concrete, this function is called to adjust the  
> signedness for the
> +/// concrete type.
> +static void ResolveTypeSign(const Type* oldTy, const Signedness  
> &Sign) {
> +  std::string TyName = CurModule.CurrentModule->getTypeName(oldTy);
> +  if (!TyName.empty())
> +    CurModule.NamedTypeSigns[TyName] = Sign;
> +}
> +
> +/// ResolveTypeTo - A brand new type was just declared.  This  
> means that (if
> +/// name is not null) things referencing Name can be resolved.   
> Otherwise,
> +/// things refering to the number can be resolved.  Do this now.
> +static void ResolveTypeTo(char *Name, const Type *ToTy, const  
> Signedness& Sign){
>    ValID D;
> -  if (Name) D = ValID::create(Name);
> -  else      D = ValID::create((int)CurModule.Types.size());
> +  if (Name)
> +    D = ValID::create(Name);
> +  else
> +    D = ValID::create((int)CurModule.Types.size());
> +  D.S.copy(Sign);
> +
> +  CurModule.NamedTypeSigns[Name] = Sign;
>
>    std::map<ValID, PATypeHolder>::iterator I =
>      CurModule.LateResolveTypes.find(D);
>    if (I != CurModule.LateResolveTypes.end()) {
> -    ((DerivedType*)I->second.get())->refineAbstractTypeTo(ToTy);
> +    const Type *OldTy = I->second.get();
> +    ((DerivedType*)OldTy)->refineAbstractTypeTo(ToTy);
>      CurModule.LateResolveTypes.erase(I);
>    }
>  }
> @@ -1056,12 +1190,12 @@
>  // null potentially, in which case this is a noop.  The string  
> passed in is
>  // assumed to be a malloc'd string buffer, and is free'd by this  
> function.
>  //
> -static void setValueName(Value *V, char *NameStr) {
> +static void setValueName(const ValueInfo &V, char *NameStr) {
>    if (NameStr) {
>      std::string Name(NameStr);      // Copy string
>      free(NameStr);                  // Free old string
>
> -    if (V->getType() == Type::VoidTy) {
> +    if (V.V->getType() == Type::VoidTy) {
>        error("Can't assign name '" + Name + "' to value with void  
> type");
>        return;
>      }
> @@ -1074,13 +1208,13 @@
>      if (Existing) {
>        // An existing value of the same name was found. This might  
> have happened
>        // because of the integer type planes collapsing in LLVM 2.0.
> -      if (Existing->getType() == V->getType() &&
> +      if (Existing->getType() == V.V->getType() &&
>            !TypeHasInteger(Existing->getType())) {
>          // If the type does not contain any integers in them then  
> this can't be
>          // a type plane collapsing issue. It truly is a  
> redefinition and we
>          // should error out as the assembly is invalid.
>          error("Redefinition of value named '" + Name + "' of type  
> '" +
> -              V->getType()->getDescription() + "'");
> +              V.V->getType()->getDescription() + "'");
>          return;
>        }
>        // In LLVM 2.0 we don't allow names to be re-used for any  
> values in a
> @@ -1094,13 +1228,13 @@
>        // We're changing the name but it will probably be used by  
> other
>        // instructions as operands later on. Consequently we have  
> to retain
>        // a mapping of the renaming that we're doing.
> -      RenameMapKey Key = std::make_pair(Name,V->getType());
> +      RenameMapKey Key = makeRenameMapKey(Name, V.V->getType(), V.S);
>        CurFun.RenameMap[Key] = NewName;
>        Name = NewName;
>      }
>
>      // Set the name.
> -    V->setName(Name);
> +    V.V->setName(Name);
>    }
>  }
>
> @@ -1109,7 +1243,8 @@
>  static GlobalVariable *
>  ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage,
>                      bool isConstantGlobal, const Type *Ty,
> -                    Constant *Initializer) {
> +                    Constant *Initializer,
> +                    const Signedness &Sign) {
>    if (isa<FunctionType>(Ty))
>      error("Cannot declare global vars of function type");
>
> @@ -1129,6 +1264,7 @@
>    } else {
>      ID = ValID::create((int)CurModule.Values[PTy].size());
>    }
> +  ID.S.makeComposite(Sign);
>
>    if (GlobalValue *FWGV = CurModule.GetForwardRefForGlobal(PTy,  
> ID)) {
>      // Move the global to the end of the list, from whereever it was
> @@ -1154,13 +1290,7 @@
>        // There is alread a global of the same name which means  
> there is a
>        // conflict. Let's see what we can do about it.
>        std::string NewName(makeNameUnique(Name));
> -      if (Linkage == GlobalValue::InternalLinkage) {
> -        // The linkage type is internal so just warn about the  
> rename without
> -        // invoking "scarey language" about linkage failures.  
> GVars with
> -        // InternalLinkage can be renamed at will.
> -        warning("Global variable '" + Name + "' was renamed to '"+
> -                NewName + "'");
> -      } else {
> +      if (Linkage != GlobalValue::InternalLinkage) {
>          // The linkage of this gval is external so we can't  
> reliably rename
>          // it because it could potentially create a linking problem.
>          // However, we can't leave the name conflict in the output  
> either or
> @@ -1171,7 +1301,7 @@
>        }
>
>        // Put the renaming in the global rename map
> -      RenameMapKey Key = std::make_pair(Name,PointerType::get(Ty));
> +      RenameMapKey Key = makeRenameMapKey(Name, PointerType::get 
> (Ty), ID.S);
>        CurModule.RenameMap[Key] = NewName;
>
>        // Rename it
> @@ -1184,6 +1314,8 @@
>      new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer,  
> Name,
>                         CurModule.CurrentModule);
>    InsertValue(GV, CurModule.Values);
> +  // Remember the sign of this global.
> +  CurModule.NamedValueSigns[Name] = ID.S;
>    return GV;
>  }
>
> @@ -1194,21 +1326,26 @@
>  // This function returns true if the type has already been  
> defined, but is
>  // allowed to be redefined in the specified context.  If the name  
> is a new name
>  // for the type plane, it is inserted and false is returned.
> -static bool setTypeName(const Type *T, char *NameStr) {
> +static bool setTypeName(const PATypeInfo& TI, char *NameStr) {
>    assert(!inFunctionScope() && "Can't give types function-local  
> names");
>    if (NameStr == 0) return false;
>
>    std::string Name(NameStr);      // Copy string
>    free(NameStr);                  // Free old string
>
> +  const Type* Ty = TI.PAT->get();
> +
>    // We don't allow assigning names to void type
> -  if (T == Type::VoidTy) {
> +  if (Ty == Type::VoidTy) {
>      error("Can't assign name '" + Name + "' to the void type");
>      return false;
>    }
>
>    // Set the type name, checking for conflicts as we do so.
> -  bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name, T);
> +  bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name,  
> Ty);
> +
> +  // Save the sign information for later use
> +  CurModule.NamedTypeSigns[Name] = TI.S;
>
>    if (AlreadyExists) {   // Inserting a name that is already  
> defined???
>      const Type *Existing = CurModule.CurrentModule->getTypeByName 
> (Name);
> @@ -1218,7 +1355,7 @@
>      // opaque type.  In this case, Existing will be an opaque type.
>      if (const OpaqueType *OpTy = dyn_cast<OpaqueType>(Existing)) {
>        // We ARE replacing an opaque type!
> -      const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(T);
> +      const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(Ty);
>        return true;
>      }
>
> @@ -1226,11 +1363,11 @@
>      // the redefinition is identical to the original. This will be  
> so if
>      // Existing and T point to the same Type object. In this one  
> case we
>      // allow the equivalent redefinition.
> -    if (Existing == T) return true;  // Yes, it's equal.
> +    if (Existing == Ty) return true;  // Yes, it's equal.
>
>      // Any other kind of (non-equivalent) redefinition is an error.
>      error("Redefinition of type named '" + Name + "' in the '" +
> -          T->getDescription() + "' type plane");
> +          Ty->getDescription() + "' type plane");
>    }
>
>    return false;
> @@ -1262,7 +1399,7 @@
>      OpaqueType *UpRefTy;
>
>      UpRefRecord(unsigned NL, OpaqueType *URTy)
> -      : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) {}
> +      : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) { }
>    };
>  }
>
> @@ -1276,7 +1413,7 @@
>  /// count reaches zero, the upreferenced type is the type that is  
> passed in:
>  /// thus we can complete the cycle.
>  ///
> -static PATypeHolder HandleUpRefs(const Type *ty) {
> +static PATypeHolder HandleUpRefs(const Type *ty, const Signedness&  
> Sign) {
>    // If Ty isn't abstract, or if there are no up-references in it,  
> then there is
>    // nothing to resolve here.
>    if (!ty->isAbstract() || UpRefs.empty()) return ty;
> @@ -1292,10 +1429,11 @@
>    // this variable.
>    OpaqueType *TypeToResolve = 0;
>
> -  for (unsigned i = 0; i != UpRefs.size(); ++i) {
> +  unsigned i = 0;
> +  for (; i != UpRefs.size(); ++i) {
>      UR_OUT("  UR#" << i << " - TypeContains(" << Ty->getDescription 
> () << ", "
> -           << UpRefs[i].second->getDescription() << ") = "
> -           << (TypeContains(Ty, UpRefs[i].second) ? "true" :  
> "false") << "\n");
> +           << UpRefs[i].UpRefTy->getDescription() << ") = "
> +           << (TypeContains(Ty, UpRefs[i].UpRefTy) ? "true" :  
> "false") << "\n");
>      if (TypeContains(Ty, UpRefs[i].LastContainedTy)) {
>        // Decrement level of upreference
>        unsigned Level = --UpRefs[i].NestingLevel;
> @@ -1306,8 +1444,9 @@
>            TypeToResolve = UpRefs[i].UpRefTy;
>          } else {
>            UR_OUT("  * Resolving upreference for "
> -                 << UpRefs[i].second->getDescription() << "\n";
> -                 std::string OldName = UpRefs[i].UpRefTy- 
> >getDescription());
> +                 << UpRefs[i].UpRefTy->getDescription() << "\n";
> +          std::string OldName = UpRefs[i].UpRefTy->getDescription());
> +          ResolveTypeSign(UpRefs[i].UpRefTy, Sign);
>            UpRefs[i].UpRefTy->refineAbstractTypeTo(TypeToResolve);
>            UR_OUT("  * Type '" << OldName << "' refined upreference  
> to: "
>                   << (const void*)Ty << ", " << Ty->getDescription 
> () << "\n");
> @@ -1320,14 +1459,113 @@
>
>    if (TypeToResolve) {
>      UR_OUT("  * Resolving upreference for "
> -           << UpRefs[i].second->getDescription() << "\n";
> +           << UpRefs[i].UpRefTy->getDescription() << "\n";
>             std::string OldName = TypeToResolve->getDescription());
> +    ResolveTypeSign(TypeToResolve, Sign);
>      TypeToResolve->refineAbstractTypeTo(Ty);
>    }
>
>    return Ty;
>  }
>
> +bool Signedness::operator<(const Signedness &that) const {
> +  if (isNamed()) {
> +    if (that.isNamed())
> +      return *(this->name) < *(that.name);
> +    else
> +      return CurModule.NamedTypeSigns[*name] < that;
> +  } else if (that.isNamed()) {
> +    return *this < CurModule.NamedTypeSigns[*that.name];
> +  }
> +
> +  if (isComposite() && that.isComposite()) {
> +    if (sv->size() == that.sv->size()) {
> +      SignVector::const_iterator thisI = sv->begin(), thisE = sv- 
> >end();
> +      SignVector::const_iterator thatI = that.sv->begin(),
> +                                 thatE = that.sv->end();
> +      for (; thisI != thisE; ++thisI, ++thatI) {
> +        if (*thisI < *thatI)
> +          return true;
> +        else if (!(*thisI == *thatI))
> +          return false;
> +      }
> +      return false;
> +    }
> +    return sv->size() < that.sv->size();
> +  }
> +  return kind < that.kind;
> +}
> +
> +bool Signedness::operator==(const Signedness &that) const {
> +  if (isNamed())
> +    if (that.isNamed())
> +      return *(this->name) == *(that.name);
> +    else
> +      return CurModule.NamedTypeSigns[*(this->name)] == that;
> +  else if (that.isNamed())
> +    return *this == CurModule.NamedTypeSigns[*(that.name)];
> +  if (isComposite() && that.isComposite()) {
> +    if (sv->size() == that.sv->size()) {
> +      SignVector::const_iterator thisI = sv->begin(), thisE = sv- 
> >end();
> +      SignVector::const_iterator thatI = that.sv->begin(),
> +                                 thatE = that.sv->end();
> +      for (; thisI != thisE; ++thisI, ++thatI) {
> +        if (!(*thisI == *thatI))
> +          return false;
> +      }
> +      return true;
> +    }
> +    return false;
> +  }
> +  return kind == that.kind;
> +}
> +
> +void Signedness::copy(const Signedness &that) {
> +  if (that.isNamed()) {
> +    kind = Named;
> +    name = new std::string(*that.name);
> +  } else if (that.isComposite()) {
> +    kind = Composite;
> +    sv = new SignVector();
> +    *sv = *that.sv;
> +  } else {
> +    kind = that.kind;
> +    sv = 0;
> +  }
> +}
> +
> +void Signedness::destroy() {
> +  if (isNamed()) {
> +    delete name;
> +  } else if (isComposite()) {
> +    delete sv;
> +  }
> +}
> +
> +void Signedness::dump() const {
> +  if (isComposite()) {
> +    if (sv->size() == 1) {
> +      (*sv)[0].dump();
> +      std::cerr << "*";
> +    } else {
> +      std::cerr << "{ " ;
> +      for (unsigned i = 0; i < sv->size(); ++i) {
> +        if (i != 0)
> +          std::cerr << ", ";
> +        (*sv)[i].dump();
> +      }
> +      std::cerr << "} " ;
> +    }
> +  } else if (isNamed()) {
> +    std::cerr << *name;
> +  } else if (isSigned()) {
> +    std::cerr << "S";
> +  } else if (isUnsigned()) {
> +    std::cerr << "U";
> +  } else
> +    std::cerr << ".";
> +}
> +
>  static inline Instruction::TermOps
>  getTermOp(TermOps op) {
>    switch (op) {
> @@ -1342,7 +1580,7 @@
>  }
>
>  static inline Instruction::BinaryOps
> -getBinaryOp(BinaryOps op, const Type *Ty, Signedness Sign) {
> +getBinaryOp(BinaryOps op, const Type *Ty, const Signedness& Sign) {
>    switch (op) {
>      default     : assert(0 && "Invalid OldBinaryOps");
>      case SetEQ  :
> @@ -1363,7 +1601,7 @@
>          isFP = PTy->getElementType()->isFloatingPoint();
>        if (isFP)
>          return Instruction::FDiv;
> -      else if (Sign == Signed)
> +      else if (Sign.isSigned())
>          return Instruction::SDiv;
>        return Instruction::UDiv;
>      }
> @@ -1380,7 +1618,7 @@
>        // Select correct opcode
>        if (isFP)
>          return Instruction::FRem;
> -      else if (Sign == Signed)
> +      else if (Sign.isSigned())
>          return Instruction::SRem;
>        return Instruction::URem;
>      }
> @@ -1391,7 +1629,7 @@
>      case AShrOp : return Instruction::AShr;
>      case ShlOp  : return Instruction::Shl;
>      case ShrOp  :
> -      if (Sign == Signed)
> +      if (Sign.isSigned())
>          return Instruction::AShr;
>        return Instruction::LShr;
>      case AndOp  : return Instruction::And;
> @@ -1402,8 +1640,8 @@
>
>  static inline Instruction::OtherOps
>  getCompareOp(BinaryOps op, unsigned short &predicate, const Type*  
> &Ty,
> -             Signedness Sign) {
> -  bool isSigned = Sign == Signed;
> +             const Signedness &Sign) {
> +  bool isSigned = Sign.isSigned();
>    bool isFP = Ty->isFloatingPoint();
>    switch (op) {
>      default     : assert(0 && "Invalid OldSetCC");
> @@ -1483,7 +1721,7 @@
>  }
>
>  static inline Instruction::OtherOps
> -getOtherOp(OtherOps op, Signedness Sign) {
> +getOtherOp(OtherOps op, const Signedness &Sign) {
>    switch (op) {
>      default               : assert(0 && "Invalid OldOtherOps");
>      case PHIOp            : return Instruction::PHI;
> @@ -1501,8 +1739,8 @@
>  }
>
>  static inline Value*
> -getCast(CastOps op, Value *Src, Signedness SrcSign, const Type  
> *DstTy,
> -        Signedness DstSign, bool ForceInstruction = false) {
> +getCast(CastOps op, Value *Src, const Signedness &SrcSign, const  
> Type *DstTy,
> +        const Signedness &DstSign, bool ForceInstruction = false) {
>    Instruction::CastOps Opcode;
>    const Type* SrcTy = Src->getType();
>    if (op == CastOp) {
> @@ -1539,7 +1777,8 @@
>      }
>      // Determine the opcode to use by calling CastInst::getCastOpcode
>      Opcode =
> -      CastInst::getCastOpcode(Src, SrcSign == Signed, DstTy,  
> DstSign == Signed);
> +      CastInst::getCastOpcode(Src, SrcSign.isSigned(), DstTy,
> +                              DstSign.isSigned());
>
>    } else switch (op) {
>      default: assert(0 && "Invalid cast token");
> @@ -1631,7 +1870,7 @@
>        // all indices for SequentialType elements. We must retain  
> the same
>        // semantic (zext) for unsigned types.
>        if (const IntegerType *Ity = dyn_cast<IntegerType>(Index- 
> >getType()))
> -        if (Ity->getBitWidth() < 64 && (*Indices)[i].S == Unsigned) {
> +        if (Ity->getBitWidth() < 64 && (*Indices)[i].S.isUnsigned 
> ()) {
>            if (CIndices)
>              Index = ConstantExpr::getCast(Instruction::ZExt,
>                cast<Constant>(Index), Type::Int64Ty);
> @@ -1830,13 +2069,13 @@
>  #endif
>
>  #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
> -#line 1454 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1693 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>  typedef union YYSTYPE {
>    llvm::Module                           *ModuleVal;
>    llvm::Function                         *FunctionVal;
>    std::pair<llvm::PATypeInfo, char*>     *ArgVal;
>    llvm::BasicBlock                       *BasicBlockVal;
> -  llvm::TerminatorInst                   *TermInstVal;
> +  llvm::TermInstInfo                     TermInstVal;
>    llvm::InstrInfo                        InstVal;
>    llvm::ConstInfo                        ConstVal;
>    llvm::ValueInfo                        ValueVal;
> @@ -1873,7 +2112,7 @@
>    llvm::Module::Endianness          Endianness;
>  } YYSTYPE;
>  /* Line 196 of yacc.c.  */
> -#line 1877 "UpgradeParser.tab.c"
> +#line 2116 "UpgradeParser.tab.c"
>  # define yystype YYSTYPE /* obsolescent; will be withdrawn */
>  # define YYSTYPE_IS_DECLARED 1
>  # define YYSTYPE_IS_TRIVIAL 1
> @@ -1885,7 +2124,7 @@
>
>
>  /* Line 219 of yacc.c.  */
> -#line 1889 "UpgradeParser.tab.c"
> +#line 2128 "UpgradeParser.tab.c"
>
>  #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
>  # define YYSIZE_T __SIZE_TYPE__
> @@ -2244,37 +2483,37 @@
>  /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
>  static const unsigned short int yyrline[] =
>  {
> -       0,  1594,  1594,  1595,  1603,  1604,  1614,  1614,  1614,   
> 1614,
> -    1614,  1614,  1614,  1614,  1614,  1614,  1614,  1618,  1618,   
> 1618,
> -    1622,  1622,  1622,  1622,  1622,  1622,  1626,  1626,  1627,   
> 1627,
> -    1628,  1628,  1629,  1629,  1630,  1630,  1634,  1634,  1635,   
> 1635,
> -    1636,  1636,  1637,  1637,  1638,  1638,  1639,  1639,  1640,   
> 1640,
> -    1641,  1642,  1645,  1645,  1645,  1645,  1649,  1649,  1649,   
> 1649,
> -    1649,  1649,  1649,  1650,  1650,  1650,  1650,  1650,  1650,   
> 1656,
> -    1656,  1656,  1656,  1660,  1660,  1660,  1660,  1664,  1664,   
> 1668,
> -    1668,  1673,  1676,  1681,  1682,  1683,  1684,  1685,  1686,   
> 1687,
> -    1688,  1692,  1693,  1694,  1695,  1696,  1697,  1698,  1699,   
> 1709,
> -    1710,  1718,  1719,  1727,  1736,  1737,  1744,  1745,  1749,   
> 1753,
> -    1769,  1770,  1777,  1778,  1785,  1793,  1793,  1793,  1793,   
> 1793,
> -    1793,  1793,  1794,  1794,  1794,  1794,  1794,  1799,  1803,   
> 1807,
> -    1812,  1821,  1838,  1844,  1857,  1866,  1870,  1881,  1885,   
> 1898,
> -    1902,  1909,  1910,  1916,  1923,  1935,  1965,  1978,  2001,   
> 2029,
> -    2051,  2062,  2084,  2095,  2104,  2109,  2167,  2174,  2182,   
> 2189,
> -    2196,  2200,  2204,  2213,  2228,  2241,  2250,  2278,  2291,   
> 2300,
> -    2306,  2312,  2323,  2329,  2335,  2346,  2347,  2356,  2357,   
> 2369,
> -    2378,  2379,  2380,  2381,  2382,  2398,  2418,  2420,  2422,   
> 2422,
> -    2429,  2429,  2436,  2436,  2443,  2443,  2451,  2453,  2455,   
> 2460,
> -    2474,  2475,  2479,  2482,  2490,  2494,  2501,  2505,  2509,   
> 2513,
> -    2521,  2521,  2525,  2526,  2530,  2538,  2543,  2551,  2552,   
> 2559,
> -    2566,  2570,  2746,  2746,  2750,  2760,  2760,  2764,  2769,   
> 2770,
> -    2771,  2775,  2776,  2775,  2788,  2789,  2794,  2795,  2796,   
> 2797,
> -    2798,  2799,  2800,  2801,  2802,  2823,  2826,  2841,  2842,   
> 2847,
> -    2847,  2855,  2864,  2867,  2876,  2886,  2891,  2900,  2911,   
> 2911,
> -    2914,  2917,  2920,  2924,  2930,  2945,  2951,  3007,  3010,   
> 3016,
> -    3026,  3039,  3068,  3076,  3084,  3088,  3095,  3096,  3100,   
> 3103,
> -    3109,  3126,  3142,  3156,  3168,  3180,  3191,  3209,  3218,   
> 3227,
> -    3234,  3255,  3279,  3285,  3291,  3297,  3313,  3391,  3399,   
> 3400,
> -    3404,  3405,  3409,  3415,  3421,  3427,  3433,  3440,  3452,   
> 3477
> +       0,  1833,  1833,  1834,  1842,  1843,  1853,  1853,  1853,   
> 1853,
> +    1853,  1853,  1853,  1853,  1853,  1853,  1853,  1857,  1857,   
> 1857,
> +    1861,  1861,  1861,  1861,  1861,  1861,  1865,  1865,  1866,   
> 1866,
> +    1867,  1867,  1868,  1868,  1869,  1869,  1873,  1873,  1874,   
> 1874,
> +    1875,  1875,  1876,  1876,  1877,  1877,  1878,  1878,  1879,   
> 1879,
> +    1880,  1881,  1884,  1884,  1884,  1884,  1888,  1888,  1888,   
> 1888,
> +    1888,  1888,  1888,  1889,  1889,  1889,  1889,  1889,  1889,   
> 1895,
> +    1895,  1895,  1895,  1899,  1899,  1899,  1899,  1903,  1903,   
> 1907,
> +    1907,  1912,  1915,  1920,  1921,  1922,  1923,  1924,  1925,   
> 1926,
> +    1927,  1931,  1932,  1933,  1934,  1935,  1936,  1937,  1938,   
> 1948,
> +    1949,  1957,  1958,  1966,  1975,  1976,  1983,  1984,  1988,   
> 1992,
> +    2008,  2009,  2016,  2017,  2024,  2032,  2032,  2032,  2032,   
> 2032,
> +    2032,  2032,  2033,  2033,  2033,  2033,  2033,  2038,  2042,   
> 2046,
> +    2051,  2060,  2078,  2084,  2097,  2108,  2112,  2125,  2129,   
> 2143,
> +    2147,  2154,  2155,  2161,  2168,  2180,  2210,  2223,  2246,   
> 2274,
> +    2296,  2307,  2329,  2340,  2349,  2354,  2413,  2420,  2428,   
> 2435,
> +    2442,  2446,  2450,  2459,  2474,  2487,  2496,  2524,  2537,   
> 2546,
> +    2552,  2558,  2569,  2575,  2581,  2592,  2593,  2602,  2603,   
> 2615,
> +    2624,  2625,  2626,  2627,  2628,  2644,  2664,  2666,  2668,   
> 2668,
> +    2675,  2675,  2683,  2683,  2691,  2691,  2700,  2702,  2704,   
> 2709,
> +    2723,  2724,  2728,  2731,  2739,  2743,  2750,  2754,  2758,   
> 2762,
> +    2770,  2770,  2774,  2775,  2779,  2787,  2792,  2800,  2801,   
> 2808,
> +    2815,  2819,  3004,  3004,  3008,  3018,  3018,  3022,  3027,   
> 3028,
> +    3029,  3033,  3034,  3033,  3046,  3047,  3052,  3053,  3054,   
> 3055,
> +    3059,  3063,  3064,  3065,  3066,  3087,  3091,  3105,  3106,   
> 3111,
> +    3111,  3119,  3129,  3132,  3141,  3152,  3157,  3166,  3177,   
> 3177,
> +    3180,  3184,  3188,  3193,  3203,  3221,  3230,  3295,  3299,   
> 3306,
> +    3318,  3333,  3363,  3373,  3383,  3387,  3394,  3395,  3399,   
> 3402,
> +    3408,  3427,  3445,  3461,  3475,  3489,  3500,  3518,  3527,   
> 3536,
> +    3543,  3564,  3588,  3594,  3600,  3606,  3622,  3706,  3714,   
> 3715,
> +    3719,  3720,  3724,  3730,  3737,  3743,  3750,  3757,  3770,   
> 3796
>  };
>  #endif
>
> @@ -3686,7 +3925,7 @@
>    switch (yyn)
>      {
>          case 3:
> -#line 1595 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1834 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if ((yyvsp[0].UIntVal) > (uint32_t)INT32_MAX)     // Outside  
> of my range!
>        error("Value too large for type");
> @@ -3695,7 +3934,7 @@
>      break;
>
>    case 5:
> -#line 1604 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1843 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if ((yyvsp[0].UInt64Val) > (uint64_t)INT64_MAX)     // Outside  
> of my range!
>        error("Value too large for type");
> @@ -3704,226 +3943,226 @@
>      break;
>
>    case 26:
> -#line 1626 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1865 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.IPred) = ICmpInst::ICMP_EQ; ;}
>      break;
>
>    case 27:
> -#line 1626 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1865 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.IPred) = ICmpInst::ICMP_NE; ;}
>      break;
>
>    case 28:
> -#line 1627 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1866 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.IPred) = ICmpInst::ICMP_SLT; ;}
>      break;
>
>    case 29:
> -#line 1627 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1866 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.IPred) = ICmpInst::ICMP_SGT; ;}
>      break;
>
>    case 30:
> -#line 1628 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1867 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.IPred) = ICmpInst::ICMP_SLE; ;}
>      break;
>
>    case 31:
> -#line 1628 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1867 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.IPred) = ICmpInst::ICMP_SGE; ;}
>      break;
>
>    case 32:
> -#line 1629 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1868 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.IPred) = ICmpInst::ICMP_ULT; ;}
>      break;
>
>    case 33:
> -#line 1629 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1868 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.IPred) = ICmpInst::ICMP_UGT; ;}
>      break;
>
>    case 34:
> -#line 1630 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1869 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.IPred) = ICmpInst::ICMP_ULE; ;}
>      break;
>
>    case 35:
> -#line 1630 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1869 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.IPred) = ICmpInst::ICMP_UGE; ;}
>      break;
>
>    case 36:
> -#line 1634 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1873 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_OEQ; ;}
>      break;
>
>    case 37:
> -#line 1634 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1873 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_ONE; ;}
>      break;
>
>    case 38:
> -#line 1635 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1874 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_OLT; ;}
>      break;
>
>    case 39:
> -#line 1635 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1874 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_OGT; ;}
>      break;
>
>    case 40:
> -#line 1636 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1875 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_OLE; ;}
>      break;
>
>    case 41:
> -#line 1636 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1875 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_OGE; ;}
>      break;
>
>    case 42:
> -#line 1637 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1876 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_ORD; ;}
>      break;
>
>    case 43:
> -#line 1637 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1876 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_UNO; ;}
>      break;
>
>    case 44:
> -#line 1638 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1877 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_UEQ; ;}
>      break;
>
>    case 45:
> -#line 1638 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1877 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_UNE; ;}
>      break;
>
>    case 46:
> -#line 1639 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1878 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_ULT; ;}
>      break;
>
>    case 47:
> -#line 1639 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1878 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_UGT; ;}
>      break;
>
>    case 48:
> -#line 1640 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1879 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_ULE; ;}
>      break;
>
>    case 49:
> -#line 1640 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1879 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_UGE; ;}
>      break;
>
>    case 50:
> -#line 1641 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1880 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_TRUE; ;}
>      break;
>
>    case 51:
> -#line 1642 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1881 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.FPred) = FCmpInst::FCMP_FALSE; ;}
>      break;
>
>    case 81:
> -#line 1673 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1912 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.StrVal) = (yyvsp[-1].StrVal);
>    ;}
>      break;
>
>    case 82:
> -#line 1676 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1915 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.StrVal) = 0;
>    ;}
>      break;
>
>    case 83:
> -#line 1681 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1920 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
>      break;
>
>    case 84:
> -#line 1682 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1921 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
>      break;
>
>    case 85:
> -#line 1683 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1922 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
>      break;
>
>    case 86:
> -#line 1684 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1923 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
>      break;
>
>    case 87:
> -#line 1685 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1924 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
>      break;
>
>    case 88:
> -#line 1686 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1925 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
>      break;
>
>    case 89:
> -#line 1687 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1926 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
>      break;
>
>    case 90:
> -#line 1688 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1927 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
>      break;
>
>    case 91:
> -#line 1692 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1931 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.UIntVal) = OldCallingConv::C; ;}
>      break;
>
>    case 92:
> -#line 1693 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1932 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.UIntVal) = OldCallingConv::C; ;}
>      break;
>
>    case 93:
> -#line 1694 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1933 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.UIntVal) = OldCallingConv::CSRet; ;}
>      break;
>
>    case 94:
> -#line 1695 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1934 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.UIntVal) = OldCallingConv::Fast; ;}
>      break;
>
>    case 95:
> -#line 1696 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1935 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.UIntVal) = OldCallingConv::Cold; ;}
>      break;
>
>    case 96:
> -#line 1697 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1936 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.UIntVal) = OldCallingConv::X86_StdCall; ;}
>      break;
>
>    case 97:
> -#line 1698 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1937 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.UIntVal) = OldCallingConv::X86_FastCall; ;}
>      break;
>
>    case 98:
> -#line 1699 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1938 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
>        error("Calling conv too large");
> @@ -3932,12 +4171,12 @@
>      break;
>
>    case 99:
> -#line 1709 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1948 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.UIntVal) = 0; ;}
>      break;
>
>    case 100:
> -#line 1710 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1949 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.UIntVal) = (yyvsp[0].UInt64Val);
>      if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
> @@ -3946,12 +4185,12 @@
>      break;
>
>    case 101:
> -#line 1718 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1957 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.UIntVal) = 0; ;}
>      break;
>
>    case 102:
> -#line 1719 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1958 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.UIntVal) = (yyvsp[0].UInt64Val);
>      if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
> @@ -3960,7 +4199,7 @@
>      break;
>
>    case 103:
> -#line 1727 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1966 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      for (unsigned i = 0, e = strlen((yyvsp[0].StrVal)); i != e; ++i)
>        if ((yyvsp[0].StrVal)[i] == '"' || (yyvsp[0].StrVal)[i] == '\ 
> \')
> @@ -3970,27 +4209,27 @@
>      break;
>
>    case 104:
> -#line 1736 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1975 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.StrVal) = 0; ;}
>      break;
>
>    case 105:
> -#line 1737 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1976 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
>      break;
>
>    case 106:
> -#line 1744 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1983 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {;}
>      break;
>
>    case 107:
> -#line 1745 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1984 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {;}
>      break;
>
>    case 108:
> -#line 1749 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1988 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      CurGV->setSection((yyvsp[0].StrVal));
>      free((yyvsp[0].StrVal));
> @@ -3998,7 +4237,7 @@
>      break;
>
>    case 109:
> -#line 1753 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1992 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp 
> [0].UInt64Val)))
>        error("Alignment must be a power of two");
> @@ -4008,23 +4247,23 @@
>      break;
>
>    case 111:
> -#line 1770 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2009 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[0].PrimType).T);
> -    (yyval.TypeVal).S = Signless;
> +    (yyval.TypeVal).S.makeSignless();
>    ;}
>      break;
>
>    case 113:
> -#line 1778 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2017 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[0].PrimType).T);
> -    (yyval.TypeVal).S = Signless;
> +    (yyval.TypeVal).S.makeSignless();
>    ;}
>      break;
>
>    case 114:
> -#line 1785 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2024 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if (!UpRefs.empty())
>        error("Invalid upreference in type: " + (*(yyvsp 
> [0].TypeVal).PAT)->getDescription());
> @@ -4033,50 +4272,52 @@
>      break;
>
>    case 127:
> -#line 1799 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2038 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[0].PrimType).T);
> -    (yyval.TypeVal).S = (yyvsp[0].PrimType).S;
> +    (yyval.TypeVal).S.copy((yyvsp[0].PrimType).S);
>    ;}
>      break;
>
>    case 128:
> -#line 1803 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2042 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.TypeVal).PAT = new PATypeHolder(OpaqueType::get());
> -    (yyval.TypeVal).S = Signless;
> +    (yyval.TypeVal).S.makeSignless();
>    ;}
>      break;
>
>    case 129:
> -#line 1807 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2046 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {            // Named types are also simple types...
> +    (yyval.TypeVal).S.copy(getTypeSign((yyvsp[0].ValIDVal)));
>      const Type* tmp = getType((yyvsp[0].ValIDVal));
>      (yyval.TypeVal).PAT = new PATypeHolder(tmp);
> -    (yyval.TypeVal).S = Signless; // FIXME: what if its signed?
>    ;}
>      break;
>
>    case 130:
> -#line 1812 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2051 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {                   // Type UpReference
>      if ((yyvsp[0].UInt64Val) > (uint64_t)~0U)
>        error("Value out of range");
>      OpaqueType *OT = OpaqueType::get();        // Use temporary  
> placeholder
>      UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[0].UInt64Val),  
> OT));  // Add to vector...
>      (yyval.TypeVal).PAT = new PATypeHolder(OT);
> -    (yyval.TypeVal).S = Signless;
> +    (yyval.TypeVal).S.makeSignless();
>      UR_OUT("New Upreference!\n");
>    ;}
>      break;
>
>    case 131:
> -#line 1821 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2060 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {           // Function derived type?
> +    (yyval.TypeVal).S.makeComposite((yyvsp[-3].TypeVal).S);
>      std::vector<const Type*> Params;
>      for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp 
> [-1].TypeList)->begin(),
>             E = (yyvsp[-1].TypeList)->end(); I != E; ++I) {
>        Params.push_back(I->PAT->get());
> +      (yyval.TypeVal).S.add(I->S);
>      }
>      FunctionType::ParamAttrsList ParamAttrs;
>      bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
> @@ -4084,97 +4325,101 @@
>
>      (yyval.TypeVal).PAT = new PATypeHolder(
>        HandleUpRefs(FunctionType::get((yyvsp[-3].TypeVal).PAT->get 
> (), Params, isVarArg,
> -                   ParamAttrs)));
> -    (yyval.TypeVal).S = (yyvsp[-3].TypeVal).S;
> -    delete (yyvsp[-3].TypeVal).PAT;    // Delete the return type  
> handle
> +                   ParamAttrs), (yyval.TypeVal).S));
> +    delete (yyvsp[-3].TypeVal).PAT;  // Delete the return type handle
>      delete (yyvsp[-1].TypeList);      // Delete the argument list
>    ;}
>      break;
>
>    case 132:
> -#line 1838 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2078 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {          // Sized array type?
> +    (yyval.TypeVal).S.makeComposite((yyvsp[-1].TypeVal).S);
>      (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> (ArrayType::get((yyvsp[-1].TypeVal).PAT->get(),
> -                                                        (unsigned) 
> (yyvsp[-3].UInt64Val))));
> -    (yyval.TypeVal).S = (yyvsp[-1].TypeVal).S;
> +                                           (unsigned)(yyvsp 
> [-3].UInt64Val)), (yyval.TypeVal).S));
>      delete (yyvsp[-1].TypeVal).PAT;
>    ;}
>      break;
>
>    case 133:
> -#line 1844 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2084 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {          // Vector type?
> -     const llvm::Type* ElemTy = (yyvsp[-1].TypeVal).PAT->get();
> -     if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
> -        error("Unsigned result not equal to signed result");
> -     if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
> -        error("Elements of a VectorType must be integer or  
> floating point");
> -     if (!isPowerOf2_32((yyvsp[-3].UInt64Val)))
> -       error("VectorType length should be a power of 2");
> -     (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> (VectorType::get(ElemTy,
> -                                          (unsigned)(yyvsp 
> [-3].UInt64Val))));
> -     (yyval.TypeVal).S = (yyvsp[-1].TypeVal).S;
> -     delete (yyvsp[-1].TypeVal).PAT;
> +    const llvm::Type* ElemTy = (yyvsp[-1].TypeVal).PAT->get();
> +    if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
> +       error("Unsigned result not equal to signed result");
> +    if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
> +       error("Elements of a VectorType must be integer or floating  
> point");
> +    if (!isPowerOf2_32((yyvsp[-3].UInt64Val)))
> +      error("VectorType length should be a power of 2");
> +    (yyval.TypeVal).S.makeComposite((yyvsp[-1].TypeVal).S);
> +    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> (VectorType::get(ElemTy,
> +                                         (unsigned)(yyvsp 
> [-3].UInt64Val)), (yyval.TypeVal).S));
> +    delete (yyvsp[-1].TypeVal).PAT;
>    ;}
>      break;
>
>    case 134:
> -#line 1857 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2097 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {                        // Structure type?
>      std::vector<const Type*> Elements;
> +    (yyval.TypeVal).S.makeComposite();
>      for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp 
> [-1].TypeList)->begin(),
> -           E = (yyvsp[-1].TypeList)->end(); I != E; ++I)
> +           E = (yyvsp[-1].TypeList)->end(); I != E; ++I) {
>        Elements.push_back(I->PAT->get());
> -    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> (StructType::get(Elements)));
> -    (yyval.TypeVal).S = Signless;
> +      (yyval.TypeVal).S.add(I->S);
> +    }
> +    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> (StructType::get(Elements), (yyval.TypeVal).S));
>      delete (yyvsp[-1].TypeList);
>    ;}
>      break;
>
>    case 135:
> -#line 1866 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2108 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {                                  // Empty structure type?
>      (yyval.TypeVal).PAT = new PATypeHolder(StructType::get 
> (std::vector<const Type*>()));
> -    (yyval.TypeVal).S = Signless;
> +    (yyval.TypeVal).S.makeComposite();
>    ;}
>      break;
>
>    case 136:
> -#line 1870 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2112 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {                // Packed Structure type?
> +    (yyval.TypeVal).S.makeComposite();
>      std::vector<const Type*> Elements;
>      for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp 
> [-2].TypeList)->begin(),
>             E = (yyvsp[-2].TypeList)->end(); I != E; ++I) {
>        Elements.push_back(I->PAT->get());
> +      (yyval.TypeVal).S.add(I->S);
>        delete I->PAT;
>      }
> -    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> (StructType::get(Elements, true)));
> -    (yyval.TypeVal).S = Signless;
> +    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> (StructType::get(Elements, true),
> +                                           (yyval.TypeVal).S));
>      delete (yyvsp[-2].TypeList);
>    ;}
>      break;
>
>    case 137:
> -#line 1881 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2125 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {                          // Empty packed structure type?
>      (yyval.TypeVal).PAT = new PATypeHolder(StructType::get 
> (std::vector<const Type*>(),true));
> -    (yyval.TypeVal).S = Signless;
> +    (yyval.TypeVal).S.makeComposite();
>    ;}
>      break;
>
>    case 138:
> -#line 1885 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2129 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {                             // Pointer type?
>      if ((yyvsp[-1].TypeVal).PAT->get() == Type::LabelTy)
>        error("Cannot form a pointer to a basic block");
> -    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> (PointerType::get((yyvsp[-1].TypeVal).PAT->get())));
> -    (yyval.TypeVal).S = (yyvsp[-1].TypeVal).S;
> +    (yyval.TypeVal).S.makeComposite((yyvsp[-1].TypeVal).S);
> +    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> (PointerType::get((yyvsp[-1].TypeVal).PAT->get()),
> +                                           (yyval.TypeVal).S));
>      delete (yyvsp[-1].TypeVal).PAT;
>    ;}
>      break;
>
>    case 139:
> -#line 1898 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2143 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.TypeList) = new std::list<PATypeInfo>();
>      (yyval.TypeList)->push_back((yyvsp[0].TypeVal));
> @@ -4182,42 +4427,42 @@
>      break;
>
>    case 140:
> -#line 1902 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2147 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back((yyvsp 
> [0].TypeVal));
>    ;}
>      break;
>
>    case 142:
> -#line 1910 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2155 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      PATypeInfo VoidTI;
>      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> -    VoidTI.S = Signless;
> +    VoidTI.S.makeSignless();
>      ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(VoidTI);
>    ;}
>      break;
>
>    case 143:
> -#line 1916 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2161 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.TypeList) = new std::list<PATypeInfo>();
>      PATypeInfo VoidTI;
>      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> -    VoidTI.S = Signless;
> +    VoidTI.S.makeSignless();
>      (yyval.TypeList)->push_back(VoidTI);
>    ;}
>      break;
>
>    case 144:
> -#line 1923 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2168 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.TypeList) = new std::list<PATypeInfo>();
>    ;}
>      break;
>
>    case 145:
> -#line 1935 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { // Nonempty unsized arr
>      const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp 
> [-3].TypeVal).PAT->get());
>      if (ATy == 0)
> @@ -4244,14 +4489,14 @@
>        Elems.push_back(C);
>      }
>      (yyval.ConstVal).C = ConstantArray::get(ATy, Elems);
> -    (yyval.ConstVal).S = (yyvsp[-3].TypeVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-3].TypeVal).S);
>      delete (yyvsp[-3].TypeVal).PAT;
>      delete (yyvsp[-1].ConstVector);
>    ;}
>      break;
>
>    case 146:
> -#line 1965 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2210 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp 
> [-2].TypeVal).PAT->get());
>      if (ATy == 0)
> @@ -4262,13 +4507,13 @@
>        error("Type mismatch: constant sized array initialized with 0"
>              " arguments, but has size of " + itostr(NumElements)  
> +"");
>      (yyval.ConstVal).C = ConstantArray::get(ATy,  
> std::vector<Constant*>());
> -    (yyval.ConstVal).S = (yyvsp[-2].TypeVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-2].TypeVal).S);
>      delete (yyvsp[-2].TypeVal).PAT;
>    ;}
>      break;
>
>    case 147:
> -#line 1978 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp 
> [-2].TypeVal).PAT->get());
>      if (ATy == 0)
> @@ -4289,13 +4534,13 @@
>        Vals.push_back(ConstantInt::get(ETy, *C));
>      free((yyvsp[0].StrVal));
>      (yyval.ConstVal).C = ConstantArray::get(ATy, Vals);
> -    (yyval.ConstVal).S = (yyvsp[-2].TypeVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-2].TypeVal).S);
>      delete (yyvsp[-2].TypeVal).PAT;
>    ;}
>      break;
>
>    case 148:
> -#line 2001 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { // Nonempty unsized arr
>      const VectorType *PTy = dyn_cast<VectorType>((yyvsp 
> [-3].TypeVal).PAT->get());
>      if (PTy == 0)
> @@ -4320,14 +4565,14 @@
>        Elems.push_back(C);
>      }
>      (yyval.ConstVal).C = ConstantVector::get(PTy, Elems);
> -    (yyval.ConstVal).S = (yyvsp[-3].TypeVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-3].TypeVal).S);
>      delete (yyvsp[-3].TypeVal).PAT;
>      delete (yyvsp[-1].ConstVector);
>    ;}
>      break;
>
>    case 149:
> -#line 2029 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2274 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const StructType *STy = dyn_cast<StructType>((yyvsp 
> [-3].TypeVal).PAT->get());
>      if (STy == 0)
> @@ -4346,14 +4591,14 @@
>        Fields.push_back(C);
>      }
>      (yyval.ConstVal).C = ConstantStruct::get(STy, Fields);
> -    (yyval.ConstVal).S = (yyvsp[-3].TypeVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-3].TypeVal).S);
>      delete (yyvsp[-3].TypeVal).PAT;
>      delete (yyvsp[-1].ConstVector);
>    ;}
>      break;
>
>    case 150:
> -#line 2051 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2296 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const StructType *STy = dyn_cast<StructType>((yyvsp 
> [-2].TypeVal).PAT->get());
>      if (STy == 0)
> @@ -4362,13 +4607,13 @@
>      if (STy->getNumContainedTypes() != 0)
>        error("Illegal number of initializers for structure type");
>      (yyval.ConstVal).C = ConstantStruct::get(STy,  
> std::vector<Constant*>());
> -    (yyval.ConstVal).S = (yyvsp[-2].TypeVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-2].TypeVal).S);
>      delete (yyvsp[-2].TypeVal).PAT;
>    ;}
>      break;
>
>    case 151:
> -#line 2062 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2307 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const StructType *STy = dyn_cast<StructType>((yyvsp 
> [-5].TypeVal).PAT->get());
>      if (STy == 0)
> @@ -4387,14 +4632,14 @@
>        Fields.push_back(C);
>      }
>      (yyval.ConstVal).C = ConstantStruct::get(STy, Fields);
> -    (yyval.ConstVal).S = (yyvsp[-5].TypeVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-5].TypeVal).S);
>      delete (yyvsp[-5].TypeVal).PAT;
>      delete (yyvsp[-2].ConstVector);
>    ;}
>      break;
>
>    case 152:
> -#line 2084 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2329 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const StructType *STy = dyn_cast<StructType>((yyvsp 
> [-4].TypeVal).PAT->get());
>      if (STy == 0)
> @@ -4403,35 +4648,35 @@
>      if (STy->getNumContainedTypes() != 0)
>        error("Illegal number of initializers for packed structure  
> type");
>      (yyval.ConstVal).C = ConstantStruct::get(STy,  
> std::vector<Constant*>());
> -    (yyval.ConstVal).S = (yyvsp[-4].TypeVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-4].TypeVal).S);
>      delete (yyvsp[-4].TypeVal).PAT;
>    ;}
>      break;
>
>    case 153:
> -#line 2095 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2340 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const PointerType *PTy = dyn_cast<PointerType>((yyvsp 
> [-1].TypeVal).PAT->get());
>      if (PTy == 0)
>        error("Cannot make null pointer constant with type: '" +
>              (yyvsp[-1].TypeVal).PAT->get()->getDescription() + "'");
>      (yyval.ConstVal).C = ConstantPointerNull::get(PTy);
> -    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
>      delete (yyvsp[-1].TypeVal).PAT;
>    ;}
>      break;
>
>    case 154:
> -#line 2104 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2349 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.ConstVal).C = UndefValue::get((yyvsp[-1].TypeVal).PAT- 
> >get());
> -    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
>      delete (yyvsp[-1].TypeVal).PAT;
>    ;}
>      break;
>
>    case 155:
> -#line 2109 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2354 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const PointerType *Ty = dyn_cast<PointerType>((yyvsp 
> [-1].TypeVal).PAT->get());
>      if (Ty == 0)
> @@ -4447,6 +4692,7 @@
>      //
>      Function *SavedCurFn = CurFun.CurrentFunction;
>      CurFun.CurrentFunction = 0;
> +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
>      Value *V = getExistingValue(Ty, (yyvsp[0].ValIDVal));
>      CurFun.CurrentFunction = SavedCurFn;
>
> @@ -4487,89 +4733,89 @@
>        }
>      }
>      (yyval.ConstVal).C = cast<GlobalValue>(V);
> -    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
>      delete (yyvsp[-1].TypeVal).PAT;            // Free the type  
> handle
>    ;}
>      break;
>
>    case 156:
> -#line 2167 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2413 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if ((yyvsp[-1].TypeVal).PAT->get() != (yyvsp[0].ConstVal).C- 
> >getType())
>        error("Mismatched types for constant expression");
>      (yyval.ConstVal) = (yyvsp[0].ConstVal);
> -    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
>      delete (yyvsp[-1].TypeVal).PAT;
>    ;}
>      break;
>
>    case 157:
> -#line 2174 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2420 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
>      if (isa<FunctionType>(Ty) || Ty == Type::LabelTy ||  
> isa<OpaqueType>(Ty))
>        error("Cannot create a null initialized value of this type");
>      (yyval.ConstVal).C = Constant::getNullValue(Ty);
> -    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
>      delete (yyvsp[-1].TypeVal).PAT;
>    ;}
>      break;
>
>    case 158:
> -#line 2182 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2428 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {      // integral constants
>      const Type *Ty = (yyvsp[-1].PrimType).T;
>      if (!ConstantInt::isValueValidForType(Ty, (yyvsp[0].SInt64Val)))
>        error("Constant value doesn't fit in type");
>      (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[0].SInt64Val));
> -    (yyval.ConstVal).S = Signed;
> +    (yyval.ConstVal).S.makeSigned();
>    ;}
>      break;
>
>    case 159:
> -#line 2189 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2435 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {            // integral constants
>      const Type *Ty = (yyvsp[-1].PrimType).T;
>      if (!ConstantInt::isValueValidForType(Ty, (yyvsp[0].UInt64Val)))
>        error("Constant value doesn't fit in type");
>      (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[0].UInt64Val));
> -    (yyval.ConstVal).S = Unsigned;
> +    (yyval.ConstVal).S.makeUnsigned();
>    ;}
>      break;
>
>    case 160:
> -#line 2196 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2442 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {                      // Boolean constants
>      (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, true);
> -    (yyval.ConstVal).S = Unsigned;
> +    (yyval.ConstVal).S.makeUnsigned();
>    ;}
>      break;
>
>    case 161:
> -#line 2200 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2446 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {                     // Boolean constants
>      (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, false);
> -    (yyval.ConstVal).S = Unsigned;
> +    (yyval.ConstVal).S.makeUnsigned();
>    ;}
>      break;
>
>    case 162:
> -#line 2204 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2450 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {                   // Float & Double constants
>      if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType).T,  
> (yyvsp[0].FPVal)))
>        error("Floating point constant invalid for type");
>      (yyval.ConstVal).C = ConstantFP::get((yyvsp[-1].PrimType).T,  
> (yyvsp[0].FPVal));
> -    (yyval.ConstVal).S = Signless;
> +    (yyval.ConstVal).S.makeSignless();
>    ;}
>      break;
>
>    case 163:
> -#line 2213 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2459 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type* SrcTy = (yyvsp[-3].ConstVal).C->getType();
>      const Type* DstTy = (yyvsp[-1].TypeVal).PAT->get();
> -    Signedness SrcSign = (yyvsp[-3].ConstVal).S;
> -    Signedness DstSign = (yyvsp[-1].TypeVal).S;
> +    Signedness SrcSign((yyvsp[-3].ConstVal).S);
> +    Signedness DstSign((yyvsp[-1].TypeVal).S);
>      if (!SrcTy->isFirstClassType())
>        error("cast constant expression from a non-primitive type: '" +
>              SrcTy->getDescription() + "'");
> @@ -4577,13 +4823,13 @@
>        error("cast constant expression to a non-primitive type: '" +
>              DstTy->getDescription() + "'");
>      (yyval.ConstVal).C = cast<Constant>(getCast((yyvsp 
> [-5].CastOpVal), (yyvsp[-3].ConstVal).C, SrcSign, DstTy, DstSign));
> -    (yyval.ConstVal).S = DstSign;
> +    (yyval.ConstVal).S.copy(DstSign);
>      delete (yyvsp[-1].TypeVal).PAT;
>    ;}
>      break;
>
>    case 164:
> -#line 2228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2474 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *Ty = (yyvsp[-2].ConstVal).C->getType();
>      if (!isa<PointerType>(Ty))
> @@ -4595,12 +4841,12 @@
>
>      delete (yyvsp[-1].ValueList);
>      (yyval.ConstVal).C = ConstantExpr::getGetElementPtr((yyvsp 
> [-2].ConstVal).C, &CIndices[0], CIndices.size());
> -    (yyval.ConstVal).S = Signless;
> +    (yyval.ConstVal).S.copy(getElementSign((yyvsp[-2].ConstVal),  
> CIndices));
>    ;}
>      break;
>
>    case 165:
> -#line 2241 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2487 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if (!(yyvsp[-5].ConstVal).C->getType()->isInteger() ||
>          cast<IntegerType>((yyvsp[-5].ConstVal).C->getType())- 
> >getBitWidth() != 1)
> @@ -4608,12 +4854,12 @@
>      if ((yyvsp[-3].ConstVal).C->getType() != (yyvsp 
> [-1].ConstVal).C->getType())
>        error("Select operand types must match");
>      (yyval.ConstVal).C = ConstantExpr::getSelect((yyvsp 
> [-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> -    (yyval.ConstVal).S = Unsigned;
> +    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S);
>    ;}
>      break;
>
>    case 166:
> -#line 2250 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2496 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *Ty = (yyvsp[-3].ConstVal).C->getType();
>      if (Ty != (yyvsp[-1].ConstVal).C->getType())
> @@ -4640,12 +4886,12 @@
>               ConstantExpr::getCast(Instruction::PtrToInt, (yyvsp 
> [-1].ConstVal).C, IntPtrTy));
>        (yyval.ConstVal).C = ConstantExpr::getCast 
> (Instruction::IntToPtr, (yyval.ConstVal).C, Ty);
>      }
> -    (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S);
>    ;}
>      break;
>
>    case 167:
> -#line 2278 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2524 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type* Ty = (yyvsp[-3].ConstVal).C->getType();
>      if (Ty != (yyvsp[-1].ConstVal).C->getType())
> @@ -4657,12 +4903,12 @@
>      }
>      Instruction::BinaryOps Opcode = getBinaryOp((yyvsp 
> [-5].BinaryOpVal), Ty, (yyvsp[-3].ConstVal).S);
>      (yyval.ConstVal).C = ConstantExpr::get(Opcode, (yyvsp 
> [-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> -    (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S);
>    ;}
>      break;
>
>    case 168:
> -#line 2291 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2537 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type* Ty = (yyvsp[-3].ConstVal).C->getType();
>      if (Ty != (yyvsp[-1].ConstVal).C->getType())
> @@ -4670,32 +4916,32 @@
>      unsigned short pred;
>      Instruction::OtherOps Opcode = getCompareOp((yyvsp 
> [-5].BinaryOpVal), pred, Ty, (yyvsp[-3].ConstVal).S);
>      (yyval.ConstVal).C = ConstantExpr::getCompare(Opcode, (yyvsp 
> [-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> -    (yyval.ConstVal).S = Unsigned;
> +    (yyval.ConstVal).S.makeUnsigned();
>    ;}
>      break;
>
>    case 169:
> -#line 2300 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2546 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if ((yyvsp[-3].ConstVal).C->getType() != (yyvsp 
> [-1].ConstVal).C->getType())
>        error("icmp operand types must match");
>      (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp 
> [-5].IPred), (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> -    (yyval.ConstVal).S = Unsigned;
> +    (yyval.ConstVal).S.makeUnsigned();
>    ;}
>      break;
>
>    case 170:
> -#line 2306 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2552 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if ((yyvsp[-3].ConstVal).C->getType() != (yyvsp 
> [-1].ConstVal).C->getType())
>        error("fcmp operand types must match");
>      (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp 
> [-5].FPred), (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> -    (yyval.ConstVal).S = Unsigned;
> +    (yyval.ConstVal).S.makeUnsigned();
>    ;}
>      break;
>
>    case 171:
> -#line 2312 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2558 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if (!(yyvsp[-1].ConstVal).C->getType()->isInteger() ||
>          cast<IntegerType>((yyvsp[-1].ConstVal).C->getType())- 
> >getBitWidth() != 8)
> @@ -4705,47 +4951,47 @@
>        error("Shift constant expression requires integer operand");
>      Constant *ShiftAmt = ConstantExpr::getZExt((yyvsp 
> [-1].ConstVal).C, Ty);
>      (yyval.ConstVal).C = ConstantExpr::get(getBinaryOp((yyvsp 
> [-5].BinaryOpVal), Ty, (yyvsp[-3].ConstVal).S), (yyvsp 
> [-3].ConstVal).C, ShiftAmt);
> -    (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S);
>    ;}
>      break;
>
>    case 172:
> -#line 2323 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2569 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if (!ExtractElementInst::isValidOperands((yyvsp 
> [-3].ConstVal).C, (yyvsp[-1].ConstVal).C))
>        error("Invalid extractelement operands");
>      (yyval.ConstVal).C = ConstantExpr::getExtractElement((yyvsp 
> [-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> -    (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S.get(0));
>    ;}
>      break;
>
>    case 173:
> -#line 2329 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2575 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if (!InsertElementInst::isValidOperands((yyvsp 
> [-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C))
>        error("Invalid insertelement operands");
>      (yyval.ConstVal).C = ConstantExpr::getInsertElement((yyvsp 
> [-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> -    (yyval.ConstVal).S = (yyvsp[-5].ConstVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-5].ConstVal).S);
>    ;}
>      break;
>
>    case 174:
> -#line 2335 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2581 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if (!ShuffleVectorInst::isValidOperands((yyvsp 
> [-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C))
>        error("Invalid shufflevector operands");
>      (yyval.ConstVal).C = ConstantExpr::getShuffleVector((yyvsp 
> [-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> -    (yyval.ConstVal).S = (yyvsp[-5].ConstVal).S;
> +    (yyval.ConstVal).S.copy((yyvsp[-5].ConstVal).S);
>    ;}
>      break;
>
>    case 175:
> -#line 2346 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2592 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back 
> ((yyvsp[0].ConstVal)); ;}
>      break;
>
>    case 176:
> -#line 2347 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2593 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.ConstVector) = new std::vector<ConstInfo>();
>      (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
> @@ -4753,17 +4999,17 @@
>      break;
>
>    case 177:
> -#line 2356 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2602 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.BoolVal) = false; ;}
>      break;
>
>    case 178:
> -#line 2357 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2603 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.BoolVal) = true; ;}
>      break;
>
>    case 179:
> -#line 2369 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2615 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.ModuleVal) = ParserResult = (yyvsp[0].ModuleVal);
>      CurModule.ModuleDone();
> @@ -4771,27 +5017,27 @@
>      break;
>
>    case 180:
> -#line 2378 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2624 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);  
> CurFun.FunctionDone(); ;}
>      break;
>
>    case 181:
> -#line 2379 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2625 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); ;}
>      break;
>
>    case 182:
> -#line 2380 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2626 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.ModuleVal) = (yyvsp[-3].ModuleVal); ;}
>      break;
>
>    case 183:
> -#line 2381 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2627 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); ;}
>      break;
>
>    case 184:
> -#line 2382 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2628 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.ModuleVal) = CurModule.CurrentModule;
>      // Emit an error if there are any unresolved types left.
> @@ -4807,7 +5053,7 @@
>      break;
>
>    case 185:
> -#line 2398 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2644 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      // Eagerly resolve types.  This is not an optimization, this is a
>      // requirement that is due to the fact that we could have this:
> @@ -4818,115 +5064,118 @@
>      // If types are not resolved eagerly, then the two types will  
> not be
>      // determined to be the same type!
>      //
> -    const Type* Ty = (yyvsp[0].TypeVal).PAT->get();
> -    ResolveTypeTo((yyvsp[-2].StrVal), Ty);
> +    ResolveTypeTo((yyvsp[-2].StrVal), (yyvsp[0].TypeVal).PAT->get 
> (), (yyvsp[0].TypeVal).S);
>
> -    if (!setTypeName(Ty, (yyvsp[-2].StrVal)) && !(yyvsp 
> [-2].StrVal)) {
> -      // If this is a named type that is not a redefinition, add  
> it to the slot
> -      // table.
> -      CurModule.Types.push_back(Ty);
> +    if (!setTypeName((yyvsp[0].TypeVal), (yyvsp[-2].StrVal)) && ! 
> (yyvsp[-2].StrVal)) {
> +      // If this is a numbered type that is not a redefinition,  
> add it to the
> +      // slot table.
> +      CurModule.Types.push_back((yyvsp[0].TypeVal).PAT->get());
> +      CurModule.TypeSigns.push_back((yyvsp[0].TypeVal).S);
>      }
>      delete (yyvsp[0].TypeVal).PAT;
>    ;}
>      break;
>
>    case 186:
> -#line 2418 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2664 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {       // Function prototypes can be in const pool
>    ;}
>      break;
>
>    case 187:
> -#line 2420 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2666 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {  // Asm blocks can be in the const pool
>    ;}
>      break;
>
>    case 188:
> -#line 2422 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2668 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if ((yyvsp[0].ConstVal).C == 0)
>        error("Global value initializer is not a constant");
> -    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), (yyvsp 
> [-2].Linkage), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal).C->getType 
> (), (yyvsp[0].ConstVal).C);
> +    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), (yyvsp 
> [-2].Linkage), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal).C->getType 
> (), (yyvsp[0].ConstVal).C, (yyvsp[0].ConstVal).S);
>    ;}
>      break;
>
>    case 189:
> -#line 2426 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2672 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      CurGV = 0;
>    ;}
>      break;
>
>    case 190:
> -#line 2429 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2675 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
> -    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal),  
> GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), Ty, 0);
> +    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal),  
> GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), Ty, 0,
> +                                (yyvsp[0].TypeVal).S);
>      delete (yyvsp[0].TypeVal).PAT;
>    ;}
>      break;
>
>    case 191:
> -#line 2433 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2680 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      CurGV = 0;
>    ;}
>      break;
>
>    case 192:
> -#line 2436 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2683 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
> -    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal),  
> GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), Ty, 0);
> +    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal),  
> GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), Ty, 0,
> +                                (yyvsp[0].TypeVal).S);
>      delete (yyvsp[0].TypeVal).PAT;
>    ;}
>      break;
>
>    case 193:
> -#line 2440 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2688 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      CurGV = 0;
>    ;}
>      break;
>
>    case 194:
> -#line 2443 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2691 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
>      CurGV =
> -      ParseGlobalVariable((yyvsp[-3].StrVal),  
> GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), Ty, 0);
> +      ParseGlobalVariable((yyvsp[-3].StrVal),  
> GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), Ty, 0,
> +                          (yyvsp[0].TypeVal).S);
>      delete (yyvsp[0].TypeVal).PAT;
>    ;}
>      break;
>
>    case 195:
> -#line 2448 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2697 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      CurGV = 0;
>    ;}
>      break;
>
>    case 196:
> -#line 2451 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2700 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>    ;}
>      break;
>
>    case 197:
> -#line 2453 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2702 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>    ;}
>      break;
>
>    case 198:
> -#line 2455 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2704 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>    ;}
>      break;
>
>    case 199:
> -#line 2460 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2709 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const std::string &AsmSoFar = CurModule.CurrentModule- 
> >getModuleInlineAsm();
>      char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
> @@ -4941,24 +5190,24 @@
>      break;
>
>    case 200:
> -#line 2474 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2723 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.Endianness) = Module::BigEndian; ;}
>      break;
>
>    case 201:
> -#line 2475 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2724 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.Endianness) = Module::LittleEndian; ;}
>      break;
>
>    case 202:
> -#line 2479 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2728 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      CurModule.setEndianness((yyvsp[0].Endianness));
>    ;}
>      break;
>
>    case 203:
> -#line 2482 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2731 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if ((yyvsp[0].UInt64Val) == 32)
>        CurModule.setPointerSize(Module::Pointer32);
> @@ -4970,7 +5219,7 @@
>      break;
>
>    case 204:
> -#line 2490 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2739 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
>      free((yyvsp[0].StrVal));
> @@ -4978,7 +5227,7 @@
>      break;
>
>    case 205:
> -#line 2494 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2743 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
>      free((yyvsp[0].StrVal));
> @@ -4986,7 +5235,7 @@
>      break;
>
>    case 207:
> -#line 2505 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2754 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>        CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
>        free((yyvsp[0].StrVal));
> @@ -4994,7 +5243,7 @@
>      break;
>
>    case 208:
> -#line 2509 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2758 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
>      free((yyvsp[0].StrVal));
> @@ -5002,17 +5251,17 @@
>      break;
>
>    case 209:
> -#line 2513 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2762 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { ;}
>      break;
>
>    case 213:
> -#line 2526 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2775 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.StrVal) = 0; ;}
>      break;
>
>    case 214:
> -#line 2530 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2779 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if ((yyvsp[-1].TypeVal).PAT->get() == Type::VoidTy)
>        error("void typed arguments are invalid");
> @@ -5021,7 +5270,7 @@
>      break;
>
>    case 215:
> -#line 2538 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2787 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.ArgList) = (yyvsp[-2].ArgList);
>      (yyval.ArgList)->push_back(*(yyvsp[0].ArgVal));
> @@ -5030,7 +5279,7 @@
>      break;
>
>    case 216:
> -#line 2543 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2792 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.ArgList) = new std::vector<std::pair<PATypeInfo,char*> > 
> ();
>      (yyval.ArgList)->push_back(*(yyvsp[0].ArgVal));
> @@ -5039,39 +5288,39 @@
>      break;
>
>    case 217:
> -#line 2551 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2800 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.ArgList) = (yyvsp[0].ArgList); ;}
>      break;
>
>    case 218:
> -#line 2552 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2801 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.ArgList) = (yyvsp[-2].ArgList);
>      PATypeInfo VoidTI;
>      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> -    VoidTI.S = Signless;
> +    VoidTI.S.makeSignless();
>      (yyval.ArgList)->push_back(std::pair<PATypeInfo, char*> 
> (VoidTI, 0));
>    ;}
>      break;
>
>    case 219:
> -#line 2559 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2808 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.ArgList) = new std::vector<std::pair<PATypeInfo,char*> > 
> ();
>      PATypeInfo VoidTI;
>      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> -    VoidTI.S = Signless;
> +    VoidTI.S.makeSignless();
>      (yyval.ArgList)->push_back(std::pair<PATypeInfo, char*> 
> (VoidTI, 0));
>    ;}
>      break;
>
>    case 220:
> -#line 2566 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2815 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.ArgList) = 0; ;}
>      break;
>
>    case 221:
> -#line 2570 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 2819 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      UnEscapeLexed((yyvsp[-5].StrVal));
>      std::string FunctionName((yyvsp[-5].StrVal));
> @@ -5082,6 +5331,8 @@
>      if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
>        error("LLVM functions cannot return aggregate types");
>
> +    Signedness FTySign;
> +    FTySign.makeComposite((yyvsp[-6].TypeVal).S);
>      std::vector<const Type*> ParamTyList;
>
>      // In LLVM 2.0 the signatures of three varargs intrinsics  
> changed to take
> @@ -5097,6 +5348,7 @@
>             I = (yyvsp[-3].ArgList)->begin(), E = (yyvsp 
> [-3].ArgList)->end(); I != E; ++I) {
>          const Type *Ty = I->first.PAT->get();
>          ParamTyList.push_back(Ty);
> +        FTySign.add(I->first.S);
>        }
>      }
>
> @@ -5123,6 +5375,7 @@
>      } else {
>        ID = ValID::create((int)CurModule.Values[PFT].size());
>      }
> +    ID.S.makeComposite(FTySign);
>
>      Function *Fn = 0;
>      Module* M = CurModule.CurrentModule;
> @@ -5149,14 +5402,16 @@
>            std::string NewName(makeNameUnique(FunctionName));
>            if (Conflict->hasInternalLinkage()) {
>              Conflict->setName(NewName);
> -            RenameMapKey Key = std::make_pair 
> (FunctionName,Conflict->getType());
> +            RenameMapKey Key =
> +              makeRenameMapKey(FunctionName, Conflict->getType(),  
> ID.S);
>              CurModule.RenameMap[Key] = NewName;
>              Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
>              InsertValue(Fn, CurModule.Values);
>            } else {
>              Fn = new Function(FT, CurFun.Linkage, NewName, M);
>              InsertValue(Fn, CurModule.Values);
> -            RenameMapKey Key = std::make_pair(FunctionName,PFT);
> +            RenameMapKey Key =
> +              makeRenameMapKey(FunctionName, PFT, ID.S);
>              CurModule.RenameMap[Key] = NewName;
>            }
>          } else {
> @@ -5178,9 +5433,11 @@
>          // type plane. After PR411 was fixed, this is no loner the  
> case.
>          // To resolve this we must rename one of the two.
>          if (Conflict->hasInternalLinkage()) {
> -          // We can safely renamed the Conflict.
> +          // We can safely rename the Conflict.
> +          RenameMapKey Key =
> +            makeRenameMapKey(Conflict->getName(), Conflict->getType 
> (),
> +              CurModule.NamedValueSigns[Conflict->getName()]);
>            Conflict->setName(makeNameUnique(Conflict->getName()));
> -          RenameMapKey Key = std::make_pair(FunctionName,Conflict- 
> >getType());
>            CurModule.RenameMap[Key] = Conflict->getName();
>            Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
>            InsertValue(Fn, CurModule.Values);
> @@ -5189,7 +5446,7 @@
>            std::string NewName = makeNameUnique(FunctionName);
>            Fn = new Function(FT, CurFun.Linkage, NewName, M);
>            InsertValue(Fn, CurModule.Values);
> -          RenameMapKey Key = std::make_pair(FunctionName,PFT);
> +          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT,  
> ID.S);
>            CurModule.RenameMap[Key] = NewName;
>          } else {
>            // We can't quietly rename either of these things, but  
> we must
> @@ -5200,7 +5457,7 @@
>                    "' may cause linkage errors");
>            Fn = new Function(FT, CurFun.Linkage, NewName, M);
>            InsertValue(Fn, CurModule.Values);
> -          RenameMapKey Key = std::make_pair(FunctionName,PFT);
> +          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT,  
> ID.S);
>            CurModule.RenameMap[Key] = NewName;
>          }
>        } else {
> @@ -5239,7 +5496,8 @@
>        std::vector<std::pair<PATypeInfo,char*> >::iterator E =  
> (yyvsp[-3].ArgList)->end();
>        for ( ; I != E && ArgIt != ArgEnd; ++I, ++ArgIt) {
>          delete I->first.PAT;                      // Delete the  
> typeholder...
> -        setValueName(ArgIt, I->second);           // Insert arg  
> into symtab...
> +        ValueInfo VI; VI.V = ArgIt; VI.S.copy(I->first.S);
> +        setValueName(VI, I->second);           // Insert arg into  
> symtab...
>          InsertValue(ArgIt);
>        }
>        delete (yyvsp[-3].ArgList);                     // We're now  
> done with the argument list
> @@ -5248,7 +5506,7 @@
>      break;
>
>    case 224:
> -#line 2750 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3008 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.FunctionVal) = CurFun.CurrentFunction;
>
> @@ -5259,39 +5517,39 @@
>      break;
>
>    case 227:
> -#line 2764 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3022 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
>    ;}
>      break;
>
>    case 228:
> -#line 2769 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3027 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
>      break;
>
>    case 229:
> -#line 2770 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3028 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
>      break;
>
>    case 230:
> -#line 2771 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3029 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
>      break;
>
>    case 231:
> -#line 2775 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3033 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { CurFun.isDeclare = true; ;}
>      break;
>
>    case 232:
> -#line 2776 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3034 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { CurFun.Linkage = (yyvsp[0].Linkage); ;}
>      break;
>
>    case 233:
> -#line 2776 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3034 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.FunctionVal) = CurFun.CurrentFunction;
>      CurFun.FunctionDone();
> @@ -5300,63 +5558,69 @@
>      break;
>
>    case 234:
> -#line 2788 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3046 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.BoolVal) = false; ;}
>      break;
>
>    case 235:
> -#line 2789 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3047 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.BoolVal) = true; ;}
>      break;
>
>    case 236:
> -#line 2794 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> -    {    (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val)); ;}
> +#line 3052 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +    { (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val)); ;}
>      break;
>
>    case 237:
> -#line 2795 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3053 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val)); ;}
>      break;
>
>    case 238:
> -#line 2796 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3054 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal)); ;}
>      break;
>
>    case 239:
> -#line 2797 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> -    { (yyval.ValIDVal) = ValID::create(ConstantInt::get 
> (Type::Int1Ty, true)); ;}
> +#line 3055 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +    {
> +    (yyval.ValIDVal) = ValID::create(ConstantInt::get 
> (Type::Int1Ty, true));
> +    (yyval.ValIDVal).S.makeUnsigned();
> +  ;}
>      break;
>
>    case 240:
> -#line 2798 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> -    { (yyval.ValIDVal) = ValID::create(ConstantInt::get 
> (Type::Int1Ty, false)); ;}
> +#line 3059 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +    {
> +    (yyval.ValIDVal) = ValID::create(ConstantInt::get 
> (Type::Int1Ty, false));
> +    (yyval.ValIDVal).S.makeUnsigned();
> +  ;}
>      break;
>
>    case 241:
> -#line 2799 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3063 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.ValIDVal) = ValID::createNull(); ;}
>      break;
>
>    case 242:
> -#line 2800 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3064 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.ValIDVal) = ValID::createUndef(); ;}
>      break;
>
>    case 243:
> -#line 2801 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3065 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.ValIDVal) = ValID::createZeroInit(); ;}
>      break;
>
>    case 244:
> -#line 2802 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3066 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { // Nonempty unsized packed vector
>      const Type *ETy = (*(yyvsp[-1].ConstVector))[0].C->getType();
>      int NumElements = (yyvsp[-1].ConstVector)->size();
>      VectorType* pt = VectorType::get(ETy, NumElements);
> -    PATypeHolder* PTy = new PATypeHolder(
> -      HandleUpRefs(VectorType::get(ETy, NumElements)));
> +    (yyval.ValIDVal).S.makeComposite((*(yyvsp[-1].ConstVector)) 
> [0].S);
> +    PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt,  
> (yyval.ValIDVal).S));
>
>      // Verify all elements are correct type!
>      std::vector<Constant*> Elems;
> @@ -5375,14 +5639,15 @@
>      break;
>
>    case 245:
> -#line 2823 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3087 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal).C);
> +    (yyval.ValIDVal).S.copy((yyvsp[0].ConstVal).S);
>    ;}
>      break;
>
>    case 246:
> -#line 2826 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3091 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
>      std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
> @@ -5395,52 +5660,54 @@
>      break;
>
>    case 247:
> -#line 2841 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> -    {  (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal)); ;}
> +#line 3105 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +    {  (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal));  
> (yyval.ValIDVal).S.makeSignless(); ;}
>      break;
>
>    case 248:
> -#line 2842 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> -    {  (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal)); ;}
> +#line 3106 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +    {  (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal));  
> (yyval.ValIDVal).S.makeSignless(); ;}
>      break;
>
>    case 251:
> -#line 2855 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3119 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
> -    (yyval.ValueVal).S = (yyvsp[-1].TypeVal).S;
> +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
>      (yyval.ValueVal).V = getVal(Ty, (yyvsp[0].ValIDVal));
> +    (yyval.ValueVal).S.copy((yyvsp[-1].TypeVal).S);
>      delete (yyvsp[-1].TypeVal).PAT;
>    ;}
>      break;
>
>    case 252:
> -#line 2864 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3129 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
>    ;}
>      break;
>
>    case 253:
> -#line 2867 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3132 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { // Do not allow functions with 0 basic blocks
>      (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
>    ;}
>      break;
>
>    case 254:
> -#line 2876 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3141 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> -    setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
> -    InsertValue((yyvsp[0].TermInstVal));
> -    (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp 
> [0].TermInstVal));
> +    ValueInfo VI; VI.V = (yyvsp[0].TermInstVal).TI; VI.S.copy 
> ((yyvsp[0].TermInstVal).S);
> +    setValueName(VI, (yyvsp[-1].StrVal));
> +    InsertValue((yyvsp[0].TermInstVal).TI);
> +    (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp 
> [0].TermInstVal).TI);
>      InsertValue((yyvsp[-2].BasicBlockVal));
>      (yyval.BasicBlockVal) = (yyvsp[-2].BasicBlockVal);
>    ;}
>      break;
>
>    case 255:
> -#line 2886 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3152 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if ((yyvsp[0].InstVal).I)
>        (yyvsp[-1].BasicBlockVal)->getInstList().push_back((yyvsp 
> [0].InstVal).I);
> @@ -5449,9 +5716,9 @@
>      break;
>
>    case 256:
> -#line 2891 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3157 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> -    (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int) 
> CurFun.NextBBNum++), true);
> +    (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int) 
> CurFun.NextBBNum++),true);
>      // Make sure to move the basic block to the correct location  
> in the
>      // function, instead of leaving it inserted wherever it was first
>      // referenced.
> @@ -5462,7 +5729,7 @@
>      break;
>
>    case 257:
> -#line 2900 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3166 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp 
> [0].StrVal)), true);
>      // Make sure to move the basic block to the correct location  
> in the
> @@ -5475,44 +5742,54 @@
>      break;
>
>    case 260:
> -#line 2914 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {              // Return with a result...
> -    (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal).V);
> +    (yyval.TermInstVal).TI = new ReturnInst((yyvsp[0].ValueVal).V);
> +    (yyval.TermInstVal).S.makeSignless();
>    ;}
>      break;
>
>    case 261:
> -#line 2917 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3184 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {                                       // Return with no  
> result...
> -    (yyval.TermInstVal) = new ReturnInst();
> +    (yyval.TermInstVal).TI = new ReturnInst();
> +    (yyval.TermInstVal).S.makeSignless();
>    ;}
>      break;
>
>    case 262:
> -#line 2920 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3188 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {                         // Unconditional Branch...
>      BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
> -    (yyval.TermInstVal) = new BranchInst(tmpBB);
> +    (yyval.TermInstVal).TI = new BranchInst(tmpBB);
> +    (yyval.TermInstVal).S.makeSignless();
>    ;}
>      break;
>
>    case 263:
> -#line 2924 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3193 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> +    (yyvsp[-3].ValIDVal).S.makeSignless();
> +    (yyvsp[0].ValIDVal).S.makeSignless();
>      BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
>      BasicBlock* tmpBBB = getBBVal((yyvsp[0].ValIDVal));
> +    (yyvsp[-6].ValIDVal).S.makeUnsigned();
>      Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[-6].ValIDVal));
> -    (yyval.TermInstVal) = new BranchInst(tmpBBA, tmpBBB, tmpVal);
> +    (yyval.TermInstVal).TI = new BranchInst(tmpBBA, tmpBBB, tmpVal);
> +    (yyval.TermInstVal).S.makeSignless();
>    ;}
>      break;
>
>    case 264:
> -#line 2930 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> +    (yyvsp[-6].ValIDVal).S.copy((yyvsp[-7].PrimType).S);
>      Value* tmpVal = getVal((yyvsp[-7].PrimType).T, (yyvsp 
> [-6].ValIDVal));
> +    (yyvsp[-3].ValIDVal).S.makeSignless();
>      BasicBlock* tmpBB = getBBVal((yyvsp[-3].ValIDVal));
>      SwitchInst *S = new SwitchInst(tmpVal, tmpBB, (yyvsp 
> [-1].JumpTable)->size());
> -    (yyval.TermInstVal) = S;
> +    (yyval.TermInstVal).TI = S;
> +    (yyval.TermInstVal).S.makeSignless();
>      std::vector<std::pair<Constant*,BasicBlock*> >::iterator I =  
> (yyvsp[-1].JumpTable)->begin(),
>        E = (yyvsp[-1].JumpTable)->end();
>      for (; I != E; ++I) {
> @@ -5526,29 +5803,36 @@
>      break;
>
>    case 265:
> -#line 2945 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3221 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> +    (yyvsp[-5].ValIDVal).S.copy((yyvsp[-6].PrimType).S);
>      Value* tmpVal = getVal((yyvsp[-6].PrimType).T, (yyvsp 
> [-5].ValIDVal));
> +    (yyvsp[-2].ValIDVal).S.makeSignless();
>      BasicBlock* tmpBB = getBBVal((yyvsp[-2].ValIDVal));
>      SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
> -    (yyval.TermInstVal) = S;
> +    (yyval.TermInstVal).TI = S;
> +    (yyval.TermInstVal).S.makeSignless();
>    ;}
>      break;
>
>    case 266:
> -#line 2952 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const PointerType *PFTy;
>      const FunctionType *Ty;
> +    Signedness FTySign;
>
>      if (!(PFTy = dyn_cast<PointerType>((yyvsp[-10].TypeVal).PAT- 
> >get())) ||
>          !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
>        // Pull out the types of all of the arguments...
>        std::vector<const Type*> ParamTypes;
> +      FTySign.makeComposite((yyvsp[-10].TypeVal).S);
>        if ((yyvsp[-7].ValueList)) {
>          for (std::vector<ValueInfo>::iterator I = (yyvsp 
> [-7].ValueList)->begin(), E = (yyvsp[-7].ValueList)->end();
> -             I != E; ++I)
> +             I != E; ++I) {
>            ParamTypes.push_back((*I).V->getType());
> +          FTySign.add(I->S);
> +        }
>        }
>        FunctionType::ParamAttrsList ParamAttrs;
>        if ((yyvsp[-11].UIntVal) == OldCallingConv::CSRet) {
> @@ -5559,14 +5843,19 @@
>        if (isVarArg) ParamTypes.pop_back();
>        Ty = FunctionType::get((yyvsp[-10].TypeVal).PAT->get(),  
> ParamTypes, isVarArg, ParamAttrs);
>        PFTy = PointerType::get(Ty);
> +      (yyval.TermInstVal).S.copy((yyvsp[-10].TypeVal).S);
> +    } else {
> +      FTySign = (yyvsp[-10].TypeVal).S;
> +      (yyval.TermInstVal).S.copy((yyvsp[-10].TypeVal).S.get 
> (0)); // 0th element of FuncTy sign is result ty
>      }
> +    (yyvsp[-9].ValIDVal).S.makeComposite(FTySign);
>      Value *V = getVal(PFTy, (yyvsp[-9].ValIDVal));   // Get the  
> function we're calling...
>      BasicBlock *Normal = getBBVal((yyvsp[-3].ValIDVal));
>      BasicBlock *Except = getBBVal((yyvsp[0].ValIDVal));
>
>      // Create the call node...
>      if (!(yyvsp[-7].ValueList))  
> {                                   // Has no arguments?
> -      (yyval.TermInstVal) = new InvokeInst(V, Normal, Except, 0, 0);
> +      (yyval.TermInstVal).TI = new InvokeInst(V, Normal, Except,  
> 0, 0);
>      } else {                                     // Has arguments?
>        // Loop through FunctionType's arguments and ensure they are  
> specified
>        // correctly!
> @@ -5586,58 +5875,64 @@
>        if (I != E || (ArgI != ArgE && !Ty->isVarArg()))
>          error("Invalid number of parameters detected");
>
> -      (yyval.TermInstVal) = new InvokeInst(V, Normal, Except, &Args 
> [0], Args.size());
> +      (yyval.TermInstVal).TI = new InvokeInst(V, Normal, Except,  
> &Args[0], Args.size());
>      }
> -    cast<InvokeInst>((yyval.TermInstVal))->setCallingConv 
> (upgradeCallingConv((yyvsp[-11].UIntVal)));
> +    cast<InvokeInst>((yyval.TermInstVal).TI)->setCallingConv 
> (upgradeCallingConv((yyvsp[-11].UIntVal)));
>      delete (yyvsp[-10].TypeVal).PAT;
>      delete (yyvsp[-7].ValueList);
>    ;}
>      break;
>
>    case 267:
> -#line 3007 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3295 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> -    (yyval.TermInstVal) = new UnwindInst();
> +    (yyval.TermInstVal).TI = new UnwindInst();
> +    (yyval.TermInstVal).S.makeSignless();
>    ;}
>      break;
>
>    case 268:
> -#line 3010 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3299 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> -    (yyval.TermInstVal) = new UnreachableInst();
> +    (yyval.TermInstVal).TI = new UnreachableInst();
> +    (yyval.TermInstVal).S.makeSignless();
>    ;}
>      break;
>
>    case 269:
> -#line 3016 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3306 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.JumpTable) = (yyvsp[-5].JumpTable);
> +    (yyvsp[-3].ValIDVal).S.copy((yyvsp[-4].PrimType).S);
>      Constant *V = cast<Constant>(getExistingValue((yyvsp 
> [-4].PrimType).T, (yyvsp[-3].ValIDVal)));
>
>      if (V == 0)
>        error("May only switch on a constant pool value");
>
> +    (yyvsp[0].ValIDVal).S.makeSignless();
>      BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
>      (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
>    ;}
>      break;
>
>    case 270:
> -#line 3026 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3318 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.JumpTable) = new std::vector<std::pair<Constant*,  
> BasicBlock*> >();
> +    (yyvsp[-3].ValIDVal).S.copy((yyvsp[-4].PrimType).S);
>      Constant *V = cast<Constant>(getExistingValue((yyvsp 
> [-4].PrimType).T, (yyvsp[-3].ValIDVal)));
>
>      if (V == 0)
>        error("May only switch on a constant pool value");
>
> +    (yyvsp[0].ValIDVal).S.makeSignless();
>      BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
>      (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
>    ;}
>      break;
>
>    case 271:
> -#line 3039 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3333 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      bool omit = false;
>      if ((yyvsp[-1].StrVal))
> @@ -5659,9 +5954,10 @@
>            omit = true;
>      if (omit) {
>        (yyval.InstVal).I = 0;
> -      (yyval.InstVal).S = Signless;
> +      (yyval.InstVal).S.makeSignless();
>      } else {
> -      setValueName((yyvsp[0].InstVal).I, (yyvsp[-1].StrVal));
> +      ValueInfo VI; VI.V = (yyvsp[0].InstVal).I; VI.S.copy((yyvsp 
> [0].InstVal).S);
> +      setValueName(VI, (yyvsp[-1].StrVal));
>        InsertValue((yyvsp[0].InstVal).I);
>        (yyval.InstVal) = (yyvsp[0].InstVal);
>      }
> @@ -5669,11 +5965,13 @@
>      break;
>
>    case 272:
> -#line 3068 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3363 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {    // Used for PHI nodes
>      (yyval.PHIList).P = new std::list<std::pair<Value*,  
> BasicBlock*> >();
> -    (yyval.PHIList).S = (yyvsp[-5].TypeVal).S;
> +    (yyval.PHIList).S.copy((yyvsp[-5].TypeVal).S);
> +    (yyvsp[-3].ValIDVal).S.copy((yyvsp[-5].TypeVal).S);
>      Value* tmpVal = getVal((yyvsp[-5].TypeVal).PAT->get(), (yyvsp 
> [-3].ValIDVal));
> +    (yyvsp[-1].ValIDVal).S.makeSignless();
>      BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
>      (yyval.PHIList).P->push_back(std::make_pair(tmpVal, tmpBB));
>      delete (yyvsp[-5].TypeVal).PAT;
> @@ -5681,17 +5979,19 @@
>      break;
>
>    case 273:
> -#line 3076 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3373 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.PHIList) = (yyvsp[-6].PHIList);
> +    (yyvsp[-3].ValIDVal).S.copy((yyvsp[-6].PHIList).S);
>      Value* tmpVal = getVal((yyvsp[-6].PHIList).P->front().first- 
> >getType(), (yyvsp[-3].ValIDVal));
> +    (yyvsp[-1].ValIDVal).S.makeSignless();
>      BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
>      (yyvsp[-6].PHIList).P->push_back(std::make_pair(tmpVal, tmpBB));
>    ;}
>      break;
>
>    case 274:
> -#line 3084 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3383 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {    // Used for call statements, and memory insts...
>      (yyval.ValueList) = new std::vector<ValueInfo>();
>      (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
> @@ -5699,7 +5999,7 @@
>      break;
>
>    case 275:
> -#line 3088 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3387 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.ValueList) = (yyvsp[-2].ValueList);
>      (yyvsp[-2].ValueList)->push_back((yyvsp[0].ValueVal));
> @@ -5707,27 +6007,29 @@
>      break;
>
>    case 277:
> -#line 3096 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3395 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.ValueList) = 0; ;}
>      break;
>
>    case 278:
> -#line 3100 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3399 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.BoolVal) = true;
>    ;}
>      break;
>
>    case 279:
> -#line 3103 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3402 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.BoolVal) = false;
>    ;}
>      break;
>
>    case 280:
> -#line 3109 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3408 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> +    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
>      const Type* Ty = (yyvsp[-3].TypeVal).PAT->get();
>      if (!Ty->isInteger() && !Ty->isFloatingPoint() && ! 
> isa<VectorType>(Ty))
>        error("Arithmetic operator requires integer, FP, or packed  
> operands");
> @@ -5741,14 +6043,16 @@
>      (yyval.InstVal).I = BinaryOperator::create(Opcode, val1, val2);
>      if ((yyval.InstVal).I == 0)
>        error("binary operator returned null");
> -    (yyval.InstVal).S = (yyvsp[-3].TypeVal).S;
> +    (yyval.InstVal).S.copy((yyvsp[-3].TypeVal).S);
>      delete (yyvsp[-3].TypeVal).PAT;
>    ;}
>      break;
>
>    case 281:
> -#line 3126 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3427 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> +    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
>      const Type *Ty = (yyvsp[-3].TypeVal).PAT->get();
>      if (!Ty->isInteger()) {
>        if (!isa<VectorType>(Ty) ||
> @@ -5761,14 +6065,16 @@
>      (yyval.InstVal).I = BinaryOperator::create(Opcode, tmpVal1,  
> tmpVal2);
>      if ((yyval.InstVal).I == 0)
>        error("binary operator returned null");
> -    (yyval.InstVal).S = (yyvsp[-3].TypeVal).S;
> +    (yyval.InstVal).S.copy((yyvsp[-3].TypeVal).S);
>      delete (yyvsp[-3].TypeVal).PAT;
>    ;}
>      break;
>
>    case 282:
> -#line 3142 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3445 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> +    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
>      const Type* Ty = (yyvsp[-3].TypeVal).PAT->get();
>      if(isa<VectorType>(Ty))
>        error("VectorTypes currently not supported in setcc  
> instructions");
> @@ -5779,14 +6085,16 @@
>      (yyval.InstVal).I = CmpInst::create(Opcode, pred, tmpVal1,  
> tmpVal2);
>      if ((yyval.InstVal).I == 0)
>        error("binary operator returned null");
> -    (yyval.InstVal).S = Unsigned;
> +    (yyval.InstVal).S.makeUnsigned();
>      delete (yyvsp[-3].TypeVal).PAT;
>    ;}
>      break;
>
>    case 283:
> -#line 3156 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3461 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> +    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
>      const Type *Ty = (yyvsp[-3].TypeVal).PAT->get();
>      if (isa<VectorType>(Ty))
>        error("VectorTypes currently not supported in icmp  
> instructions");
> @@ -5795,14 +6103,16 @@
>      Value* tmpVal1 = getVal(Ty, (yyvsp[-2].ValIDVal));
>      Value* tmpVal2 = getVal(Ty, (yyvsp[0].ValIDVal));
>      (yyval.InstVal).I = new ICmpInst((yyvsp[-4].IPred), tmpVal1,  
> tmpVal2);
> -    (yyval.InstVal).S = Unsigned;
> +    (yyval.InstVal).S.makeUnsigned();
>      delete (yyvsp[-3].TypeVal).PAT;
>    ;}
>      break;
>
>    case 284:
> -#line 3168 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3475 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> +    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
>      const Type *Ty = (yyvsp[-3].TypeVal).PAT->get();
>      if (isa<VectorType>(Ty))
>        error("VectorTypes currently not supported in fcmp  
> instructions");
> @@ -5811,13 +6121,13 @@
>      Value* tmpVal1 = getVal(Ty, (yyvsp[-2].ValIDVal));
>      Value* tmpVal2 = getVal(Ty, (yyvsp[0].ValIDVal));
>      (yyval.InstVal).I = new FCmpInst((yyvsp[-4].FPred), tmpVal1,  
> tmpVal2);
> -    (yyval.InstVal).S = Unsigned;
> +    (yyval.InstVal).S.makeUnsigned();
>      delete (yyvsp[-3].TypeVal).PAT;
>    ;}
>      break;
>
>    case 285:
> -#line 3180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3489 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      warning("Use of obsolete 'not' instruction: Replacing with  
> 'xor");
>      const Type *Ty = (yyvsp[0].ValueVal).V->getType();
> @@ -5827,12 +6137,12 @@
>      (yyval.InstVal).I = BinaryOperator::create(Instruction::Xor,  
> (yyvsp[0].ValueVal).V, Ones);
>      if ((yyval.InstVal).I == 0)
>        error("Could not create a xor instruction");
> -    (yyval.InstVal).S = (yyvsp[0].ValueVal).S;
> +    (yyval.InstVal).S.copy((yyvsp[0].ValueVal).S);
>    ;}
>      break;
>
>    case 286:
> -#line 3191 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3500 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if (!(yyvsp[0].ValueVal).V->getType()->isInteger() ||
>          cast<IntegerType>((yyvsp[0].ValueVal).V->getType())- 
> >getBitWidth() != 8)
> @@ -5849,25 +6159,25 @@
>      else
>        ShiftAmt = (yyvsp[0].ValueVal).V;
>      (yyval.InstVal).I = BinaryOperator::create(getBinaryOp((yyvsp 
> [-3].BinaryOpVal), Ty, (yyvsp[-2].ValueVal).S), (yyvsp 
> [-2].ValueVal).V, ShiftAmt);
> -    (yyval.InstVal).S = (yyvsp[-2].ValueVal).S;
> +    (yyval.InstVal).S.copy((yyvsp[-2].ValueVal).S);
>    ;}
>      break;
>
>    case 287:
> -#line 3209 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3518 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *DstTy = (yyvsp[0].TypeVal).PAT->get();
>      if (!DstTy->isFirstClassType())
>        error("cast instruction to a non-primitive type: '" +
>              DstTy->getDescription() + "'");
>      (yyval.InstVal).I = cast<Instruction>(getCast((yyvsp 
> [-3].CastOpVal), (yyvsp[-2].ValueVal).V, (yyvsp[-2].ValueVal).S,  
> DstTy, (yyvsp[0].TypeVal).S, true));
> -    (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
> +    (yyval.InstVal).S.copy((yyvsp[0].TypeVal).S);
>      delete (yyvsp[0].TypeVal).PAT;
>    ;}
>      break;
>
>    case 288:
> -#line 3218 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3527 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if (!(yyvsp[-4].ValueVal).V->getType()->isInteger() ||
>          cast<IntegerType>((yyvsp[-4].ValueVal).V->getType())- 
> >getBitWidth() != 1)
> @@ -5875,23 +6185,23 @@
>      if ((yyvsp[-2].ValueVal).V->getType() != (yyvsp[0].ValueVal).V- 
> >getType())
>        error("select value types should match");
>      (yyval.InstVal).I = new SelectInst((yyvsp[-4].ValueVal).V,  
> (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V);
> -    (yyval.InstVal).S = (yyvsp[-4].ValueVal).S;
> +    (yyval.InstVal).S.copy((yyvsp[-2].ValueVal).S);
>    ;}
>      break;
>
>    case 289:
> -#line 3227 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3536 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
>      NewVarArgs = true;
>      (yyval.InstVal).I = new VAArgInst((yyvsp[-2].ValueVal).V, Ty);
> -    (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
> +    (yyval.InstVal).S.copy((yyvsp[0].TypeVal).S);
>      delete (yyvsp[0].TypeVal).PAT;
>    ;}
>      break;
>
>    case 290:
> -#line 3234 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3543 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type* ArgTy = (yyvsp[-2].ValueVal).V->getType();
>      const Type* DstTy = (yyvsp[0].TypeVal).PAT->get();
> @@ -5910,13 +6220,13 @@
>      CurBB->getInstList().push_back(bar);
>      CurBB->getInstList().push_back(new StoreInst(bar, foo));
>      (yyval.InstVal).I = new VAArgInst(foo, DstTy);
> -    (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
> +    (yyval.InstVal).S.copy((yyvsp[0].TypeVal).S);
>      delete (yyvsp[0].TypeVal).PAT;
>    ;}
>      break;
>
>    case 291:
> -#line 3255 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3564 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type* ArgTy = (yyvsp[-2].ValueVal).V->getType();
>      const Type* DstTy = (yyvsp[0].TypeVal).PAT->get();
> @@ -5938,43 +6248,43 @@
>      Instruction* tmp = new VAArgInst(foo, DstTy);
>      CurBB->getInstList().push_back(tmp);
>      (yyval.InstVal).I = new LoadInst(foo);
> -    (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
> +    (yyval.InstVal).S.copy((yyvsp[0].TypeVal).S);
>      delete (yyvsp[0].TypeVal).PAT;
>    ;}
>      break;
>
>    case 292:
> -#line 3279 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3588 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if (!ExtractElementInst::isValidOperands((yyvsp 
> [-2].ValueVal).V, (yyvsp[0].ValueVal).V))
>        error("Invalid extractelement operands");
>      (yyval.InstVal).I = new ExtractElementInst((yyvsp 
> [-2].ValueVal).V, (yyvsp[0].ValueVal).V);
> -    (yyval.InstVal).S = (yyvsp[-2].ValueVal).S;
> +    (yyval.InstVal).S.copy((yyvsp[-2].ValueVal).S.get(0));
>    ;}
>      break;
>
>    case 293:
> -#line 3285 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3594 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if (!InsertElementInst::isValidOperands((yyvsp 
> [-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
>        error("Invalid insertelement operands");
>      (yyval.InstVal).I = new InsertElementInst((yyvsp 
> [-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V);
> -    (yyval.InstVal).S = (yyvsp[-4].ValueVal).S;
> +    (yyval.InstVal).S.copy((yyvsp[-4].ValueVal).S);
>    ;}
>      break;
>
>    case 294:
> -#line 3291 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3600 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      if (!ShuffleVectorInst::isValidOperands((yyvsp 
> [-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
>        error("Invalid shufflevector operands");
>      (yyval.InstVal).I = new ShuffleVectorInst((yyvsp 
> [-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V);
> -    (yyval.InstVal).S = (yyvsp[-4].ValueVal).S;
> +    (yyval.InstVal).S.copy((yyvsp[-4].ValueVal).S);
>    ;}
>      break;
>
>    case 295:
> -#line 3297 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3606 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *Ty = (yyvsp[0].PHIList).P->front().first->getType();
>      if (!Ty->isFirstClassType())
> @@ -5988,26 +6298,29 @@
>        (yyvsp[0].PHIList).P->pop_front();
>      }
>      (yyval.InstVal).I = PHI;
> -    (yyval.InstVal).S = (yyvsp[0].PHIList).S;
> +    (yyval.InstVal).S.copy((yyvsp[0].PHIList).S);
>      delete (yyvsp[0].PHIList).P;  // Free the list...
>    ;}
>      break;
>
>    case 296:
> -#line 3313 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3622 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> -
>      // Handle the short call syntax
>      const PointerType *PFTy;
>      const FunctionType *FTy;
> +    Signedness FTySign;
>      if (!(PFTy = dyn_cast<PointerType>((yyvsp[-4].TypeVal).PAT->get 
> ())) ||
>          !(FTy = dyn_cast<FunctionType>(PFTy->getElementType()))) {
>        // Pull out the types of all of the arguments...
>        std::vector<const Type*> ParamTypes;
> +      FTySign.makeComposite((yyvsp[-4].TypeVal).S);
>        if ((yyvsp[-1].ValueList)) {
>          for (std::vector<ValueInfo>::iterator I = (yyvsp 
> [-1].ValueList)->begin(), E = (yyvsp[-1].ValueList)->end();
> -             I != E; ++I)
> +             I != E; ++I) {
>            ParamTypes.push_back((*I).V->getType());
> +          FTySign.add(I->S);
> +        }
>        }
>
>        FunctionType::ParamAttrsList ParamAttrs;
> @@ -6024,7 +6337,12 @@
>
>        FTy = FunctionType::get(RetTy, ParamTypes, isVarArg,  
> ParamAttrs);
>        PFTy = PointerType::get(FTy);
> +      (yyval.InstVal).S.copy((yyvsp[-4].TypeVal).S);
> +    } else {
> +      FTySign = (yyvsp[-4].TypeVal).S;
> +      (yyval.InstVal).S.copy((yyvsp[-4].TypeVal).S.get(0)); // 0th  
> element of FuncTy signedness is result sign
>      }
> +    (yyvsp[-3].ValIDVal).S.makeComposite(FTySign);
>
>      // First upgrade any intrinsic calls.
>      std::vector<Value*> Args;
> @@ -6036,7 +6354,6 @@
>      // If we got an upgraded intrinsic
>      if (Inst) {
>        (yyval.InstVal).I = Inst;
> -      (yyval.InstVal).S = Signless;
>      } else {
>        // Get the function we're calling
>        Value *V = getVal(PFTy, (yyvsp[-3].ValIDVal));
> @@ -6068,7 +6385,6 @@
>        CI->setTailCall((yyvsp[-6].BoolVal));
>        CI->setCallingConv(upgradeCallingConv((yyvsp[-5].UIntVal)));
>        (yyval.InstVal).I = CI;
> -      (yyval.InstVal).S = (yyvsp[-4].TypeVal).S;
>      }
>      delete (yyvsp[-4].TypeVal).PAT;
>      delete (yyvsp[-1].ValueList);
> @@ -6076,88 +6392,90 @@
>      break;
>
>    case 297:
> -#line 3391 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3706 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      (yyval.InstVal) = (yyvsp[0].InstVal);
>    ;}
>      break;
>
>    case 298:
> -#line 3399 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3714 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.ValueList) = (yyvsp[0].ValueList); ;}
>      break;
>
>    case 299:
> -#line 3400 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3715 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.ValueList) = new std::vector<ValueInfo>(); ;}
>      break;
>
>    case 300:
> -#line 3404 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3719 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.BoolVal) = true; ;}
>      break;
>
>    case 301:
> -#line 3405 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3720 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      { (yyval.BoolVal) = false; ;}
>      break;
>
>    case 302:
> -#line 3409 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3724 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
> -    (yyval.InstVal).S = (yyvsp[-1].TypeVal).S;
> +    (yyval.InstVal).S.makeComposite((yyvsp[-1].TypeVal).S);
>      (yyval.InstVal).I = new MallocInst(Ty, 0, (yyvsp[0].UIntVal));
>      delete (yyvsp[-1].TypeVal).PAT;
>    ;}
>      break;
>
>    case 303:
> -#line 3415 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3730 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *Ty = (yyvsp[-4].TypeVal).PAT->get();
> -    (yyval.InstVal).S = (yyvsp[-4].TypeVal).S;
> +    (yyvsp[-1].ValIDVal).S.makeUnsigned();
> +    (yyval.InstVal).S.makeComposite((yyvsp[-4].TypeVal).S);
>      (yyval.InstVal).I = new MallocInst(Ty, getVal((yyvsp 
> [-2].PrimType).T, (yyvsp[-1].ValIDVal)), (yyvsp[0].UIntVal));
>      delete (yyvsp[-4].TypeVal).PAT;
>    ;}
>      break;
>
>    case 304:
> -#line 3421 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3737 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
> -    (yyval.InstVal).S = (yyvsp[-1].TypeVal).S;
> +    (yyval.InstVal).S.makeComposite((yyvsp[-1].TypeVal).S);
>      (yyval.InstVal).I = new AllocaInst(Ty, 0, (yyvsp[0].UIntVal));
>      delete (yyvsp[-1].TypeVal).PAT;
>    ;}
>      break;
>
>    case 305:
> -#line 3427 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3743 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *Ty = (yyvsp[-4].TypeVal).PAT->get();
> -    (yyval.InstVal).S = (yyvsp[-4].TypeVal).S;
> +    (yyvsp[-1].ValIDVal).S.makeUnsigned();
> +    (yyval.InstVal).S.makeComposite((yyvsp[-2].PrimType).S);
>      (yyval.InstVal).I = new AllocaInst(Ty, getVal((yyvsp 
> [-2].PrimType).T, (yyvsp[-1].ValIDVal)), (yyvsp[0].UIntVal));
>      delete (yyvsp[-4].TypeVal).PAT;
>    ;}
>      break;
>
>    case 306:
> -#line 3433 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3750 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type *PTy = (yyvsp[0].ValueVal).V->getType();
>      if (!isa<PointerType>(PTy))
>        error("Trying to free nonpointer type '" + PTy- 
> >getDescription() + "'");
>      (yyval.InstVal).I = new FreeInst((yyvsp[0].ValueVal).V);
> -    (yyval.InstVal).S = Signless;
> +    (yyval.InstVal).S.makeSignless();
>    ;}
>      break;
>
>    case 307:
> -#line 3440 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3757 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
>      const Type* Ty = (yyvsp[-1].TypeVal).PAT->get();
> -    (yyval.InstVal).S = (yyvsp[-1].TypeVal).S;
> +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
>      if (!isa<PointerType>(Ty))
>        error("Can't load from nonpointer type: " + Ty- 
> >getDescription());
>      if (!cast<PointerType>(Ty)->getElementType()->isFirstClassType())
> @@ -6165,13 +6483,15 @@
>                       Ty->getDescription());
>      Value* tmpVal = getVal(Ty, (yyvsp[0].ValIDVal));
>      (yyval.InstVal).I = new LoadInst(tmpVal, "", (yyvsp 
> [-3].BoolVal));
> +    (yyval.InstVal).S.copy((yyvsp[-1].TypeVal).S.get(0));
>      delete (yyvsp[-1].TypeVal).PAT;
>    ;}
>      break;
>
>    case 308:
> -#line 3452 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3770 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
>      const PointerType *PTy = dyn_cast<PointerType>((yyvsp 
> [-1].TypeVal).PAT->get());
>      if (!PTy)
>        error("Can't store to a nonpointer type: " +
> @@ -6193,14 +6513,15 @@
>        }
>      }
>      (yyval.InstVal).I = new StoreInst(StoreVal, tmpVal, (yyvsp 
> [-5].BoolVal));
> -    (yyval.InstVal).S = Signless;
> +    (yyval.InstVal).S.makeSignless();
>      delete (yyvsp[-1].TypeVal).PAT;
>    ;}
>      break;
>
>    case 309:
> -#line 3477 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3796 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>      {
> +    (yyvsp[-1].ValIDVal).S.copy((yyvsp[-2].TypeVal).S);
>      const Type* Ty = (yyvsp[-2].TypeVal).PAT->get();
>      if (!isa<PointerType>(Ty))
>        error("getelementptr insn requires pointer operand");
> @@ -6210,7 +6531,8 @@
>
>      Value* tmpVal = getVal(Ty, (yyvsp[-1].ValIDVal));
>      (yyval.InstVal).I = new GetElementPtrInst(tmpVal, &VIndices 
> [0], VIndices.size());
> -    (yyval.InstVal).S = Signless;
> +    ValueInfo VI; VI.V = tmpVal; VI.S.copy((yyvsp[-2].TypeVal).S);
> +    (yyval.InstVal).S.copy(getElementSign(VI, VIndices));
>      delete (yyvsp[-2].TypeVal).PAT;
>      delete (yyvsp[0].ValueList);
>    ;}
> @@ -6221,7 +6543,7 @@
>      }
>
>  /* Line 1126 of yacc.c.  */
> -#line 6225 "UpgradeParser.tab.c"
> +#line 6547 "UpgradeParser.tab.c"
>  
>    yyvsp -= yylen;
>    yyssp -= yylen;
> @@ -6489,7 +6811,7 @@
>  }
>
>
> -#line 3493 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 3814 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>
>
>  int yyerror(const char *ErrorMsg) {
>
>
> Index: llvm/tools/llvm-upgrade/UpgradeParser.h.cvs
> diff -u llvm/tools/llvm-upgrade/UpgradeParser.h.cvs:1.50 llvm/tools/ 
> llvm-upgrade/UpgradeParser.h.cvs:1.51
> --- llvm/tools/llvm-upgrade/UpgradeParser.h.cvs:1.50	Wed Mar 14  
> 22:26:42 2007
> +++ llvm/tools/llvm-upgrade/UpgradeParser.h.cvs	Wed Mar 21 12:15:50  
> 2007
> @@ -335,13 +335,13 @@
>
>
>  #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
> -#line 1454 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> +#line 1693 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
>  typedef union YYSTYPE {
>    llvm::Module                           *ModuleVal;
>    llvm::Function                         *FunctionVal;
>    std::pair<llvm::PATypeInfo, char*>     *ArgVal;
>    llvm::BasicBlock                       *BasicBlockVal;
> -  llvm::TerminatorInst                   *TermInstVal;
> +  llvm::TermInstInfo                     TermInstVal;
>    llvm::InstrInfo                        InstVal;
>    llvm::ConstInfo                        ConstVal;
>    llvm::ValueInfo                        ValueVal;
>
>
> Index: llvm/tools/llvm-upgrade/UpgradeParser.y.cvs
> diff -u llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.65 llvm/tools/ 
> llvm-upgrade/UpgradeParser.y.cvs:1.66
> --- llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.65	Wed Mar 14  
> 22:26:42 2007
> +++ llvm/tools/llvm-upgrade/UpgradeParser.y.cvs	Wed Mar 21 12:15:50  
> 2007
> @@ -67,7 +67,7 @@
>  //
>  typedef std::vector<Value *> ValueList;           // Numbered defs
>
> -typedef std::pair<std::string,const Type*> RenameMapKey;
> +typedef std::pair<std::string,TypeInfo> RenameMapKey;
>  typedef std::map<RenameMapKey,std::string> RenameMapType;
>
>  static void
> @@ -78,7 +78,10 @@
>    Module *CurrentModule;
>    std::map<const Type *, ValueList> Values; // Module level  
> numbered definitions
>    std::map<const Type *,ValueList> LateResolveValues;
> -  std::vector<PATypeHolder>    Types;
> +  std::vector<PATypeHolder> Types;
> +  std::vector<Signedness> TypeSigns;
> +  std::map<std::string,Signedness> NamedTypeSigns;
> +  std::map<std::string,Signedness> NamedValueSigns;
>    std::map<ValID, PATypeHolder> LateResolveTypes;
>    static Module::Endianness Endian;
>    static Module::PointerSize PointerSize;
> @@ -135,6 +138,9 @@
>
>      Values.clear();         // Clear out function local definitions
>      Types.clear();
> +    TypeSigns.clear();
> +    NamedTypeSigns.clear();
> +    NamedValueSigns.clear();
>      CurrentModule = 0;
>    }
>
> @@ -208,6 +214,24 @@
>
>  static bool inFunctionScope() { return CurFun.CurrentFunction != 0; }
>
> +/// This function is just a utility to make a Key value for the  
> rename map.
> +/// The Key is a combination of the name, type, Signedness of the  
> original
> +/// value (global/function). This just constructs the key and  
> ensures that
> +/// named Signedness values are resolved to the actual Signedness.
> +/// @brief Make a key for the RenameMaps
> +static RenameMapKey makeRenameMapKey(const std::string &Name,  
> const Type* Ty,
> +                                     const Signedness &Sign) {
> +  TypeInfo TI;
> +  TI.T = Ty;
> +  if (Sign.isNamed())
> +    // Don't allow Named Signedness nodes because they won't  
> match. The actual
> +    // Signedness must be looked up in the NamedTypeSigns map.
> +    TI.S.copy(CurModule.NamedTypeSigns[Sign.getName()]);
> +  else
> +    TI.S.copy(Sign);
> +  return std::make_pair(Name, TI);
> +}
> +
>
>  // 
> ===------------------------------------------------------------------- 
> ---===//
>  //               Code to handle definitions of all the types
> @@ -233,7 +257,6 @@
>      break;
>    case ValID::NameVal:                 // Is it a named definition?
>      if (const Type *N = CurModule.CurrentModule->getTypeByName 
> (D.Name)) {
> -      D.destroy();  // Free old strdup'd memory...
>        return N;
>      }
>      break;
> @@ -248,7 +271,6 @@
>    //
>    if (DoNotImprovise) return 0;  // Do we just want a null to be  
> returned?
>
> -
>    if (inFunctionScope()) {
>      if (D.Type == ValID::NameVal) {
>        error("Reference to an undefined type: '" + D.getName() + "'");
> @@ -266,13 +288,94 @@
>    Type *Typ = OpaqueType::get();
>    CurModule.LateResolveTypes.insert(std::make_pair(D, Typ));
>    return Typ;
> - }
> +}
> +
> +/// This is like the getType method except that instead of looking  
> up the type
> +/// for a given ID, it looks up that type's sign.
> +/// @brief Get the signedness of a referenced type
> +static Signedness getTypeSign(const ValID &D) {
> +  switch (D.Type) {
> +  case ValID::NumberVal:               // Is it a numbered  
> definition?
> +    // Module constants occupy the lowest numbered slots...
> +    if ((unsigned)D.Num < CurModule.TypeSigns.size()) {
> +      return CurModule.TypeSigns[(unsigned)D.Num];
> +    }
> +    break;
> +  case ValID::NameVal: {               // Is it a named definition?
> +    std::map<std::string,Signedness>::const_iterator I =
> +      CurModule.NamedTypeSigns.find(D.Name);
> +    if (I != CurModule.NamedTypeSigns.end())
> +      return I->second;
> +    // Perhaps its a named forward .. just cache the name
> +    Signedness S;
> +    S.makeNamed(D.Name);
> +    return S;
> +  }
> +  default:
> +    break;
> +  }
> +  // If we don't find it, its signless
> +  Signedness S;
> +  S.makeSignless();
> +  return S;
> +}
> +
> +/// This function is analagous to getElementType in LLVM. It  
> provides the same
> +/// function except that it looks up the Signedness instead of the  
> type. This is
> +/// used when processing GEP instructions that need to extract the  
> type of an
> +/// indexed struct/array/ptr member.
> +/// @brief Look up an element's sign.
> +static Signedness getElementSign(const ValueInfo& VI,
> +                                 const std::vector<Value*>  
> &Indices) {
> +  const Type *Ptr = VI.V->getType();
> +  assert(isa<PointerType>(Ptr) && "Need pointer type");
> +
> +  unsigned CurIdx = 0;
> +  Signedness S(VI.S);
> +  while (const CompositeType *CT = dyn_cast<CompositeType>(Ptr)) {
> +    if (CurIdx == Indices.size())
> +      break;
> +
> +    Value *Index = Indices[CurIdx++];
> +    assert(!isa<PointerType>(CT) || CurIdx == 1 && "Invalid type");
> +    Ptr = CT->getTypeAtIndex(Index);
> +    if (const Type* Ty = Ptr->getForwardedType())
> +      Ptr = Ty;
> +    assert(S.isComposite() && "Bad Signedness type");
> +    if (isa<StructType>(CT)) {
> +      S = S.get(cast<ConstantInt>(Index)->getZExtValue());
> +    } else {
> +      S = S.get(0UL);
> +    }
> +    if (S.isNamed())
> +      S = CurModule.NamedTypeSigns[S.getName()];
> +  }
> +  Signedness Result;
> +  Result.makeComposite(S);
> +  return Result;
> +}
> +
> +/// This function just translates a ConstantInfo into a ValueInfo  
> and calls
> +/// getElementSign(ValueInfo,...). Its just a convenience.
> +/// @brief ConstantInfo version of getElementSign.
> +static Signedness getElementSign(const ConstInfo& CI,
> +                                 const std::vector<Constant*>  
> &Indices) {
> +  ValueInfo VI;
> +  VI.V = CI.C;
> +  VI.S.copy(CI.S);
> +  std::vector<Value*> Idx;
> +  for (unsigned i = 0; i < Indices.size(); ++i)
> +    Idx.push_back(Indices[i]);
> +  Signedness result = getElementSign(VI, Idx);
> +  VI.destroy();
> +  return result;
> +}
>
>  /// This function determines if two function types differ only in  
> their use of
>  /// the sret parameter attribute in the first argument. If they  
> are identical
>  /// in all other respects, it returns true. Otherwise, it returns  
> false.
> -bool FuncTysDifferOnlyBySRet(const FunctionType *F1,
> -                                   const FunctionType *F2) {
> +static bool FuncTysDifferOnlyBySRet(const FunctionType *F1,
> +                                    const FunctionType *F2) {
>    if (F1->getReturnType() != F2->getReturnType() ||
>        F1->getNumParams() != F2->getNumParams() ||
>        F1->getParamAttrs(0) != F2->getParamAttrs(0))
> @@ -287,10 +390,27 @@
>    return true;
>  }
>
> +/// This function determines if the type of V and Ty differ only  
> by the SRet
> +/// parameter attribute. This is a more generalized case of
> +/// FuncTysDIfferOnlyBySRet since it doesn't require FunctionType  
> arguments.
> +static bool TypesDifferOnlyBySRet(Value *V, const Type* Ty) {
> +  if (V->getType() == Ty)
> +    return true;
> +  const PointerType *PF1 = dyn_cast<PointerType>(Ty);
> +  const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
> +  if (PF1 && PF2) {
> +    const FunctionType* FT1 = dyn_cast<FunctionType>(PF1- 
> >getElementType());
> +    const FunctionType* FT2 = dyn_cast<FunctionType>(PF2- 
> >getElementType());
> +    if (FT1 && FT2)
> +      return FuncTysDifferOnlyBySRet(FT1, FT2);
> +  }
> +  return false;
> +}
> +
>  // The upgrade of csretcc to sret param attribute may have caused  
> a function
>  // to not be found because the param attribute changed the type of  
> the called
>  // function. This helper function, used in getExistingValue,  
> detects that
> -// situation and returns V if it occurs and 0 otherwise.
> +// situation and bitcasts the function to the correct type.
>  static Value* handleSRetFuncTypeMerge(Value *V, const Type* Ty) {
>    // Handle degenerate cases
>    if (!V)
> @@ -298,23 +418,21 @@
>    if (V->getType() == Ty)
>      return V;
>
> -  Value* Result = 0;
>    const PointerType *PF1 = dyn_cast<PointerType>(Ty);
>    const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
>    if (PF1 && PF2) {
> -    const FunctionType *FT1 =
> -      dyn_cast<FunctionType>(PF1->getElementType());
> -    const FunctionType *FT2 =
> -      dyn_cast<FunctionType>(PF2->getElementType());
> +    const FunctionType *FT1 = dyn_cast<FunctionType>(PF1- 
> >getElementType());
> +    const FunctionType *FT2 = dyn_cast<FunctionType>(PF2- 
> >getElementType());
>      if (FT1 && FT2 && FuncTysDifferOnlyBySRet(FT1, FT2))
>        if (FT2->paramHasAttr(1, FunctionType::StructRetAttribute))
> -        Result = V;
> +        return V;
>        else if (Constant *C = dyn_cast<Constant>(V))
> -        Result = ConstantExpr::getBitCast(C, PF1);
> +        return ConstantExpr::getBitCast(C, PF1);
>        else
> -        Result = new BitCastInst(V, PF1, "upgrd.cast", CurBB);
> +        return new BitCastInst(V, PF1, "upgrd.cast", CurBB);
> +
>    }
> -  return Result;
> +  return 0;
>  }
>
>  // getExistingValue - Look up the value specified by the provided  
> type and
> @@ -350,9 +468,8 @@
>
>    case ValID::NameVal: {                // Is it a named definition?
>      // Get the name out of the ID
> -    std::string Name(D.Name);
> -    Value* V = 0;
> -    RenameMapKey Key = std::make_pair(Name, Ty);
> +    RenameMapKey Key = makeRenameMapKey(D.Name, Ty, D.S);
> +    Value *V = 0;
>      if (inFunctionScope()) {
>        // See if the name was renamed
>        RenameMapType::const_iterator I = CurFun.RenameMap.find(Key);
> @@ -360,10 +477,12 @@
>        if (I != CurFun.RenameMap.end())
>          LookupName = I->second;
>        else
> -        LookupName = Name;
> +        LookupName = D.Name;
>        ValueSymbolTable &SymTab = CurFun.CurrentFunction- 
> >getValueSymbolTable();
>        V = SymTab.lookup(LookupName);
> -      V = handleSRetFuncTypeMerge(V, Ty);
> +      if (V && V->getType() != Ty)
> +        V = handleSRetFuncTypeMerge(V, Ty);
> +      assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong  
> type");
>      }
>      if (!V) {
>        RenameMapType::const_iterator I = CurModule.RenameMap.find 
> (Key);
> @@ -371,9 +490,11 @@
>        if (I != CurModule.RenameMap.end())
>          LookupName = I->second;
>        else
> -        LookupName = Name;
> +        LookupName = D.Name;
>        V = CurModule.CurrentModule->getValueSymbolTable().lookup 
> (LookupName);
> -      V = handleSRetFuncTypeMerge(V, Ty);
> +      if (V && V->getType() != Ty)
> +        V = handleSRetFuncTypeMerge(V, Ty);
> +      assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong  
> type");
>      }
>      if (!V)
>        return 0;
> @@ -506,14 +627,13 @@
>      break;
>    case ValID::NameVal:                  // Is it a named definition?
>      Name = ID.Name;
> -    if (Value *N = CurFun.CurrentFunction->
> -                   getValueSymbolTable().lookup(Name)) {
> +    if (Value *N = CurFun.CurrentFunction->getValueSymbolTable 
> ().lookup(Name)) {
>        if (N->getType() != Type::LabelTy) {
>          // Register names didn't use to conflict with basic block  
> names
>          // because of type planes. Now they all have to be unique.  
> So, we just
>          // rename the register and treat this name as if no basic  
> block
>          // had been found.
> -        RenameMapKey Key = std::make_pair(N->getName(),N->getType());
> +        RenameMapKey Key = makeRenameMapKey(ID.Name, N->getType(),  
> ID.S);
>          N->setName(makeNameUnique(N->getName()));
>          CurModule.RenameMap[Key] = N->getName();
>          BB = 0;
> @@ -624,19 +744,33 @@
>    LateResolvers.clear();
>  }
>
> -// ResolveTypeTo - A brand new type was just declared.  This means  
> that (if
> -// name is not null) things referencing Name can be resolved.   
> Otherwise, things
> -// refering to the number can be resolved.  Do this now.
> -//
> -static void ResolveTypeTo(char *Name, const Type *ToTy) {
> +/// This function is used for type resolution and upref handling.  
> When a type
> +/// becomes concrete, this function is called to adjust the  
> signedness for the
> +/// concrete type.
> +static void ResolveTypeSign(const Type* oldTy, const Signedness  
> &Sign) {
> +  std::string TyName = CurModule.CurrentModule->getTypeName(oldTy);
> +  if (!TyName.empty())
> +    CurModule.NamedTypeSigns[TyName] = Sign;
> +}
> +
> +/// ResolveTypeTo - A brand new type was just declared.  This  
> means that (if
> +/// name is not null) things referencing Name can be resolved.   
> Otherwise,
> +/// things refering to the number can be resolved.  Do this now.
> +static void ResolveTypeTo(char *Name, const Type *ToTy, const  
> Signedness& Sign){
>    ValID D;
> -  if (Name) D = ValID::create(Name);
> -  else      D = ValID::create((int)CurModule.Types.size());
> +  if (Name)
> +    D = ValID::create(Name);
> +  else
> +    D = ValID::create((int)CurModule.Types.size());
> +  D.S.copy(Sign);
> +
> +  CurModule.NamedTypeSigns[Name] = Sign;
>
>    std::map<ValID, PATypeHolder>::iterator I =
>      CurModule.LateResolveTypes.find(D);
>    if (I != CurModule.LateResolveTypes.end()) {
> -    ((DerivedType*)I->second.get())->refineAbstractTypeTo(ToTy);
> +    const Type *OldTy = I->second.get();
> +    ((DerivedType*)OldTy)->refineAbstractTypeTo(ToTy);
>      CurModule.LateResolveTypes.erase(I);
>    }
>  }
> @@ -696,12 +830,12 @@
>  // null potentially, in which case this is a noop.  The string  
> passed in is
>  // assumed to be a malloc'd string buffer, and is free'd by this  
> function.
>  //
> -static void setValueName(Value *V, char *NameStr) {
> +static void setValueName(const ValueInfo &V, char *NameStr) {
>    if (NameStr) {
>      std::string Name(NameStr);      // Copy string
>      free(NameStr);                  // Free old string
>
> -    if (V->getType() == Type::VoidTy) {
> +    if (V.V->getType() == Type::VoidTy) {
>        error("Can't assign name '" + Name + "' to value with void  
> type");
>        return;
>      }
> @@ -714,13 +848,13 @@
>      if (Existing) {
>        // An existing value of the same name was found. This might  
> have happened
>        // because of the integer type planes collapsing in LLVM 2.0.
> -      if (Existing->getType() == V->getType() &&
> +      if (Existing->getType() == V.V->getType() &&
>            !TypeHasInteger(Existing->getType())) {
>          // If the type does not contain any integers in them then  
> this can't be
>          // a type plane collapsing issue. It truly is a  
> redefinition and we
>          // should error out as the assembly is invalid.
>          error("Redefinition of value named '" + Name + "' of type  
> '" +
> -              V->getType()->getDescription() + "'");
> +              V.V->getType()->getDescription() + "'");
>          return;
>        }
>        // In LLVM 2.0 we don't allow names to be re-used for any  
> values in a
> @@ -734,13 +868,13 @@
>        // We're changing the name but it will probably be used by  
> other
>        // instructions as operands later on. Consequently we have  
> to retain
>        // a mapping of the renaming that we're doing.
> -      RenameMapKey Key = std::make_pair(Name,V->getType());
> +      RenameMapKey Key = makeRenameMapKey(Name, V.V->getType(), V.S);
>        CurFun.RenameMap[Key] = NewName;
>        Name = NewName;
>      }
>
>      // Set the name.
> -    V->setName(Name);
> +    V.V->setName(Name);
>    }
>  }
>
> @@ -749,7 +883,8 @@
>  static GlobalVariable *
>  ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage,
>                      bool isConstantGlobal, const Type *Ty,
> -                    Constant *Initializer) {
> +                    Constant *Initializer,
> +                    const Signedness &Sign) {
>    if (isa<FunctionType>(Ty))
>      error("Cannot declare global vars of function type");
>
> @@ -769,6 +904,7 @@
>    } else {
>      ID = ValID::create((int)CurModule.Values[PTy].size());
>    }
> +  ID.S.makeComposite(Sign);
>
>    if (GlobalValue *FWGV = CurModule.GetForwardRefForGlobal(PTy,  
> ID)) {
>      // Move the global to the end of the list, from whereever it was
> @@ -794,13 +930,7 @@
>        // There is alread a global of the same name which means  
> there is a
>        // conflict. Let's see what we can do about it.
>        std::string NewName(makeNameUnique(Name));
> -      if (Linkage == GlobalValue::InternalLinkage) {
> -        // The linkage type is internal so just warn about the  
> rename without
> -        // invoking "scarey language" about linkage failures.  
> GVars with
> -        // InternalLinkage can be renamed at will.
> -        warning("Global variable '" + Name + "' was renamed to '"+
> -                NewName + "'");
> -      } else {
> +      if (Linkage != GlobalValue::InternalLinkage) {
>          // The linkage of this gval is external so we can't  
> reliably rename
>          // it because it could potentially create a linking problem.
>          // However, we can't leave the name conflict in the output  
> either or
> @@ -811,7 +941,7 @@
>        }
>
>        // Put the renaming in the global rename map
> -      RenameMapKey Key = std::make_pair(Name,PointerType::get(Ty));
> +      RenameMapKey Key = makeRenameMapKey(Name, PointerType::get 
> (Ty), ID.S);
>        CurModule.RenameMap[Key] = NewName;
>
>        // Rename it
> @@ -824,6 +954,8 @@
>      new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer,  
> Name,
>                         CurModule.CurrentModule);
>    InsertValue(GV, CurModule.Values);
> +  // Remember the sign of this global.
> +  CurModule.NamedValueSigns[Name] = ID.S;
>    return GV;
>  }
>
> @@ -834,21 +966,26 @@
>  // This function returns true if the type has already been  
> defined, but is
>  // allowed to be redefined in the specified context.  If the name  
> is a new name
>  // for the type plane, it is inserted and false is returned.
> -static bool setTypeName(const Type *T, char *NameStr) {
> +static bool setTypeName(const PATypeInfo& TI, char *NameStr) {
>    assert(!inFunctionScope() && "Can't give types function-local  
> names");
>    if (NameStr == 0) return false;
>
>    std::string Name(NameStr);      // Copy string
>    free(NameStr);                  // Free old string
>
> +  const Type* Ty = TI.PAT->get();
> +
>    // We don't allow assigning names to void type
> -  if (T == Type::VoidTy) {
> +  if (Ty == Type::VoidTy) {
>      error("Can't assign name '" + Name + "' to the void type");
>      return false;
>    }
>
>    // Set the type name, checking for conflicts as we do so.
> -  bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name, T);
> +  bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name,  
> Ty);
> +
> +  // Save the sign information for later use
> +  CurModule.NamedTypeSigns[Name] = TI.S;
>
>    if (AlreadyExists) {   // Inserting a name that is already  
> defined???
>      const Type *Existing = CurModule.CurrentModule->getTypeByName 
> (Name);
> @@ -858,7 +995,7 @@
>      // opaque type.  In this case, Existing will be an opaque type.
>      if (const OpaqueType *OpTy = dyn_cast<OpaqueType>(Existing)) {
>        // We ARE replacing an opaque type!
> -      const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(T);
> +      const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(Ty);
>        return true;
>      }
>
> @@ -866,11 +1003,11 @@
>      // the redefinition is identical to the original. This will be  
> so if
>      // Existing and T point to the same Type object. In this one  
> case we
>      // allow the equivalent redefinition.
> -    if (Existing == T) return true;  // Yes, it's equal.
> +    if (Existing == Ty) return true;  // Yes, it's equal.
>
>      // Any other kind of (non-equivalent) redefinition is an error.
>      error("Redefinition of type named '" + Name + "' in the '" +
> -          T->getDescription() + "' type plane");
> +          Ty->getDescription() + "' type plane");
>    }
>
>    return false;
> @@ -902,7 +1039,7 @@
>      OpaqueType *UpRefTy;
>
>      UpRefRecord(unsigned NL, OpaqueType *URTy)
> -      : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) {}
> +      : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) { }
>    };
>  }
>
> @@ -916,7 +1053,7 @@
>  /// count reaches zero, the upreferenced type is the type that is  
> passed in:
>  /// thus we can complete the cycle.
>  ///
> -static PATypeHolder HandleUpRefs(const Type *ty) {
> +static PATypeHolder HandleUpRefs(const Type *ty, const Signedness&  
> Sign) {
>    // If Ty isn't abstract, or if there are no up-references in it,  
> then there is
>    // nothing to resolve here.
>    if (!ty->isAbstract() || UpRefs.empty()) return ty;
> @@ -932,10 +1069,11 @@
>    // this variable.
>    OpaqueType *TypeToResolve = 0;
>
> -  for (unsigned i = 0; i != UpRefs.size(); ++i) {
> +  unsigned i = 0;
> +  for (; i != UpRefs.size(); ++i) {
>      UR_OUT("  UR#" << i << " - TypeContains(" << Ty->getDescription 
> () << ", "
> -           << UpRefs[i].second->getDescription() << ") = "
> -           << (TypeContains(Ty, UpRefs[i].second) ? "true" :  
> "false") << "\n");
> +           << UpRefs[i].UpRefTy->getDescription() << ") = "
> +           << (TypeContains(Ty, UpRefs[i].UpRefTy) ? "true" :  
> "false") << "\n");
>      if (TypeContains(Ty, UpRefs[i].LastContainedTy)) {
>        // Decrement level of upreference
>        unsigned Level = --UpRefs[i].NestingLevel;
> @@ -946,8 +1084,9 @@
>            TypeToResolve = UpRefs[i].UpRefTy;
>          } else {
>            UR_OUT("  * Resolving upreference for "
> -                 << UpRefs[i].second->getDescription() << "\n";
> -                 std::string OldName = UpRefs[i].UpRefTy- 
> >getDescription());
> +                 << UpRefs[i].UpRefTy->getDescription() << "\n";
> +          std::string OldName = UpRefs[i].UpRefTy->getDescription());
> +          ResolveTypeSign(UpRefs[i].UpRefTy, Sign);
>            UpRefs[i].UpRefTy->refineAbstractTypeTo(TypeToResolve);
>            UR_OUT("  * Type '" << OldName << "' refined upreference  
> to: "
>                   << (const void*)Ty << ", " << Ty->getDescription 
> () << "\n");
> @@ -960,14 +1099,113 @@
>
>    if (TypeToResolve) {
>      UR_OUT("  * Resolving upreference for "
> -           << UpRefs[i].second->getDescription() << "\n";
> +           << UpRefs[i].UpRefTy->getDescription() << "\n";
>             std::string OldName = TypeToResolve->getDescription());
> +    ResolveTypeSign(TypeToResolve, Sign);
>      TypeToResolve->refineAbstractTypeTo(Ty);
>    }
>
>    return Ty;
>  }
>
> +bool Signedness::operator<(const Signedness &that) const {
> +  if (isNamed()) {
> +    if (that.isNamed())
> +      return *(this->name) < *(that.name);
> +    else
> +      return CurModule.NamedTypeSigns[*name] < that;
> +  } else if (that.isNamed()) {
> +    return *this < CurModule.NamedTypeSigns[*that.name];
> +  }
> +
> +  if (isComposite() && that.isComposite()) {
> +    if (sv->size() == that.sv->size()) {
> +      SignVector::const_iterator thisI = sv->begin(), thisE = sv- 
> >end();
> +      SignVector::const_iterator thatI = that.sv->begin(),
> +                                 thatE = that.sv->end();
> +      for (; thisI != thisE; ++thisI, ++thatI) {
> +        if (*thisI < *thatI)
> +          return true;
> +        else if (!(*thisI == *thatI))
> +          return false;
> +      }
> +      return false;
> +    }
> +    return sv->size() < that.sv->size();
> +  }
> +  return kind < that.kind;
> +}
> +
> +bool Signedness::operator==(const Signedness &that) const {
> +  if (isNamed())
> +    if (that.isNamed())
> +      return *(this->name) == *(that.name);
> +    else
> +      return CurModule.NamedTypeSigns[*(this->name)] == that;
> +  else if (that.isNamed())
> +    return *this == CurModule.NamedTypeSigns[*(that.name)];
> +  if (isComposite() && that.isComposite()) {
> +    if (sv->size() == that.sv->size()) {
> +      SignVector::const_iterator thisI = sv->begin(), thisE = sv- 
> >end();
> +      SignVector::const_iterator thatI = that.sv->begin(),
> +                                 thatE = that.sv->end();
> +      for (; thisI != thisE; ++thisI, ++thatI) {
> +        if (!(*thisI == *thatI))
> +          return false;
> +      }
> +      return true;
> +    }
> +    return false;
> +  }
> +  return kind == that.kind;
> +}
> +
> +void Signedness::copy(const Signedness &that) {
> +  if (that.isNamed()) {
> +    kind = Named;
> +    name = new std::string(*that.name);
> +  } else if (that.isComposite()) {
> +    kind = Composite;
> +    sv = new SignVector();
> +    *sv = *that.sv;
> +  } else {
> +    kind = that.kind;
> +    sv = 0;
> +  }
> +}
> +
> +void Signedness::destroy() {
> +  if (isNamed()) {
> +    delete name;
> +  } else if (isComposite()) {
> +    delete sv;
> +  }
> +}
> +
> +void Signedness::dump() const {
> +  if (isComposite()) {
> +    if (sv->size() == 1) {
> +      (*sv)[0].dump();
> +      std::cerr << "*";
> +    } else {
> +      std::cerr << "{ " ;
> +      for (unsigned i = 0; i < sv->size(); ++i) {
> +        if (i != 0)
> +          std::cerr << ", ";
> +        (*sv)[i].dump();
> +      }
> +      std::cerr << "} " ;
> +    }
> +  } else if (isNamed()) {
> +    std::cerr << *name;
> +  } else if (isSigned()) {
> +    std::cerr << "S";
> +  } else if (isUnsigned()) {
> +    std::cerr << "U";
> +  } else
> +    std::cerr << ".";
> +}
> +
>  static inline Instruction::TermOps
>  getTermOp(TermOps op) {
>    switch (op) {
> @@ -982,7 +1220,7 @@
>  }
>
>  static inline Instruction::BinaryOps
> -getBinaryOp(BinaryOps op, const Type *Ty, Signedness Sign) {
> +getBinaryOp(BinaryOps op, const Type *Ty, const Signedness& Sign) {
>    switch (op) {
>      default     : assert(0 && "Invalid OldBinaryOps");
>      case SetEQ  :
> @@ -1003,7 +1241,7 @@
>          isFP = PTy->getElementType()->isFloatingPoint();
>        if (isFP)
>          return Instruction::FDiv;
> -      else if (Sign == Signed)
> +      else if (Sign.isSigned())
>          return Instruction::SDiv;
>        return Instruction::UDiv;
>      }
> @@ -1020,7 +1258,7 @@
>        // Select correct opcode
>        if (isFP)
>          return Instruction::FRem;
> -      else if (Sign == Signed)
> +      else if (Sign.isSigned())
>          return Instruction::SRem;
>        return Instruction::URem;
>      }
> @@ -1031,7 +1269,7 @@
>      case AShrOp : return Instruction::AShr;
>      case ShlOp  : return Instruction::Shl;
>      case ShrOp  :
> -      if (Sign == Signed)
> +      if (Sign.isSigned())
>          return Instruction::AShr;
>        return Instruction::LShr;
>      case AndOp  : return Instruction::And;
> @@ -1042,8 +1280,8 @@
>
>  static inline Instruction::OtherOps
>  getCompareOp(BinaryOps op, unsigned short &predicate, const Type*  
> &Ty,
> -             Signedness Sign) {
> -  bool isSigned = Sign == Signed;
> +             const Signedness &Sign) {
> +  bool isSigned = Sign.isSigned();
>    bool isFP = Ty->isFloatingPoint();
>    switch (op) {
>      default     : assert(0 && "Invalid OldSetCC");
> @@ -1123,7 +1361,7 @@
>  }
>
>  static inline Instruction::OtherOps
> -getOtherOp(OtherOps op, Signedness Sign) {
> +getOtherOp(OtherOps op, const Signedness &Sign) {
>    switch (op) {
>      default               : assert(0 && "Invalid OldOtherOps");
>      case PHIOp            : return Instruction::PHI;
> @@ -1141,8 +1379,8 @@
>  }
>
>  static inline Value*
> -getCast(CastOps op, Value *Src, Signedness SrcSign, const Type  
> *DstTy,
> -        Signedness DstSign, bool ForceInstruction = false) {
> +getCast(CastOps op, Value *Src, const Signedness &SrcSign, const  
> Type *DstTy,
> +        const Signedness &DstSign, bool ForceInstruction = false) {
>    Instruction::CastOps Opcode;
>    const Type* SrcTy = Src->getType();
>    if (op == CastOp) {
> @@ -1179,7 +1417,8 @@
>      }
>      // Determine the opcode to use by calling CastInst::getCastOpcode
>      Opcode =
> -      CastInst::getCastOpcode(Src, SrcSign == Signed, DstTy,  
> DstSign == Signed);
> +      CastInst::getCastOpcode(Src, SrcSign.isSigned(), DstTy,
> +                              DstSign.isSigned());
>
>    } else switch (op) {
>      default: assert(0 && "Invalid cast token");
> @@ -1271,7 +1510,7 @@
>        // all indices for SequentialType elements. We must retain  
> the same
>        // semantic (zext) for unsigned types.
>        if (const IntegerType *Ity = dyn_cast<IntegerType>(Index- 
> >getType()))
> -        if (Ity->getBitWidth() < 64 && (*Indices)[i].S == Unsigned) {
> +        if (Ity->getBitWidth() < 64 && (*Indices)[i].S.isUnsigned 
> ()) {
>            if (CIndices)
>              Index = ConstantExpr::getCast(Instruction::ZExt,
>                cast<Constant>(Index), Type::Int64Ty);
> @@ -1456,7 +1695,7 @@
>    llvm::Function                         *FunctionVal;
>    std::pair<llvm::PATypeInfo, char*>     *ArgVal;
>    llvm::BasicBlock                       *BasicBlockVal;
> -  llvm::TerminatorInst                   *TermInstVal;
> +  llvm::TermInstInfo                     TermInstVal;
>    llvm::InstrInfo                        InstVal;
>    llvm::ConstInfo                        ConstVal;
>    llvm::ValueInfo                        ValueVal;
> @@ -1769,7 +2008,7 @@
>    : Types
>    | VOID {
>      $$.PAT = new PATypeHolder($1.T);
> -    $$.S = Signless;
> +    $$.S.makeSignless();
>    }
>    ;
>
> @@ -1777,7 +2016,7 @@
>    : UpRTypes
>    | VOID {
>      $$.PAT = new PATypeHolder($1.T);
> -    $$.S = Signless;
> +    $$.S.makeSignless();
>    }
>    ;
>
> @@ -1798,16 +2037,16 @@
>  UpRTypes
>    : PrimType {
>      $$.PAT = new PATypeHolder($1.T);
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
>    }
>    | OPAQUE {
>      $$.PAT = new PATypeHolder(OpaqueType::get());
> -    $$.S = Signless;
> +    $$.S.makeSignless();
>    }
>    | SymbolicValueRef {            // Named types are also simple  
> types...
> +    $$.S.copy(getTypeSign($1));
>      const Type* tmp = getType($1);
>      $$.PAT = new PATypeHolder(tmp);
> -    $$.S = Signless; // FIXME: what if its signed?
>    }
>    | '\\' EUINT64VAL {                   // Type UpReference
>      if ($2 > (uint64_t)~0U)
> @@ -1815,14 +2054,16 @@
>      OpaqueType *OT = OpaqueType::get();        // Use temporary  
> placeholder
>      UpRefs.push_back(UpRefRecord((unsigned)$2, OT));  // Add to  
> vector...
>      $$.PAT = new PATypeHolder(OT);
> -    $$.S = Signless;
> +    $$.S.makeSignless();
>      UR_OUT("New Upreference!\n");
>    }
>    | UpRTypesV '(' ArgTypeListI ')' {           // Function derived  
> type?
> +    $$.S.makeComposite($1.S);
>      std::vector<const Type*> Params;
>      for (std::list<llvm::PATypeInfo>::iterator I = $3->begin(),
>             E = $3->end(); I != E; ++I) {
>        Params.push_back(I->PAT->get());
> +      $$.S.add(I->S);
>      }
>      FunctionType::ParamAttrsList ParamAttrs;
>      bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
> @@ -1830,63 +2071,67 @@
>
>      $$.PAT = new PATypeHolder(
>        HandleUpRefs(FunctionType::get($1.PAT->get(), Params, isVarArg,
> -                   ParamAttrs)));
> -    $$.S = $1.S;
> -    delete $1.PAT;    // Delete the return type handle
> +                   ParamAttrs), $$.S));
> +    delete $1.PAT;  // Delete the return type handle
>      delete $3;      // Delete the argument list
>    }
>    | '[' EUINT64VAL 'x' UpRTypes ']' {          // Sized array type?
> +    $$.S.makeComposite($4.S);
>      $$.PAT = new PATypeHolder(HandleUpRefs(ArrayType::get($4.PAT- 
> >get(),
> -                                                        (unsigned) 
> $2)));
> -    $$.S = $4.S;
> +                                           (unsigned)$2), $$.S));
>      delete $4.PAT;
>    }
>    | '<' EUINT64VAL 'x' UpRTypes '>' {          // Vector type?
> -     const llvm::Type* ElemTy = $4.PAT->get();
> -     if ((unsigned)$2 != $2)
> -        error("Unsigned result not equal to signed result");
> -     if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
> -        error("Elements of a VectorType must be integer or  
> floating point");
> -     if (!isPowerOf2_32($2))
> -       error("VectorType length should be a power of 2");
> -     $$.PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy,
> -                                          (unsigned)$2)));
> -     $$.S = $4.S;
> -     delete $4.PAT;
> +    const llvm::Type* ElemTy = $4.PAT->get();
> +    if ((unsigned)$2 != $2)
> +       error("Unsigned result not equal to signed result");
> +    if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
> +       error("Elements of a VectorType must be integer or floating  
> point");
> +    if (!isPowerOf2_32($2))
> +      error("VectorType length should be a power of 2");
> +    $$.S.makeComposite($4.S);
> +    $$.PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy,
> +                                         (unsigned)$2), $$.S));
> +    delete $4.PAT;
>    }
>    | '{' TypeListI '}' {                        // Structure type?
>      std::vector<const Type*> Elements;
> +    $$.S.makeComposite();
>      for (std::list<llvm::PATypeInfo>::iterator I = $2->begin(),
> -           E = $2->end(); I != E; ++I)
> +           E = $2->end(); I != E; ++I) {
>        Elements.push_back(I->PAT->get());
> -    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get 
> (Elements)));
> -    $$.S = Signless;
> +      $$.S.add(I->S);
> +    }
> +    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get 
> (Elements), $$.S));
>      delete $2;
>    }
>    | '{' '}' {                                  // Empty structure  
> type?
>      $$.PAT = new PATypeHolder(StructType::get(std::vector<const  
> Type*>()));
> -    $$.S = Signless;
> +    $$.S.makeComposite();
>    }
>    | '<' '{' TypeListI '}' '>' {                // Packed Structure  
> type?
> +    $$.S.makeComposite();
>      std::vector<const Type*> Elements;
>      for (std::list<llvm::PATypeInfo>::iterator I = $3->begin(),
>             E = $3->end(); I != E; ++I) {
>        Elements.push_back(I->PAT->get());
> +      $$.S.add(I->S);
>        delete I->PAT;
>      }
> -    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get 
> (Elements, true)));
> -    $$.S = Signless;
> +    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get 
> (Elements, true),
> +                                           $$.S));
>      delete $3;
>    }
>    | '<' '{' '}' '>' {                          // Empty packed  
> structure type?
>      $$.PAT = new PATypeHolder(StructType::get(std::vector<const  
> Type*>(),true));
> -    $$.S = Signless;
> +    $$.S.makeComposite();
>    }
>    | UpRTypes '*' {                             // Pointer type?
>      if ($1.PAT->get() == Type::LabelTy)
>        error("Cannot form a pointer to a basic block");
> -    $$.PAT = new PATypeHolder(HandleUpRefs(PointerType::get($1.PAT- 
> >get())));
> -    $$.S = $1.S;
> +    $$.S.makeComposite($1.S);
> +    $$.PAT = new PATypeHolder(HandleUpRefs(PointerType::get($1.PAT- 
> >get()),
> +                                           $$.S));
>      delete $1.PAT;
>    }
>    ;
> @@ -1910,14 +2155,14 @@
>    | TypeListI ',' DOTDOTDOT {
>      PATypeInfo VoidTI;
>      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> -    VoidTI.S = Signless;
> +    VoidTI.S.makeSignless();
>      ($$=$1)->push_back(VoidTI);
>    }
>    | DOTDOTDOT {
>      $$ = new std::list<PATypeInfo>();
>      PATypeInfo VoidTI;
>      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> -    VoidTI.S = Signless;
> +    VoidTI.S.makeSignless();
>      $$->push_back(VoidTI);
>    }
>    | /*empty*/ {
> @@ -1958,7 +2203,7 @@
>        Elems.push_back(C);
>      }
>      $$.C = ConstantArray::get(ATy, Elems);
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
>      delete $1.PAT;
>      delete $3;
>    }
> @@ -1972,7 +2217,7 @@
>        error("Type mismatch: constant sized array initialized with 0"
>              " arguments, but has size of " + itostr(NumElements)  
> +"");
>      $$.C = ConstantArray::get(ATy, std::vector<Constant*>());
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
>      delete $1.PAT;
>    }
>    | Types 'c' STRINGCONSTANT {
> @@ -1995,7 +2240,7 @@
>        Vals.push_back(ConstantInt::get(ETy, *C));
>      free($3);
>      $$.C = ConstantArray::get(ATy, Vals);
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
>      delete $1.PAT;
>    }
>    | Types '<' ConstVector '>' { // Nonempty unsized arr
> @@ -2022,7 +2267,7 @@
>        Elems.push_back(C);
>      }
>      $$.C = ConstantVector::get(PTy, Elems);
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
>      delete $1.PAT;
>      delete $3;
>    }
> @@ -2044,7 +2289,7 @@
>        Fields.push_back(C);
>      }
>      $$.C = ConstantStruct::get(STy, Fields);
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
>      delete $1.PAT;
>      delete $3;
>    }
> @@ -2056,7 +2301,7 @@
>      if (STy->getNumContainedTypes() != 0)
>        error("Illegal number of initializers for structure type");
>      $$.C = ConstantStruct::get(STy, std::vector<Constant*>());
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
>      delete $1.PAT;
>    }
>    | Types '<' '{' ConstVector '}' '>' {
> @@ -2077,7 +2322,7 @@
>        Fields.push_back(C);
>      }
>      $$.C = ConstantStruct::get(STy, Fields);
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
>      delete $1.PAT;
>      delete $4;
>    }
> @@ -2089,7 +2334,7 @@
>      if (STy->getNumContainedTypes() != 0)
>        error("Illegal number of initializers for packed structure  
> type");
>      $$.C = ConstantStruct::get(STy, std::vector<Constant*>());
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
>      delete $1.PAT;
>    }
>    | Types NULL_TOK {
> @@ -2098,12 +2343,12 @@
>        error("Cannot make null pointer constant with type: '" +
>              $1.PAT->get()->getDescription() + "'");
>      $$.C = ConstantPointerNull::get(PTy);
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
>      delete $1.PAT;
>    }
>    | Types UNDEF {
>      $$.C = UndefValue::get($1.PAT->get());
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
>      delete $1.PAT;
>    }
>    | Types SymbolicValueRef {
> @@ -2121,6 +2366,7 @@
>      //
>      Function *SavedCurFn = CurFun.CurrentFunction;
>      CurFun.CurrentFunction = 0;
> +    $2.S.copy($1.S);
>      Value *V = getExistingValue(Ty, $2);
>      CurFun.CurrentFunction = SavedCurFn;
>
> @@ -2161,14 +2407,14 @@
>        }
>      }
>      $$.C = cast<GlobalValue>(V);
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
>      delete $1.PAT;            // Free the type handle
>    }
>    | Types ConstExpr {
>      if ($1.PAT->get() != $2.C->getType())
>        error("Mismatched types for constant expression");
>      $$ = $2;
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
>      delete $1.PAT;
>    }
>    | Types ZEROINITIALIZER {
> @@ -2176,7 +2422,7 @@
>      if (isa<FunctionType>(Ty) || Ty == Type::LabelTy ||  
> isa<OpaqueType>(Ty))
>        error("Cannot create a null initialized value of this type");
>      $$.C = Constant::getNullValue(Ty);
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
>      delete $1.PAT;
>    }
>    | SIntType EINT64VAL {      // integral constants
> @@ -2184,28 +2430,28 @@
>      if (!ConstantInt::isValueValidForType(Ty, $2))
>        error("Constant value doesn't fit in type");
>      $$.C = ConstantInt::get(Ty, $2);
> -    $$.S = Signed;
> +    $$.S.makeSigned();
>    }
>    | UIntType EUINT64VAL {            // integral constants
>      const Type *Ty = $1.T;
>      if (!ConstantInt::isValueValidForType(Ty, $2))
>        error("Constant value doesn't fit in type");
>      $$.C = ConstantInt::get(Ty, $2);
> -    $$.S = Unsigned;
> +    $$.S.makeUnsigned();
>    }
>    | BOOL TRUETOK {                      // Boolean constants
>      $$.C = ConstantInt::get(Type::Int1Ty, true);
> -    $$.S = Unsigned;
> +    $$.S.makeUnsigned();
>    }
>    | BOOL FALSETOK {                     // Boolean constants
>      $$.C = ConstantInt::get(Type::Int1Ty, false);
> -    $$.S = Unsigned;
> +    $$.S.makeUnsigned();
>    }
>    | FPType FPVAL {                   // Float & Double constants
>      if (!ConstantFP::isValueValidForType($1.T, $2))
>        error("Floating point constant invalid for type");
>      $$.C = ConstantFP::get($1.T, $2);
> -    $$.S = Signless;
> +    $$.S.makeSignless();
>    }
>    ;
>
> @@ -2213,8 +2459,8 @@
>    : CastOps '(' ConstVal TO Types ')' {
>      const Type* SrcTy = $3.C->getType();
>      const Type* DstTy = $5.PAT->get();
> -    Signedness SrcSign = $3.S;
> -    Signedness DstSign = $5.S;
> +    Signedness SrcSign($3.S);
> +    Signedness DstSign($5.S);
>      if (!SrcTy->isFirstClassType())
>        error("cast constant expression from a non-primitive type: '" +
>              SrcTy->getDescription() + "'");
> @@ -2222,7 +2468,7 @@
>        error("cast constant expression to a non-primitive type: '" +
>              DstTy->getDescription() + "'");
>      $$.C = cast<Constant>(getCast($1, $3.C, SrcSign, DstTy,  
> DstSign));
> -    $$.S = DstSign;
> +    $$.S.copy(DstSign);
>      delete $5.PAT;
>    }
>    | GETELEMENTPTR '(' ConstVal IndexList ')' {
> @@ -2236,7 +2482,7 @@
>
>      delete $4;
>      $$.C = ConstantExpr::getGetElementPtr($3.C, &CIndices[0],  
> CIndices.size());
> -    $$.S = Signless;
> +    $$.S.copy(getElementSign($3, CIndices));
>    }
>    | SELECT '(' ConstVal ',' ConstVal ',' ConstVal ')' {
>      if (!$3.C->getType()->isInteger() ||
> @@ -2245,7 +2491,7 @@
>      if ($5.C->getType() != $7.C->getType())
>        error("Select operand types must match");
>      $$.C = ConstantExpr::getSelect($3.C, $5.C, $7.C);
> -    $$.S = Unsigned;
> +    $$.S.copy($5.S);
>    }
>    | ArithmeticOps '(' ConstVal ',' ConstVal ')' {
>      const Type *Ty = $3.C->getType();
> @@ -2273,7 +2519,7 @@
>               ConstantExpr::getCast(Instruction::PtrToInt, $5.C,  
> IntPtrTy));
>        $$.C = ConstantExpr::getCast(Instruction::IntToPtr, $$.C, Ty);
>      }
> -    $$.S = $3.S;
> +    $$.S.copy($3.S);
>    }
>    | LogicalOps '(' ConstVal ',' ConstVal ')' {
>      const Type* Ty = $3.C->getType();
> @@ -2286,7 +2532,7 @@
>      }
>      Instruction::BinaryOps Opcode = getBinaryOp($1, Ty, $3.S);
>      $$.C = ConstantExpr::get(Opcode, $3.C, $5.C);
> -    $$.S = $3.S;
> +    $$.S.copy($3.S);
>    }
>    | SetCondOps '(' ConstVal ',' ConstVal ')' {
>      const Type* Ty = $3.C->getType();
> @@ -2295,19 +2541,19 @@
>      unsigned short pred;
>      Instruction::OtherOps Opcode = getCompareOp($1, pred, Ty, $3.S);
>      $$.C = ConstantExpr::getCompare(Opcode, $3.C, $5.C);
> -    $$.S = Unsigned;
> +    $$.S.makeUnsigned();
>    }
>    | ICMP IPredicates '(' ConstVal ',' ConstVal ')' {
>      if ($4.C->getType() != $6.C->getType())
>        error("icmp operand types must match");
>      $$.C = ConstantExpr::getCompare($2, $4.C, $6.C);
> -    $$.S = Unsigned;
> +    $$.S.makeUnsigned();
>    }
>    | FCMP FPredicates '(' ConstVal ',' ConstVal ')' {
>      if ($4.C->getType() != $6.C->getType())
>        error("fcmp operand types must match");
>      $$.C = ConstantExpr::getCompare($2, $4.C, $6.C);
> -    $$.S = Unsigned;
> +    $$.S.makeUnsigned();
>    }
>    | ShiftOps '(' ConstVal ',' ConstVal ')' {
>      if (!$5.C->getType()->isInteger() ||
> @@ -2318,25 +2564,25 @@
>        error("Shift constant expression requires integer operand");
>      Constant *ShiftAmt = ConstantExpr::getZExt($5.C, Ty);
>      $$.C = ConstantExpr::get(getBinaryOp($1, Ty, $3.S), $3.C,  
> ShiftAmt);
> -    $$.S = $3.S;
> +    $$.S.copy($3.S);
>    }
>    | EXTRACTELEMENT '(' ConstVal ',' ConstVal ')' {
>      if (!ExtractElementInst::isValidOperands($3.C, $5.C))
>        error("Invalid extractelement operands");
>      $$.C = ConstantExpr::getExtractElement($3.C, $5.C);
> -    $$.S = $3.S;
> +    $$.S.copy($3.S.get(0));
>    }
>    | INSERTELEMENT '(' ConstVal ',' ConstVal ',' ConstVal ')' {
>      if (!InsertElementInst::isValidOperands($3.C, $5.C, $7.C))
>        error("Invalid insertelement operands");
>      $$.C = ConstantExpr::getInsertElement($3.C, $5.C, $7.C);
> -    $$.S = $3.S;
> +    $$.S.copy($3.S);
>    }
>    | SHUFFLEVECTOR '(' ConstVal ',' ConstVal ',' ConstVal ')' {
>      if (!ShuffleVectorInst::isValidOperands($3.C, $5.C, $7.C))
>        error("Invalid shufflevector operands");
>      $$.C = ConstantExpr::getShuffleVector($3.C, $5.C, $7.C);
> -    $$.S = $3.S;
> +    $$.S.copy($3.S);
>    }
>    ;
>
> @@ -2405,13 +2651,13 @@
>      // If types are not resolved eagerly, then the two types will  
> not be
>      // determined to be the same type!
>      //
> -    const Type* Ty = $4.PAT->get();
> -    ResolveTypeTo($2, Ty);
> +    ResolveTypeTo($2, $4.PAT->get(), $4.S);
>
> -    if (!setTypeName(Ty, $2) && !$2) {
> -      // If this is a named type that is not a redefinition, add  
> it to the slot
> -      // table.
> -      CurModule.Types.push_back(Ty);
> +    if (!setTypeName($4, $2) && !$2) {
> +      // If this is a numbered type that is not a redefinition,  
> add it to the
> +      // slot table.
> +      CurModule.Types.push_back($4.PAT->get());
> +      CurModule.TypeSigns.push_back($4.S);
>      }
>      delete $4.PAT;
>    }
> @@ -2422,20 +2668,22 @@
>    | ConstPool OptAssign OptLinkage GlobalType ConstVal {
>      if ($5.C == 0)
>        error("Global value initializer is not a constant");
> -    CurGV = ParseGlobalVariable($2, $3, $4, $5.C->getType(), $5.C);
> +    CurGV = ParseGlobalVariable($2, $3, $4, $5.C->getType(), $5.C,  
> $5.S);
>    } GlobalVarAttributes {
>      CurGV = 0;
>    }
>    | ConstPool OptAssign EXTERNAL GlobalType Types {
>      const Type *Ty = $5.PAT->get();
> -    CurGV = ParseGlobalVariable($2, GlobalValue::ExternalLinkage,  
> $4, Ty, 0);
> +    CurGV = ParseGlobalVariable($2, GlobalValue::ExternalLinkage,  
> $4, Ty, 0,
> +                                $5.S);
>      delete $5.PAT;
>    } GlobalVarAttributes {
>      CurGV = 0;
>    }
>    | ConstPool OptAssign DLLIMPORT GlobalType Types {
>      const Type *Ty = $5.PAT->get();
> -    CurGV = ParseGlobalVariable($2, GlobalValue::DLLImportLinkage,  
> $4, Ty, 0);
> +    CurGV = ParseGlobalVariable($2, GlobalValue::DLLImportLinkage,  
> $4, Ty, 0,
> +                                $5.S);
>      delete $5.PAT;
>    } GlobalVarAttributes {
>      CurGV = 0;
> @@ -2443,7 +2691,8 @@
>    | ConstPool OptAssign EXTERN_WEAK GlobalType Types {
>      const Type *Ty = $5.PAT->get();
>      CurGV =
> -      ParseGlobalVariable($2, GlobalValue::ExternalWeakLinkage,  
> $4, Ty, 0);
> +      ParseGlobalVariable($2, GlobalValue::ExternalWeakLinkage,  
> $4, Ty, 0,
> +                          $5.S);
>      delete $5.PAT;
>    } GlobalVarAttributes {
>      CurGV = 0;
> @@ -2553,14 +2802,14 @@
>      $$ = $1;
>      PATypeInfo VoidTI;
>      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> -    VoidTI.S = Signless;
> +    VoidTI.S.makeSignless();
>      $$->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
>    }
>    | DOTDOTDOT {
>      $$ = new std::vector<std::pair<PATypeInfo,char*> >();
>      PATypeInfo VoidTI;
>      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> -    VoidTI.S = Signless;
> +    VoidTI.S.makeSignless();
>      $$->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
>    }
>    | /* empty */ { $$ = 0; }
> @@ -2577,6 +2826,8 @@
>      if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
>        error("LLVM functions cannot return aggregate types");
>
> +    Signedness FTySign;
> +    FTySign.makeComposite($2.S);
>      std::vector<const Type*> ParamTyList;
>
>      // In LLVM 2.0 the signatures of three varargs intrinsics  
> changed to take
> @@ -2592,6 +2843,7 @@
>             I = $5->begin(), E = $5->end(); I != E; ++I) {
>          const Type *Ty = I->first.PAT->get();
>          ParamTyList.push_back(Ty);
> +        FTySign.add(I->first.S);
>        }
>      }
>
> @@ -2618,6 +2870,7 @@
>      } else {
>        ID = ValID::create((int)CurModule.Values[PFT].size());
>      }
> +    ID.S.makeComposite(FTySign);
>
>      Function *Fn = 0;
>      Module* M = CurModule.CurrentModule;
> @@ -2644,14 +2897,16 @@
>            std::string NewName(makeNameUnique(FunctionName));
>            if (Conflict->hasInternalLinkage()) {
>              Conflict->setName(NewName);
> -            RenameMapKey Key = std::make_pair 
> (FunctionName,Conflict->getType());
> +            RenameMapKey Key =
> +              makeRenameMapKey(FunctionName, Conflict->getType(),  
> ID.S);
>              CurModule.RenameMap[Key] = NewName;
>              Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
>              InsertValue(Fn, CurModule.Values);
>            } else {
>              Fn = new Function(FT, CurFun.Linkage, NewName, M);
>              InsertValue(Fn, CurModule.Values);
> -            RenameMapKey Key = std::make_pair(FunctionName,PFT);
> +            RenameMapKey Key =
> +              makeRenameMapKey(FunctionName, PFT, ID.S);
>              CurModule.RenameMap[Key] = NewName;
>            }
>          } else {
> @@ -2673,9 +2928,11 @@
>          // type plane. After PR411 was fixed, this is no loner the  
> case.
>          // To resolve this we must rename one of the two.
>          if (Conflict->hasInternalLinkage()) {
> -          // We can safely renamed the Conflict.
> +          // We can safely rename the Conflict.
> +          RenameMapKey Key =
> +            makeRenameMapKey(Conflict->getName(), Conflict->getType 
> (),
> +              CurModule.NamedValueSigns[Conflict->getName()]);
>            Conflict->setName(makeNameUnique(Conflict->getName()));
> -          RenameMapKey Key = std::make_pair(FunctionName,Conflict- 
> >getType());
>            CurModule.RenameMap[Key] = Conflict->getName();
>            Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
>            InsertValue(Fn, CurModule.Values);
> @@ -2684,7 +2941,7 @@
>            std::string NewName = makeNameUnique(FunctionName);
>            Fn = new Function(FT, CurFun.Linkage, NewName, M);
>            InsertValue(Fn, CurModule.Values);
> -          RenameMapKey Key = std::make_pair(FunctionName,PFT);
> +          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT,  
> ID.S);
>            CurModule.RenameMap[Key] = NewName;
>          } else {
>            // We can't quietly rename either of these things, but  
> we must
> @@ -2695,7 +2952,7 @@
>                    "' may cause linkage errors");
>            Fn = new Function(FT, CurFun.Linkage, NewName, M);
>            InsertValue(Fn, CurModule.Values);
> -          RenameMapKey Key = std::make_pair(FunctionName,PFT);
> +          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT,  
> ID.S);
>            CurModule.RenameMap[Key] = NewName;
>          }
>        } else {
> @@ -2734,7 +2991,8 @@
>        std::vector<std::pair<PATypeInfo,char*> >::iterator E = $5- 
> >end();
>        for ( ; I != E && ArgIt != ArgEnd; ++I, ++ArgIt) {
>          delete I->first.PAT;                      // Delete the  
> typeholder...
> -        setValueName(ArgIt, I->second);           // Insert arg  
> into symtab...
> +        ValueInfo VI; VI.V = ArgIt; VI.S.copy(I->first.S);
> +        setValueName(VI, I->second);           // Insert arg into  
> symtab...
>          InsertValue(ArgIt);
>        }
>        delete $5;                     // We're now done with the  
> argument list
> @@ -2791,11 +3049,17 @@
>
>  ConstValueRef
>      // A reference to a direct constant
> -  : ESINT64VAL {    $$ = ValID::create($1); }
> +  : ESINT64VAL { $$ = ValID::create($1); }
>    | EUINT64VAL { $$ = ValID::create($1); }
>    | FPVAL { $$ = ValID::create($1); }
> -  | TRUETOK { $$ = ValID::create(ConstantInt::get(Type::Int1Ty,  
> true)); }
> -  | FALSETOK { $$ = ValID::create(ConstantInt::get(Type::Int1Ty,  
> false)); }
> +  | TRUETOK {
> +    $$ = ValID::create(ConstantInt::get(Type::Int1Ty, true));
> +    $$.S.makeUnsigned();
> +  }
> +  | FALSETOK {
> +    $$ = ValID::create(ConstantInt::get(Type::Int1Ty, false));
> +    $$.S.makeUnsigned();
> +  }
>    | NULL_TOK { $$ = ValID::createNull(); }
>    | UNDEF { $$ = ValID::createUndef(); }
>    | ZEROINITIALIZER { $$ = ValID::createZeroInit(); }
> @@ -2803,8 +3067,8 @@
>      const Type *ETy = (*$2)[0].C->getType();
>      int NumElements = $2->size();
>      VectorType* pt = VectorType::get(ETy, NumElements);
> -    PATypeHolder* PTy = new PATypeHolder(
> -      HandleUpRefs(VectorType::get(ETy, NumElements)));
> +    $$.S.makeComposite((*$2)[0].S);
> +    PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt, $$.S));
>
>      // Verify all elements are correct type!
>      std::vector<Constant*> Elems;
> @@ -2822,6 +3086,7 @@
>    }
>    | ConstExpr {
>      $$ = ValID::create($1.C);
> +    $$.S.copy($1.S);
>    }
>    | ASM_TOK OptSideEffect STRINGCONSTANT ',' STRINGCONSTANT {
>      char *End = UnEscapeLexed($3, true);
> @@ -2834,12 +3099,11 @@
>    }
>    ;
>
> -// SymbolicValueRef - Reference to one of two ways of symbolically  
> refering to
> -// another value.
> +// SymbolicValueRef - Reference to one of two ways of symbolically  
> refering to // another value.
>  //
>  SymbolicValueRef
> -  : INTVAL {  $$ = ValID::create($1); }
> -  | Name   {  $$ = ValID::create($1); }
> +  : INTVAL {  $$ = ValID::create($1); $$.S.makeSignless(); }
> +  | Name   {  $$ = ValID::create($1); $$.S.makeSignless(); }
>    ;
>
>  // ValueRef - A reference to a definition... either constant or  
> symbolic
> @@ -2854,8 +3118,9 @@
>  ResolvedVal
>    : Types ValueRef {
>      const Type *Ty = $1.PAT->get();
> -    $$.S = $1.S;
> +    $2.S.copy($1.S);
>      $$.V = getVal(Ty, $2);
> +    $$.S.copy($1.S);
>      delete $1.PAT;
>    }
>    ;
> @@ -2874,9 +3139,10 @@
>  //
>  BasicBlock
>    : InstructionList OptAssign BBTerminatorInst  {
> -    setValueName($3, $2);
> -    InsertValue($3);
> -    $1->getInstList().push_back($3);
> +    ValueInfo VI; VI.V = $3.TI; VI.S.copy($3.S);
> +    setValueName(VI, $2);
> +    InsertValue($3.TI);
> +    $1->getInstList().push_back($3.TI);
>      InsertValue($1);
>      $$ = $1;
>    }
> @@ -2889,7 +3155,7 @@
>      $$ = $1;
>    }
>    | /* empty */ {
> -    $$ = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++),  
> true);
> +    $$ = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum+ 
> +),true);
>      // Make sure to move the basic block to the correct location  
> in the
>      // function, instead of leaving it inserted wherever it was first
>      // referenced.
> @@ -2912,26 +3178,36 @@
>
>  BBTerminatorInst
>    : RET ResolvedVal {              // Return with a result...
> -    $$ = new ReturnInst($2.V);
> +    $$.TI = new ReturnInst($2.V);
> +    $$.S.makeSignless();
>    }
>    | RET VOID {                                       // Return  
> with no result...
> -    $$ = new ReturnInst();
> +    $$.TI = new ReturnInst();
> +    $$.S.makeSignless();
>    }
>    | BR LABEL ValueRef {                         // Unconditional  
> Branch...
>      BasicBlock* tmpBB = getBBVal($3);
> -    $$ = new BranchInst(tmpBB);
> +    $$.TI = new BranchInst(tmpBB);
> +    $$.S.makeSignless();
>    }                                                  //  
> Conditional Branch...
>    | BR BOOL ValueRef ',' LABEL ValueRef ',' LABEL ValueRef {
> +    $6.S.makeSignless();
> +    $9.S.makeSignless();
>      BasicBlock* tmpBBA = getBBVal($6);
>      BasicBlock* tmpBBB = getBBVal($9);
> +    $3.S.makeUnsigned();
>      Value* tmpVal = getVal(Type::Int1Ty, $3);
> -    $$ = new BranchInst(tmpBBA, tmpBBB, tmpVal);
> +    $$.TI = new BranchInst(tmpBBA, tmpBBB, tmpVal);
> +    $$.S.makeSignless();
>    }
>    | SWITCH IntType ValueRef ',' LABEL ValueRef '[' JumpTable ']' {
> +    $3.S.copy($2.S);
>      Value* tmpVal = getVal($2.T, $3);
> +    $6.S.makeSignless();
>      BasicBlock* tmpBB = getBBVal($6);
>      SwitchInst *S = new SwitchInst(tmpVal, tmpBB, $8->size());
> -    $$ = S;
> +    $$.TI = S;
> +    $$.S.makeSignless();
>      std::vector<std::pair<Constant*,BasicBlock*> >::iterator I =  
> $8->begin(),
>        E = $8->end();
>      for (; I != E; ++I) {
> @@ -2943,24 +3219,31 @@
>      delete $8;
>    }
>    | SWITCH IntType ValueRef ',' LABEL ValueRef '[' ']' {
> +    $3.S.copy($2.S);
>      Value* tmpVal = getVal($2.T, $3);
> +    $6.S.makeSignless();
>      BasicBlock* tmpBB = getBBVal($6);
>      SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
> -    $$ = S;
> +    $$.TI = S;
> +    $$.S.makeSignless();
>    }
>    | INVOKE OptCallingConv TypesV ValueRef '(' ValueRefListE ')'
>      TO LABEL ValueRef Unwind LABEL ValueRef {
>      const PointerType *PFTy;
>      const FunctionType *Ty;
> +    Signedness FTySign;
>
>      if (!(PFTy = dyn_cast<PointerType>($3.PAT->get())) ||
>          !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
>        // Pull out the types of all of the arguments...
>        std::vector<const Type*> ParamTypes;
> +      FTySign.makeComposite($3.S);
>        if ($6) {
>          for (std::vector<ValueInfo>::iterator I = $6->begin(), E =  
> $6->end();
> -             I != E; ++I)
> +             I != E; ++I) {
>            ParamTypes.push_back((*I).V->getType());
> +          FTySign.add(I->S);
> +        }
>        }
>        FunctionType::ParamAttrsList ParamAttrs;
>        if ($2 == OldCallingConv::CSRet) {
> @@ -2971,14 +3254,19 @@
>        if (isVarArg) ParamTypes.pop_back();
>        Ty = FunctionType::get($3.PAT->get(), ParamTypes, isVarArg,  
> ParamAttrs);
>        PFTy = PointerType::get(Ty);
> +      $$.S.copy($3.S);
> +    } else {
> +      FTySign = $3.S;
> +      $$.S.copy($3.S.get(0)); // 0th element of FuncTy sign is  
> result ty
>      }
> +    $4.S.makeComposite(FTySign);
>      Value *V = getVal(PFTy, $4);   // Get the function we're  
> calling...
>      BasicBlock *Normal = getBBVal($10);
>      BasicBlock *Except = getBBVal($13);
>
>      // Create the call node...
>      if (!$6) {                                   // Has no arguments?
> -      $$ = new InvokeInst(V, Normal, Except, 0, 0);
> +      $$.TI = new InvokeInst(V, Normal, Except, 0, 0);
>      } else {                                     // Has arguments?
>        // Loop through FunctionType's arguments and ensure they are  
> specified
>        // correctly!
> @@ -2998,38 +3286,44 @@
>        if (I != E || (ArgI != ArgE && !Ty->isVarArg()))
>          error("Invalid number of parameters detected");
>
> -      $$ = new InvokeInst(V, Normal, Except, &Args[0], Args.size());
> +      $$.TI = new InvokeInst(V, Normal, Except, &Args[0], Args.size 
> ());
>      }
> -    cast<InvokeInst>($$)->setCallingConv(upgradeCallingConv($2));
> +    cast<InvokeInst>($$.TI)->setCallingConv(upgradeCallingConv($2));
>      delete $3.PAT;
>      delete $6;
>    }
>    | Unwind {
> -    $$ = new UnwindInst();
> +    $$.TI = new UnwindInst();
> +    $$.S.makeSignless();
>    }
>    | UNREACHABLE {
> -    $$ = new UnreachableInst();
> +    $$.TI = new UnreachableInst();
> +    $$.S.makeSignless();
>    }
>    ;
>
>  JumpTable
>    : JumpTable IntType ConstValueRef ',' LABEL ValueRef {
>      $$ = $1;
> +    $3.S.copy($2.S);
>      Constant *V = cast<Constant>(getExistingValue($2.T, $3));
>
>      if (V == 0)
>        error("May only switch on a constant pool value");
>
> +    $6.S.makeSignless();
>      BasicBlock* tmpBB = getBBVal($6);
>      $$->push_back(std::make_pair(V, tmpBB));
>    }
>    | IntType ConstValueRef ',' LABEL ValueRef {
>      $$ = new std::vector<std::pair<Constant*, BasicBlock*> >();
> +    $2.S.copy($1.S);
>      Constant *V = cast<Constant>(getExistingValue($1.T, $2));
>
>      if (V == 0)
>        error("May only switch on a constant pool value");
>
> +    $5.S.makeSignless();
>      BasicBlock* tmpBB = getBBVal($5);
>      $$->push_back(std::make_pair(V, tmpBB));
>    }
> @@ -3057,9 +3351,10 @@
>            omit = true;
>      if (omit) {
>        $$.I = 0;
> -      $$.S = Signless;
> +      $$.S.makeSignless();
>      } else {
> -      setValueName($2.I, $1);
> +      ValueInfo VI; VI.V = $2.I; VI.S.copy($2.S);
> +      setValueName(VI, $1);
>        InsertValue($2.I);
>        $$ = $2;
>      }
> @@ -3067,15 +3362,19 @@
>
>  PHIList : Types '[' ValueRef ',' ValueRef ']' {    // Used for PHI  
> nodes
>      $$.P = new std::list<std::pair<Value*, BasicBlock*> >();
> -    $$.S = $1.S;
> +    $$.S.copy($1.S);
> +    $3.S.copy($1.S);
>      Value* tmpVal = getVal($1.PAT->get(), $3);
> +    $5.S.makeSignless();
>      BasicBlock* tmpBB = getBBVal($5);
>      $$.P->push_back(std::make_pair(tmpVal, tmpBB));
>      delete $1.PAT;
>    }
>    | PHIList ',' '[' ValueRef ',' ValueRef ']' {
>      $$ = $1;
> +    $4.S.copy($1.S);
>      Value* tmpVal = getVal($1.P->front().first->getType(), $4);
> +    $6.S.makeSignless();
>      BasicBlock* tmpBB = getBBVal($6);
>      $1.P->push_back(std::make_pair(tmpVal, tmpBB));
>    }
> @@ -3107,6 +3406,8 @@
>
>  InstVal
>    : ArithmeticOps Types ValueRef ',' ValueRef {
> +    $3.S.copy($2.S);
> +    $5.S.copy($2.S);
>      const Type* Ty = $2.PAT->get();
>      if (!Ty->isInteger() && !Ty->isFloatingPoint() && ! 
> isa<VectorType>(Ty))
>        error("Arithmetic operator requires integer, FP, or packed  
> operands");
> @@ -3120,10 +3421,12 @@
>      $$.I = BinaryOperator::create(Opcode, val1, val2);
>      if ($$.I == 0)
>        error("binary operator returned null");
> -    $$.S = $2.S;
> +    $$.S.copy($2.S);
>      delete $2.PAT;
>    }
>    | LogicalOps Types ValueRef ',' ValueRef {
> +    $3.S.copy($2.S);
> +    $5.S.copy($2.S);
>      const Type *Ty = $2.PAT->get();
>      if (!Ty->isInteger()) {
>        if (!isa<VectorType>(Ty) ||
> @@ -3136,10 +3439,12 @@
>      $$.I = BinaryOperator::create(Opcode, tmpVal1, tmpVal2);
>      if ($$.I == 0)
>        error("binary operator returned null");
> -    $$.S = $2.S;
> +    $$.S.copy($2.S);
>      delete $2.PAT;
>    }
>    | SetCondOps Types ValueRef ',' ValueRef {
> +    $3.S.copy($2.S);
> +    $5.S.copy($2.S);
>      const Type* Ty = $2.PAT->get();
>      if(isa<VectorType>(Ty))
>        error("VectorTypes currently not supported in setcc  
> instructions");
> @@ -3150,10 +3455,12 @@
>      $$.I = CmpInst::create(Opcode, pred, tmpVal1, tmpVal2);
>      if ($$.I == 0)
>        error("binary operator returned null");
> -    $$.S = Unsigned;
> +    $$.S.makeUnsigned();
>      delete $2.PAT;
>    }
>    | ICMP IPredicates Types ValueRef ',' ValueRef {
> +    $4.S.copy($3.S);
> +    $6.S.copy($3.S);
>      const Type *Ty = $3.PAT->get();
>      if (isa<VectorType>(Ty))
>        error("VectorTypes currently not supported in icmp  
> instructions");
> @@ -3162,10 +3469,12 @@
>      Value* tmpVal1 = getVal(Ty, $4);
>      Value* tmpVal2 = getVal(Ty, $6);
>      $$.I = new ICmpInst($2, tmpVal1, tmpVal2);
> -    $$.S = Unsigned;
> +    $$.S.makeUnsigned();
>      delete $3.PAT;
>    }
>    | FCMP FPredicates Types ValueRef ',' ValueRef {
> +    $4.S.copy($3.S);
> +    $6.S.copy($3.S);
>      const Type *Ty = $3.PAT->get();
>      if (isa<VectorType>(Ty))
>        error("VectorTypes currently not supported in fcmp  
> instructions");
> @@ -3174,7 +3483,7 @@
>      Value* tmpVal1 = getVal(Ty, $4);
>      Value* tmpVal2 = getVal(Ty, $6);
>      $$.I = new FCmpInst($2, tmpVal1, tmpVal2);
> -    $$.S = Unsigned;
> +    $$.S.makeUnsigned();
>      delete $3.PAT;
>    }
>    | NOT ResolvedVal {
> @@ -3186,7 +3495,7 @@
>      $$.I = BinaryOperator::create(Instruction::Xor, $2.V, Ones);
>      if ($$.I == 0)
>        error("Could not create a xor instruction");
> -    $$.S = $2.S;
> +    $$.S.copy($2.S);
>    }
>    | ShiftOps ResolvedVal ',' ResolvedVal {
>      if (!$4.V->getType()->isInteger() ||
> @@ -3204,7 +3513,7 @@
>      else
>        ShiftAmt = $4.V;
>      $$.I = BinaryOperator::create(getBinaryOp($1, Ty, $2.S), $2.V,  
> ShiftAmt);
> -    $$.S = $2.S;
> +    $$.S.copy($2.S);
>    }
>    | CastOps ResolvedVal TO Types {
>      const Type *DstTy = $4.PAT->get();
> @@ -3212,7 +3521,7 @@
>        error("cast instruction to a non-primitive type: '" +
>              DstTy->getDescription() + "'");
>      $$.I = cast<Instruction>(getCast($1, $2.V, $2.S, DstTy, $4.S,  
> true));
> -    $$.S = $4.S;
> +    $$.S.copy($4.S);
>      delete $4.PAT;
>    }
>    | SELECT ResolvedVal ',' ResolvedVal ',' ResolvedVal {
> @@ -3222,13 +3531,13 @@
>      if ($4.V->getType() != $6.V->getType())
>        error("select value types should match");
>      $$.I = new SelectInst($2.V, $4.V, $6.V);
> -    $$.S = $2.S;
> +    $$.S.copy($4.S);
>    }
>    | VAARG ResolvedVal ',' Types {
>      const Type *Ty = $4.PAT->get();
>      NewVarArgs = true;
>      $$.I = new VAArgInst($2.V, Ty);
> -    $$.S = $4.S;
> +    $$.S.copy($4.S);
>      delete $4.PAT;
>    }
>    | VAARG_old ResolvedVal ',' Types {
> @@ -3249,7 +3558,7 @@
>      CurBB->getInstList().push_back(bar);
>      CurBB->getInstList().push_back(new StoreInst(bar, foo));
>      $$.I = new VAArgInst(foo, DstTy);
> -    $$.S = $4.S;
> +    $$.S.copy($4.S);
>      delete $4.PAT;
>    }
>    | VANEXT_old ResolvedVal ',' Types {
> @@ -3273,26 +3582,26 @@
>      Instruction* tmp = new VAArgInst(foo, DstTy);
>      CurBB->getInstList().push_back(tmp);
>      $$.I = new LoadInst(foo);
> -    $$.S = $4.S;
> +    $$.S.copy($4.S);
>      delete $4.PAT;
>    }
>    | EXTRACTELEMENT ResolvedVal ',' ResolvedVal {
>      if (!ExtractElementInst::isValidOperands($2.V, $4.V))
>        error("Invalid extractelement operands");
>      $$.I = new ExtractElementInst($2.V, $4.V);
> -    $$.S = $2.S;
> +    $$.S.copy($2.S.get(0));
>    }
>    | INSERTELEMENT ResolvedVal ',' ResolvedVal ',' ResolvedVal {
>      if (!InsertElementInst::isValidOperands($2.V, $4.V, $6.V))
>        error("Invalid insertelement operands");
>      $$.I = new InsertElementInst($2.V, $4.V, $6.V);
> -    $$.S = $2.S;
> +    $$.S.copy($2.S);
>    }
>    | SHUFFLEVECTOR ResolvedVal ',' ResolvedVal ',' ResolvedVal {
>      if (!ShuffleVectorInst::isValidOperands($2.V, $4.V, $6.V))
>        error("Invalid shufflevector operands");
>      $$.I = new ShuffleVectorInst($2.V, $4.V, $6.V);
> -    $$.S = $2.S;
> +    $$.S.copy($2.S);
>    }
>    | PHI_TOK PHIList {
>      const Type *Ty = $2.P->front().first->getType();
> @@ -3307,22 +3616,25 @@
>        $2.P->pop_front();
>      }
>      $$.I = PHI;
> -    $$.S = $2.S;
> +    $$.S.copy($2.S);
>      delete $2.P;  // Free the list...
>    }
>    | OptTailCall OptCallingConv TypesV ValueRef '(' ValueRefListE  
> ')'  {
> -
>      // Handle the short call syntax
>      const PointerType *PFTy;
>      const FunctionType *FTy;
> +    Signedness FTySign;
>      if (!(PFTy = dyn_cast<PointerType>($3.PAT->get())) ||
>          !(FTy = dyn_cast<FunctionType>(PFTy->getElementType()))) {
>        // Pull out the types of all of the arguments...
>        std::vector<const Type*> ParamTypes;
> +      FTySign.makeComposite($3.S);
>        if ($6) {
>          for (std::vector<ValueInfo>::iterator I = $6->begin(), E =  
> $6->end();
> -             I != E; ++I)
> +             I != E; ++I) {
>            ParamTypes.push_back((*I).V->getType());
> +          FTySign.add(I->S);
> +        }
>        }
>
>        FunctionType::ParamAttrsList ParamAttrs;
> @@ -3339,7 +3651,12 @@
>
>        FTy = FunctionType::get(RetTy, ParamTypes, isVarArg,  
> ParamAttrs);
>        PFTy = PointerType::get(FTy);
> +      $$.S.copy($3.S);
> +    } else {
> +      FTySign = $3.S;
> +      $$.S.copy($3.S.get(0)); // 0th element of FuncTy signedness  
> is result sign
>      }
> +    $4.S.makeComposite(FTySign);
>
>      // First upgrade any intrinsic calls.
>      std::vector<Value*> Args;
> @@ -3351,7 +3668,6 @@
>      // If we got an upgraded intrinsic
>      if (Inst) {
>        $$.I = Inst;
> -      $$.S = Signless;
>      } else {
>        // Get the function we're calling
>        Value *V = getVal(PFTy, $4);
> @@ -3383,7 +3699,6 @@
>        CI->setTailCall($1);
>        CI->setCallingConv(upgradeCallingConv($2));
>        $$.I = CI;
> -      $$.S = $3.S;
>      }
>      delete $3.PAT;
>      delete $6;
> @@ -3408,25 +3723,27 @@
>  MemoryInst
>    : MALLOC Types OptCAlign {
>      const Type *Ty = $2.PAT->get();
> -    $$.S = $2.S;
> +    $$.S.makeComposite($2.S);
>      $$.I = new MallocInst(Ty, 0, $3);
>      delete $2.PAT;
>    }
>    | MALLOC Types ',' UINT ValueRef OptCAlign {
>      const Type *Ty = $2.PAT->get();
> -    $$.S = $2.S;
> +    $5.S.makeUnsigned();
> +    $$.S.makeComposite($2.S);
>      $$.I = new MallocInst(Ty, getVal($4.T, $5), $6);
>      delete $2.PAT;
>    }
>    | ALLOCA Types OptCAlign {
>      const Type *Ty = $2.PAT->get();
> -    $$.S = $2.S;
> +    $$.S.makeComposite($2.S);
>      $$.I = new AllocaInst(Ty, 0, $3);
>      delete $2.PAT;
>    }
>    | ALLOCA Types ',' UINT ValueRef OptCAlign {
>      const Type *Ty = $2.PAT->get();
> -    $$.S = $2.S;
> +    $5.S.makeUnsigned();
> +    $$.S.makeComposite($4.S);
>      $$.I = new AllocaInst(Ty, getVal($4.T, $5), $6);
>      delete $2.PAT;
>    }
> @@ -3435,11 +3752,11 @@
>      if (!isa<PointerType>(PTy))
>        error("Trying to free nonpointer type '" + PTy- 
> >getDescription() + "'");
>      $$.I = new FreeInst($2.V);
> -    $$.S = Signless;
> +    $$.S.makeSignless();
>    }
>    | OptVolatile LOAD Types ValueRef {
>      const Type* Ty = $3.PAT->get();
> -    $$.S = $3.S;
> +    $4.S.copy($3.S);
>      if (!isa<PointerType>(Ty))
>        error("Can't load from nonpointer type: " + Ty- 
> >getDescription());
>      if (!cast<PointerType>(Ty)->getElementType()->isFirstClassType())
> @@ -3447,9 +3764,11 @@
>                       Ty->getDescription());
>      Value* tmpVal = getVal(Ty, $4);
>      $$.I = new LoadInst(tmpVal, "", $1);
> +    $$.S.copy($3.S.get(0));
>      delete $3.PAT;
>    }
>    | OptVolatile STORE ResolvedVal ',' Types ValueRef {
> +    $6.S.copy($5.S);
>      const PointerType *PTy = dyn_cast<PointerType>($5.PAT->get());
>      if (!PTy)
>        error("Can't store to a nonpointer type: " +
> @@ -3471,10 +3790,11 @@
>        }
>      }
>      $$.I = new StoreInst(StoreVal, tmpVal, $1);
> -    $$.S = Signless;
> +    $$.S.makeSignless();
>      delete $5.PAT;
>    }
>    | GETELEMENTPTR Types ValueRef IndexList {
> +    $3.S.copy($2.S);
>      const Type* Ty = $2.PAT->get();
>      if (!isa<PointerType>(Ty))
>        error("getelementptr insn requires pointer operand");
> @@ -3484,7 +3804,8 @@
>
>      Value* tmpVal = getVal(Ty, $3);
>      $$.I = new GetElementPtrInst(tmpVal, &VIndices[0],  
> VIndices.size());
> -    $$.S = Signless;
> +    ValueInfo VI; VI.V = tmpVal; VI.S.copy($2.S);
> +    $$.S.copy(getElementSign(VI, VIndices));
>      delete $2.PAT;
>      delete $4;
>    };
>
>
>
> _______________________________________________
> 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  Thu Mar 22 02:44:19 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Thu, 22 Mar 2007 02:44:19 -0500
Subject: [llvm-commits] CVS: llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
	UpgradeParser.y UpgradeParser.y.cvs
Message-ID: <200703220744.l2M7iJQl021630@zion.cs.uiuc.edu>



Changes in directory llvm/tools/llvm-upgrade:

UpgradeParser.cpp.cvs updated: 1.68 -> 1.69
UpgradeParser.y updated: 1.73 -> 1.74
UpgradeParser.y.cvs updated: 1.67 -> 1.68
---
Log message:

Unbreak non-debug builds.

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

 UpgradeParser.cpp.cvs |    2 ++
 UpgradeParser.y       |    2 ++
 UpgradeParser.y.cvs   |    2 ++
 3 files changed, 6 insertions(+)


Index: llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
diff -u llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.68 llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.69
--- llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.68	Wed Mar 21 12:27:53 2007
+++ llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs	Thu Mar 22 02:43:50 2007
@@ -1542,6 +1542,7 @@
   } 
 }
 
+#ifndef NDEBUG
 void Signedness::dump() const {
   if (isComposite()) {
     if (sv->size() == 1) {
@@ -1565,6 +1566,7 @@
   } else
     std::cerr << ".";
 }
+#endif
 
 static inline Instruction::TermOps 
 getTermOp(TermOps op) {


Index: llvm/tools/llvm-upgrade/UpgradeParser.y
diff -u llvm/tools/llvm-upgrade/UpgradeParser.y:1.73 llvm/tools/llvm-upgrade/UpgradeParser.y:1.74
--- llvm/tools/llvm-upgrade/UpgradeParser.y:1.73	Wed Mar 21 12:26:41 2007
+++ llvm/tools/llvm-upgrade/UpgradeParser.y	Thu Mar 22 02:43:51 2007
@@ -1182,6 +1182,7 @@
   } 
 }
 
+#ifndef NDEBUG
 void Signedness::dump() const {
   if (isComposite()) {
     if (sv->size() == 1) {
@@ -1205,6 +1206,7 @@
   } else
     std::cerr << ".";
 }
+#endif
 
 static inline Instruction::TermOps 
 getTermOp(TermOps op) {


Index: llvm/tools/llvm-upgrade/UpgradeParser.y.cvs
diff -u llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.67 llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.68
--- llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.67	Wed Mar 21 12:27:53 2007
+++ llvm/tools/llvm-upgrade/UpgradeParser.y.cvs	Thu Mar 22 02:43:51 2007
@@ -1182,6 +1182,7 @@
   } 
 }
 
+#ifndef NDEBUG
 void Signedness::dump() const {
   if (isComposite()) {
     if (sv->size() == 1) {
@@ -1205,6 +1206,7 @@
   } else
     std::cerr << ".";
 }
+#endif
 
 static inline Instruction::TermOps 
 getTermOp(TermOps op) {





From rspencer at reidspencer.com  Thu Mar 22 04:07:41 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Thu, 22 Mar 2007 02:07:41 -0700
Subject: [llvm-commits] CVS:	llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
	UpgradeLexer.l.cvs	UpgradeParser.cpp.cvs UpgradeParser.h.cvs
	UpgradeParser.y.cvs
In-Reply-To: <02427838-A0E6-4A20-9949-3C10B6B73896@apple.com>
References: <200703211716.l2LHG8iN000389@zion.cs.uiuc.edu>
	<02427838-A0E6-4A20-9949-3C10B6B73896@apple.com>
Message-ID: <1174554462.13912.464.camel@bashful.x10sys.com>

On Thu, 2007-03-22 at 00:42 -0700, Evan Cheng wrote:
> Reid,
> 
> Shouldn't Signedness::dump be wrapped in #ifndef NDEBUG? I think this  
> is breaking non-debug builds.

Yeah, sorry about that .. 1/2 done change. I was actually going the
other way .. remove the #ifdef from the declaration so the function is
always there. Its not like its a critical space-sensitive library :)
But, what you did is fine.

Thanks for fixing it.

Reid.

> 
> Evan
> 
> On Mar 21, 2007, at 10:16 AM, Reid Spencer wrote:
> 
> >
> >
> > Changes in directory llvm/tools/llvm-upgrade:
> >
> > UpgradeLexer.cpp.cvs updated: 1.22 -> 1.23
> > UpgradeLexer.l.cvs updated: 1.19 -> 1.20
> > UpgradeParser.cpp.cvs updated: 1.66 -> 1.67
> > UpgradeParser.h.cvs updated: 1.50 -> 1.51
> > UpgradeParser.y.cvs updated: 1.65 -> 1.66
> > ---
> > Log message:
> >
> > Regenerate.
> >
> >
> > ---
> > Diffs of the changes:  (+1558 -905)
> >
> >  UpgradeLexer.cpp.cvs  |  379 +++++++-------
> >  UpgradeLexer.l.cvs    |   43 -
> >  UpgradeParser.cpp.cvs | 1282 ++++++++++++++++++++++++++++++ 
> > +-------------------
> >  UpgradeParser.h.cvs   |    4
> >  UpgradeParser.y.cvs   |  755 ++++++++++++++++++++---------
> >  5 files changed, 1558 insertions(+), 905 deletions(-)
> >
> >
> > Index: llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs
> > diff -u llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs:1.22 llvm/ 
> > tools/llvm-upgrade/UpgradeLexer.cpp.cvs:1.23
> > --- llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs:1.22	Wed Mar 14  
> > 22:26:42 2007
> > +++ llvm/tools/llvm-upgrade/UpgradeLexer.cpp.cvs	Wed Mar 21  
> > 12:15:50 2007
> > @@ -20,7 +20,7 @@
> >  /* A lexical scanner generated by flex*/
> >
> >  /* Scanner skeleton version:
> > - * $Header: /var/cvs/llvm/llvm/tools/llvm-upgrade/ 
> > UpgradeLexer.cpp.cvs,v 1.22 2007/03/15 03:26:42 reid Exp $
> > + * $Header: /var/cvs/llvm/llvm/tools/llvm-upgrade/ 
> > UpgradeLexer.cpp.cvs,v 1.23 2007/03/21 17:15:50 reid Exp $
> >   */
> >
> >  #define FLEX_SCANNER
> > @@ -976,7 +976,12 @@
> >
> >  #define RET_TY(sym,NewTY,sign) \
> >    Upgradelval.PrimType.T = NewTY; \
> > -  Upgradelval.PrimType.S = sign; \
> > +  switch (sign) { \
> > +    case 0: Upgradelval.PrimType.S.makeSignless(); break; \
> > +    case 1: Upgradelval.PrimType.S.makeUnsigned(); break; \
> > +    case 2: Upgradelval.PrimType.S.makeSigned(); break; \
> > +    default: assert(0 && "Invalid sign kind"); break; \
> > +  }\
> >    return sym
> >
> >  namespace llvm {
> > @@ -1085,7 +1090,7 @@
> >  /* HexIntConstant - Hexadecimal constant generated by the CFE to  
> > avoid forcing
> >   * it to deal with 64 bit numbers.
> >   */
> > -#line 1089 "UpgradeLexer.cpp"
> > +#line 1094 "UpgradeLexer.cpp"
> >
> >  /* Macros after this point can all be overridden by user  
> > definitions in
> >   * section 1.
> > @@ -1236,10 +1241,10 @@
> >  	register char *yy_cp = NULL, *yy_bp = NULL;
> >  	register int yy_act;
> >
> > -#line 189 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 194 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >
> >
> > -#line 1243 "UpgradeLexer.cpp"
> > +#line 1248 "UpgradeLexer.cpp"
> >
> >  	if ( yy_init )
> >  		{
> > @@ -1332,742 +1337,742 @@
> >  	{ /* beginning of action switch */
> >  case 1:
> >  YY_RULE_SETUP
> > -#line 191 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 196 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { /* Ignore comments for now */ }
> >  	YY_BREAK
> >  case 2:
> >  YY_RULE_SETUP
> > -#line 193 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 198 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return BEGINTOK; }
> >  	YY_BREAK
> >  case 3:
> >  YY_RULE_SETUP
> > -#line 194 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 199 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return ENDTOK; }
> >  	YY_BREAK
> >  case 4:
> >  YY_RULE_SETUP
> > -#line 195 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 200 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return TRUETOK;  }
> >  	YY_BREAK
> >  case 5:
> >  YY_RULE_SETUP
> > -#line 196 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 201 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return FALSETOK; }
> >  	YY_BREAK
> >  case 6:
> >  YY_RULE_SETUP
> > -#line 197 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 202 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return DECLARE; }
> >  	YY_BREAK
> >  case 7:
> >  YY_RULE_SETUP
> > -#line 198 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return GLOBAL; }
> >  	YY_BREAK
> >  case 8:
> >  YY_RULE_SETUP
> > -#line 199 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 204 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return CONSTANT; }
> >  	YY_BREAK
> >  case 9:
> >  YY_RULE_SETUP
> > -#line 200 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 205 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return INTERNAL; }
> >  	YY_BREAK
> >  case 10:
> >  YY_RULE_SETUP
> > -#line 201 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 206 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return LINKONCE; }
> >  	YY_BREAK
> >  case 11:
> >  YY_RULE_SETUP
> > -#line 202 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 207 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return WEAK; }
> >  	YY_BREAK
> >  case 12:
> >  YY_RULE_SETUP
> > -#line 203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 208 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return APPENDING; }
> >  	YY_BREAK
> >  case 13:
> >  YY_RULE_SETUP
> > -#line 204 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 209 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return DLLIMPORT; }
> >  	YY_BREAK
> >  case 14:
> >  YY_RULE_SETUP
> > -#line 205 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 210 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return DLLEXPORT; }
> >  	YY_BREAK
> >  case 15:
> >  YY_RULE_SETUP
> > -#line 206 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 211 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return EXTERN_WEAK; }
> >  	YY_BREAK
> >  case 16:
> >  YY_RULE_SETUP
> > -#line 207 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 212 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return EXTERNAL; }    /* Deprecated, turn into external */
> >  	YY_BREAK
> >  case 17:
> >  YY_RULE_SETUP
> > -#line 208 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 213 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return EXTERNAL; }
> >  	YY_BREAK
> >  case 18:
> >  YY_RULE_SETUP
> > -#line 209 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 214 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return IMPLEMENTATION; }
> >  	YY_BREAK
> >  case 19:
> >  YY_RULE_SETUP
> > -#line 210 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 215 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return ZEROINITIALIZER; }
> >  	YY_BREAK
> >  case 20:
> >  YY_RULE_SETUP
> > -#line 211 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 216 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return DOTDOTDOT; }
> >  	YY_BREAK
> >  case 21:
> >  YY_RULE_SETUP
> > -#line 212 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 217 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return UNDEF; }
> >  	YY_BREAK
> >  case 22:
> >  YY_RULE_SETUP
> > -#line 213 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 218 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return NULL_TOK; }
> >  	YY_BREAK
> >  case 23:
> >  YY_RULE_SETUP
> > -#line 214 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 219 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return TO; }
> >  	YY_BREAK
> >  case 24:
> >  YY_RULE_SETUP
> > -#line 215 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 220 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return EXCEPT; }
> >  	YY_BREAK
> >  case 25:
> >  YY_RULE_SETUP
> > -#line 216 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 221 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return NOT; }  /* Deprecated, turned into XOR */
> >  	YY_BREAK
> >  case 26:
> >  YY_RULE_SETUP
> > -#line 217 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 222 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return TAIL; }
> >  	YY_BREAK
> >  case 27:
> >  YY_RULE_SETUP
> > -#line 218 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return TARGET; }
> >  	YY_BREAK
> >  case 28:
> >  YY_RULE_SETUP
> > -#line 219 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 224 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return TRIPLE; }
> >  	YY_BREAK
> >  case 29:
> >  YY_RULE_SETUP
> > -#line 220 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 225 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return DEPLIBS; }
> >  	YY_BREAK
> >  case 30:
> >  YY_RULE_SETUP
> > -#line 221 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 226 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return ENDIAN; }
> >  	YY_BREAK
> >  case 31:
> >  YY_RULE_SETUP
> > -#line 222 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 227 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return POINTERSIZE; }
> >  	YY_BREAK
> >  case 32:
> >  YY_RULE_SETUP
> > -#line 223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return DATALAYOUT; }
> >  	YY_BREAK
> >  case 33:
> >  YY_RULE_SETUP
> > -#line 224 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 229 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return LITTLE; }
> >  	YY_BREAK
> >  case 34:
> >  YY_RULE_SETUP
> > -#line 225 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 230 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return BIG; }
> >  	YY_BREAK
> >  case 35:
> >  YY_RULE_SETUP
> > -#line 226 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return VOLATILE; }
> >  	YY_BREAK
> >  case 36:
> >  YY_RULE_SETUP
> > -#line 227 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 232 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return ALIGN;  }
> >  	YY_BREAK
> >  case 37:
> >  YY_RULE_SETUP
> > -#line 228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 233 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return SECTION; }
> >  	YY_BREAK
> >  case 38:
> >  YY_RULE_SETUP
> > -#line 229 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 234 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return MODULE; }
> >  	YY_BREAK
> >  case 39:
> >  YY_RULE_SETUP
> > -#line 230 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 235 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return ASM_TOK; }
> >  	YY_BREAK
> >  case 40:
> >  YY_RULE_SETUP
> > -#line 231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 236 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return SIDEEFFECT; }
> >  	YY_BREAK
> >  case 41:
> >  YY_RULE_SETUP
> > -#line 233 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 238 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return CC_TOK; }
> >  	YY_BREAK
> >  case 42:
> >  YY_RULE_SETUP
> > -#line 234 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 239 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return CCC_TOK; }
> >  	YY_BREAK
> >  case 43:
> >  YY_RULE_SETUP
> > -#line 235 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 240 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return CSRETCC_TOK; }
> >  	YY_BREAK
> >  case 44:
> >  YY_RULE_SETUP
> > -#line 236 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 241 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return FASTCC_TOK; }
> >  	YY_BREAK
> >  case 45:
> >  YY_RULE_SETUP
> > -#line 237 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 242 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return COLDCC_TOK; }
> >  	YY_BREAK
> >  case 46:
> >  YY_RULE_SETUP
> > -#line 238 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 243 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return X86_STDCALLCC_TOK; }
> >  	YY_BREAK
> >  case 47:
> >  YY_RULE_SETUP
> > -#line 239 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 244 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return X86_FASTCALLCC_TOK; }
> >  	YY_BREAK
> >  case 48:
> >  YY_RULE_SETUP
> > -#line 241 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(SBYTE,  Type::Int8Ty,  Signed);  }
> > +#line 246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(SBYTE,  Type::Int8Ty,  2); }
> >  	YY_BREAK
> >  case 49:
> >  YY_RULE_SETUP
> > -#line 242 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(UBYTE,  Type::Int8Ty,  Unsigned); }
> > +#line 247 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(UBYTE,  Type::Int8Ty,  1); }
> >  	YY_BREAK
> >  case 50:
> >  YY_RULE_SETUP
> > -#line 243 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(UBYTE,  Type::Int8Ty,  Unsigned); }
> > +#line 248 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(UBYTE,  Type::Int8Ty,  1); }
> >  	YY_BREAK
> >  case 51:
> >  YY_RULE_SETUP
> > -#line 244 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(SHORT,  Type::Int16Ty, Signed);  }
> > +#line 249 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(SHORT,  Type::Int16Ty, 2); }
> >  	YY_BREAK
> >  case 52:
> >  YY_RULE_SETUP
> > -#line 245 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(USHORT, Type::Int16Ty, Unsigned); }
> > +#line 250 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(USHORT, Type::Int16Ty, 1); }
> >  	YY_BREAK
> >  case 53:
> >  YY_RULE_SETUP
> > -#line 246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(USHORT, Type::Int16Ty, Unsigned); }
> > +#line 251 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(USHORT, Type::Int16Ty, 1); }
> >  	YY_BREAK
> >  case 54:
> >  YY_RULE_SETUP
> > -#line 247 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(INT,    Type::Int32Ty, Signed);  }
> > +#line 252 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(INT,    Type::Int32Ty, 2); }
> >  	YY_BREAK
> >  case 55:
> >  YY_RULE_SETUP
> > -#line 248 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(UINT,   Type::Int32Ty, Unsigned); }
> > +#line 253 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(UINT,   Type::Int32Ty, 1); }
> >  	YY_BREAK
> >  case 56:
> >  YY_RULE_SETUP
> > -#line 249 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(UINT,   Type::Int32Ty, Unsigned); }
> > +#line 254 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(UINT,   Type::Int32Ty, 1); }
> >  	YY_BREAK
> >  case 57:
> >  YY_RULE_SETUP
> > -#line 250 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(LONG,   Type::Int64Ty, Signed);  }
> > +#line 255 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(LONG,   Type::Int64Ty, 2); }
> >  	YY_BREAK
> >  case 58:
> >  YY_RULE_SETUP
> > -#line 251 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(ULONG,  Type::Int64Ty, Unsigned); }
> > +#line 256 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(ULONG,  Type::Int64Ty, 1); }
> >  	YY_BREAK
> >  case 59:
> >  YY_RULE_SETUP
> > -#line 252 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(ULONG,  Type::Int64Ty, Unsigned); }
> > +#line 257 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(ULONG,  Type::Int64Ty, 1); }
> >  	YY_BREAK
> >  case 60:
> >  YY_RULE_SETUP
> > -#line 253 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(VOID,   Type::VoidTy,  Signless  ); }
> > +#line 258 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(VOID,   Type::VoidTy,  0); }
> >  	YY_BREAK
> >  case 61:
> >  YY_RULE_SETUP
> > -#line 254 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(BOOL,   Type::Int1Ty,  Unsigned  ); }
> > +#line 259 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(BOOL,   Type::Int1Ty,  1); }
> >  	YY_BREAK
> >  case 62:
> >  YY_RULE_SETUP
> > -#line 255 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(BOOL,   Type::Int1Ty,  Unsigned  ); }
> > +#line 260 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(BOOL,   Type::Int1Ty,  1); }
> >  	YY_BREAK
> >  case 63:
> >  YY_RULE_SETUP
> > -#line 256 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(FLOAT,  Type::FloatTy, Signless ); }
> > +#line 261 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(FLOAT,  Type::FloatTy, 0); }
> >  	YY_BREAK
> >  case 64:
> >  YY_RULE_SETUP
> > -#line 257 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(DOUBLE, Type::DoubleTy,Signless); }
> > +#line 262 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(DOUBLE, Type::DoubleTy,0); }
> >  	YY_BREAK
> >  case 65:
> >  YY_RULE_SETUP
> > -#line 258 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > -{ RET_TY(LABEL,  Type::LabelTy, Signless ); }
> > +#line 263 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +{ RET_TY(LABEL,  Type::LabelTy, 0); }
> >  	YY_BREAK
> >  case 66:
> >  YY_RULE_SETUP
> > -#line 259 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 264 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return TYPE;   }
> >  	YY_BREAK
> >  case 67:
> >  YY_RULE_SETUP
> > -#line 260 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 265 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return OPAQUE; }
> >  	YY_BREAK
> >  case 68:
> >  YY_RULE_SETUP
> > -#line 262 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 267 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, AddOp, ADD); }
> >  	YY_BREAK
> >  case 69:
> >  YY_RULE_SETUP
> > -#line 263 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 268 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, SubOp, SUB); }
> >  	YY_BREAK
> >  case 70:
> >  YY_RULE_SETUP
> > -#line 264 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 269 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, MulOp, MUL); }
> >  	YY_BREAK
> >  case 71:
> >  YY_RULE_SETUP
> > -#line 265 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 270 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, DivOp,  DIV); }
> >  	YY_BREAK
> >  case 72:
> >  YY_RULE_SETUP
> > -#line 266 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 271 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, UDivOp, UDIV); }
> >  	YY_BREAK
> >  case 73:
> >  YY_RULE_SETUP
> > -#line 267 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 272 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, SDivOp, SDIV); }
> >  	YY_BREAK
> >  case 74:
> >  YY_RULE_SETUP
> > -#line 268 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 273 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, FDivOp, FDIV); }
> >  	YY_BREAK
> >  case 75:
> >  YY_RULE_SETUP
> > -#line 269 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 274 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, RemOp,  REM); }
> >  	YY_BREAK
> >  case 76:
> >  YY_RULE_SETUP
> > -#line 270 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 275 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, URemOp, UREM); }
> >  	YY_BREAK
> >  case 77:
> >  YY_RULE_SETUP
> > -#line 271 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 276 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, SRemOp, SREM); }
> >  	YY_BREAK
> >  case 78:
> >  YY_RULE_SETUP
> > -#line 272 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 277 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, FRemOp, FREM); }
> >  	YY_BREAK
> >  case 79:
> >  YY_RULE_SETUP
> > -#line 273 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 278 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, AndOp, AND); }
> >  	YY_BREAK
> >  case 80:
> >  YY_RULE_SETUP
> > -#line 274 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 279 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, OrOp , OR ); }
> >  	YY_BREAK
> >  case 81:
> >  YY_RULE_SETUP
> > -#line 275 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 280 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, XorOp, XOR); }
> >  	YY_BREAK
> >  case 82:
> >  YY_RULE_SETUP
> > -#line 276 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 281 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, SetNE, SETNE); }
> >  	YY_BREAK
> >  case 83:
> >  YY_RULE_SETUP
> > -#line 277 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 282 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, SetEQ, SETEQ); }
> >  	YY_BREAK
> >  case 84:
> >  YY_RULE_SETUP
> > -#line 278 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 283 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, SetLT, SETLT); }
> >  	YY_BREAK
> >  case 85:
> >  YY_RULE_SETUP
> > -#line 279 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 284 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, SetGT, SETGT); }
> >  	YY_BREAK
> >  case 86:
> >  YY_RULE_SETUP
> > -#line 280 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 285 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, SetLE, SETLE); }
> >  	YY_BREAK
> >  case 87:
> >  YY_RULE_SETUP
> > -#line 281 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 286 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, SetGE, SETGE); }
> >  	YY_BREAK
> >  case 88:
> >  YY_RULE_SETUP
> > -#line 282 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 287 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, ShlOp, SHL); }
> >  	YY_BREAK
> >  case 89:
> >  YY_RULE_SETUP
> > -#line 283 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 288 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, ShrOp, SHR); }
> >  	YY_BREAK
> >  case 90:
> >  YY_RULE_SETUP
> > -#line 284 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 289 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, LShrOp, LSHR); }
> >  	YY_BREAK
> >  case 91:
> >  YY_RULE_SETUP
> > -#line 285 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 290 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(BinaryOpVal, AShrOp, ASHR); }
> >  	YY_BREAK
> >  case 92:
> >  YY_RULE_SETUP
> > -#line 287 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 292 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(OtherOpVal, ICmpOp, ICMP); }
> >  	YY_BREAK
> >  case 93:
> >  YY_RULE_SETUP
> > -#line 288 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 293 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(OtherOpVal, FCmpOp, FCMP); }
> >  	YY_BREAK
> >  case 94:
> >  YY_RULE_SETUP
> > -#line 290 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 295 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return EQ; }
> >  	YY_BREAK
> >  case 95:
> >  YY_RULE_SETUP
> > -#line 291 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 296 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return NE; }
> >  	YY_BREAK
> >  case 96:
> >  YY_RULE_SETUP
> > -#line 292 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 297 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return SLT; }
> >  	YY_BREAK
> >  case 97:
> >  YY_RULE_SETUP
> > -#line 293 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 298 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return SGT; }
> >  	YY_BREAK
> >  case 98:
> >  YY_RULE_SETUP
> > -#line 294 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 299 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return SLE; }
> >  	YY_BREAK
> >  case 99:
> >  YY_RULE_SETUP
> > -#line 295 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 300 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return SGE; }
> >  	YY_BREAK
> >  case 100:
> >  YY_RULE_SETUP
> > -#line 296 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 301 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return ULT; }
> >  	YY_BREAK
> >  case 101:
> >  YY_RULE_SETUP
> > -#line 297 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 302 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return UGT; }
> >  	YY_BREAK
> >  case 102:
> >  YY_RULE_SETUP
> > -#line 298 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 303 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return ULE; }
> >  	YY_BREAK
> >  case 103:
> >  YY_RULE_SETUP
> > -#line 299 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 304 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return UGE; }
> >  	YY_BREAK
> >  case 104:
> >  YY_RULE_SETUP
> > -#line 300 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 305 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return OEQ; }
> >  	YY_BREAK
> >  case 105:
> >  YY_RULE_SETUP
> > -#line 301 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 306 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return ONE; }
> >  	YY_BREAK
> >  case 106:
> >  YY_RULE_SETUP
> > -#line 302 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 307 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return OLT; }
> >  	YY_BREAK
> >  case 107:
> >  YY_RULE_SETUP
> > -#line 303 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 308 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return OGT; }
> >  	YY_BREAK
> >  case 108:
> >  YY_RULE_SETUP
> > -#line 304 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 309 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return OLE; }
> >  	YY_BREAK
> >  case 109:
> >  YY_RULE_SETUP
> > -#line 305 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 310 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return OGE; }
> >  	YY_BREAK
> >  case 110:
> >  YY_RULE_SETUP
> > -#line 306 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 311 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return ORD; }
> >  	YY_BREAK
> >  case 111:
> >  YY_RULE_SETUP
> > -#line 307 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 312 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return UNO; }
> >  	YY_BREAK
> >  case 112:
> >  YY_RULE_SETUP
> > -#line 308 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 313 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return UEQ; }
> >  	YY_BREAK
> >  case 113:
> >  YY_RULE_SETUP
> > -#line 309 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 314 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return UNE; }
> >  	YY_BREAK
> >  case 114:
> >  YY_RULE_SETUP
> > -#line 311 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 316 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(OtherOpVal, PHIOp, PHI_TOK); }
> >  	YY_BREAK
> >  case 115:
> >  YY_RULE_SETUP
> > -#line 312 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 317 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(OtherOpVal, CallOp, CALL); }
> >  	YY_BREAK
> >  case 116:
> >  YY_RULE_SETUP
> > -#line 313 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 318 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(CastOpVal, CastOp, CAST);  }
> >  	YY_BREAK
> >  case 117:
> >  YY_RULE_SETUP
> > -#line 314 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 319 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(CastOpVal, TruncOp, TRUNC); }
> >  	YY_BREAK
> >  case 118:
> >  YY_RULE_SETUP
> > -#line 315 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 320 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(CastOpVal, ZExtOp , ZEXT); }
> >  	YY_BREAK
> >  case 119:
> >  YY_RULE_SETUP
> > -#line 316 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 321 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(CastOpVal, SExtOp, SEXT); }
> >  	YY_BREAK
> >  case 120:
> >  YY_RULE_SETUP
> > -#line 317 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 322 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(CastOpVal, FPTruncOp, FPTRUNC); }
> >  	YY_BREAK
> >  case 121:
> >  YY_RULE_SETUP
> > -#line 318 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 323 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(CastOpVal, FPExtOp, FPEXT); }
> >  	YY_BREAK
> >  case 122:
> >  YY_RULE_SETUP
> > -#line 319 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 324 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(CastOpVal, FPToUIOp, FPTOUI); }
> >  	YY_BREAK
> >  case 123:
> >  YY_RULE_SETUP
> > -#line 320 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 325 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(CastOpVal, FPToSIOp, FPTOSI); }
> >  	YY_BREAK
> >  case 124:
> >  YY_RULE_SETUP
> > -#line 321 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 326 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(CastOpVal, UIToFPOp, UITOFP); }
> >  	YY_BREAK
> >  case 125:
> >  YY_RULE_SETUP
> > -#line 322 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 327 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(CastOpVal, SIToFPOp, SITOFP); }
> >  	YY_BREAK
> >  case 126:
> >  YY_RULE_SETUP
> > -#line 323 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 328 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(CastOpVal, PtrToIntOp, PTRTOINT); }
> >  	YY_BREAK
> >  case 127:
> >  YY_RULE_SETUP
> > -#line 324 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 329 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(CastOpVal, IntToPtrOp, INTTOPTR); }
> >  	YY_BREAK
> >  case 128:
> >  YY_RULE_SETUP
> > -#line 325 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 330 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(CastOpVal, BitCastOp, BITCAST); }
> >  	YY_BREAK
> >  case 129:
> >  YY_RULE_SETUP
> > -#line 326 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 331 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(OtherOpVal, SelectOp, SELECT); }
> >  	YY_BREAK
> >  case 130:
> >  YY_RULE_SETUP
> > -#line 327 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 332 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return VANEXT_old; }
> >  	YY_BREAK
> >  case 131:
> >  YY_RULE_SETUP
> > -#line 328 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 333 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return VAARG_old; }
> >  	YY_BREAK
> >  case 132:
> >  YY_RULE_SETUP
> > -#line 329 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 334 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(OtherOpVal, VAArg , VAARG); }
> >  	YY_BREAK
> >  case 133:
> >  YY_RULE_SETUP
> > -#line 330 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 335 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(TermOpVal, RetOp, RET); }
> >  	YY_BREAK
> >  case 134:
> >  YY_RULE_SETUP
> > -#line 331 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 336 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(TermOpVal, BrOp, BR); }
> >  	YY_BREAK
> >  case 135:
> >  YY_RULE_SETUP
> > -#line 332 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 337 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(TermOpVal, SwitchOp, SWITCH); }
> >  	YY_BREAK
> >  case 136:
> >  YY_RULE_SETUP
> > -#line 333 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 338 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(TermOpVal, InvokeOp, INVOKE); }
> >  	YY_BREAK
> >  case 137:
> >  YY_RULE_SETUP
> > -#line 334 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 339 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return UNWIND; }
> >  	YY_BREAK
> >  case 138:
> >  YY_RULE_SETUP
> > -#line 335 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 340 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(TermOpVal, UnreachableOp, UNREACHABLE); }
> >  	YY_BREAK
> >  case 139:
> >  YY_RULE_SETUP
> > -#line 337 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 342 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(MemOpVal, MallocOp, MALLOC); }
> >  	YY_BREAK
> >  case 140:
> >  YY_RULE_SETUP
> > -#line 338 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 343 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(MemOpVal, AllocaOp, ALLOCA); }
> >  	YY_BREAK
> >  case 141:
> >  YY_RULE_SETUP
> > -#line 339 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 344 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(MemOpVal, FreeOp, FREE); }
> >  	YY_BREAK
> >  case 142:
> >  YY_RULE_SETUP
> > -#line 340 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 345 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(MemOpVal, LoadOp, LOAD); }
> >  	YY_BREAK
> >  case 143:
> >  YY_RULE_SETUP
> > -#line 341 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 346 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(MemOpVal, StoreOp, STORE); }
> >  	YY_BREAK
> >  case 144:
> >  YY_RULE_SETUP
> > -#line 342 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 347 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(MemOpVal, GetElementPtrOp, GETELEMENTPTR); }
> >  	YY_BREAK
> >  case 145:
> >  YY_RULE_SETUP
> > -#line 344 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 349 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(OtherOpVal, ExtractElementOp, EXTRACTELEMENT); }
> >  	YY_BREAK
> >  case 146:
> >  YY_RULE_SETUP
> > -#line 345 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 350 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(OtherOpVal, InsertElementOp, INSERTELEMENT); }
> >  	YY_BREAK
> >  case 147:
> >  YY_RULE_SETUP
> > -#line 346 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 351 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { RET_TOK(OtherOpVal, ShuffleVectorOp, SHUFFLEVECTOR); }
> >  	YY_BREAK
> >  case 148:
> >  YY_RULE_SETUP
> > -#line 349 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 354 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  {
> >                    UnEscapeLexed(yytext+1);
> >                    Upgradelval.StrVal = strdup(yytext 
> > +1);             // Skip %
> > @@ -2076,7 +2081,7 @@
> >  	YY_BREAK
> >  case 149:
> >  YY_RULE_SETUP
> > -#line 354 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 359 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  {
> >                    yytext[strlen(yytext)-1] = 0;  // nuke colon
> >                    UnEscapeLexed(yytext);
> > @@ -2086,7 +2091,7 @@
> >  	YY_BREAK
> >  case 150:
> >  YY_RULE_SETUP
> > -#line 360 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 365 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  {
> >                    yytext[strlen(yytext)-2] = 0;  // nuke colon,  
> > end quote
> >                    UnEscapeLexed(yytext+1);
> > @@ -2096,7 +2101,7 @@
> >  	YY_BREAK
> >  case 151:
> >  YY_RULE_SETUP
> > -#line 367 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 372 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { // Note that we cannot unescape a string constant here!  The
> >                     // string constant might contain a \00 which  
> > would not be
> >                     // understood by the string stuff.  It is valid  
> > to make a
> > @@ -2109,12 +2114,12 @@
> >  	YY_BREAK
> >  case 152:
> >  YY_RULE_SETUP
> > -#line 378 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 383 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { Upgradelval.UInt64Val = atoull(yytext); return EUINT64VAL; }
> >  	YY_BREAK
> >  case 153:
> >  YY_RULE_SETUP
> > -#line 379 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 384 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  {
> >                    uint64_t Val = atoull(yytext+1);
> >                    // +1:  we have bigger negative range
> > @@ -2126,7 +2131,7 @@
> >  	YY_BREAK
> >  case 154:
> >  YY_RULE_SETUP
> > -#line 387 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 392 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  {
> >                     Upgradelval.UInt64Val = HexIntToVal(yytext+3);
> >                     return yytext[0] == 's' ? ESINT64VAL : EUINT64VAL;
> > @@ -2134,7 +2139,7 @@
> >  	YY_BREAK
> >  case 155:
> >  YY_RULE_SETUP
> > -#line 392 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 397 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  {
> >                    uint64_t Val = atoull(yytext+1);
> >                    if ((unsigned)Val != Val)
> > @@ -2145,7 +2150,7 @@
> >  	YY_BREAK
> >  case 156:
> >  YY_RULE_SETUP
> > -#line 399 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 404 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  {
> >                    uint64_t Val = atoull(yytext+2);
> >                    // +1:  we have bigger negative range
> > @@ -2157,16 +2162,16 @@
> >  	YY_BREAK
> >  case 157:
> >  YY_RULE_SETUP
> > -#line 408 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 413 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { Upgradelval.FPVal = atof(yytext); return FPVAL; }
> >  	YY_BREAK
> >  case 158:
> >  YY_RULE_SETUP
> > -#line 409 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 414 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { Upgradelval.FPVal = HexToFP(yytext); return FPVAL; }
> >  	YY_BREAK
> >  case YY_STATE_EOF(INITIAL):
> > -#line 411 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 416 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  {
> >                    /* Make sure to free the internal buffers for  
> > flex when we are
> >                     * done reading our input!
> > @@ -2177,20 +2182,20 @@
> >  	YY_BREAK
> >  case 159:
> >  YY_RULE_SETUP
> > -#line 419 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 424 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { /* Ignore whitespace */ }
> >  	YY_BREAK
> >  case 160:
> >  YY_RULE_SETUP
> > -#line 420 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 425 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  { return yytext[0]; }
> >  	YY_BREAK
> >  case 161:
> >  YY_RULE_SETUP
> > -#line 422 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 427 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >  YY_FATAL_ERROR( "flex scanner jammed" );
> >  	YY_BREAK
> > -#line 2194 "UpgradeLexer.cpp"
> > +#line 2199 "UpgradeLexer.cpp"
> >
> >  	case YY_END_OF_BUFFER:
> >  		{
> > @@ -3068,5 +3073,5 @@
> >  	return 0;
> >  	}
> >  #endif
> > -#line 422 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> > +#line 427 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeLexer.l"
> >
> >
> >
> > Index: llvm/tools/llvm-upgrade/UpgradeLexer.l.cvs
> > diff -u llvm/tools/llvm-upgrade/UpgradeLexer.l.cvs:1.19 llvm/tools/ 
> > llvm-upgrade/UpgradeLexer.l.cvs:1.20
> > --- llvm/tools/llvm-upgrade/UpgradeLexer.l.cvs:1.19	Wed Feb  7  
> > 18:21:40 2007
> > +++ llvm/tools/llvm-upgrade/UpgradeLexer.l.cvs	Wed Mar 21 12:15:50  
> > 2007
> > @@ -51,7 +51,12 @@
> >
> >  #define RET_TY(sym,NewTY,sign) \
> >    Upgradelval.PrimType.T = NewTY; \
> > -  Upgradelval.PrimType.S = sign; \
> > +  switch (sign) { \
> > +    case 0: Upgradelval.PrimType.S.makeSignless(); break; \
> > +    case 1: Upgradelval.PrimType.S.makeUnsigned(); break; \
> > +    case 2: Upgradelval.PrimType.S.makeSigned(); break; \
> > +    default: assert(0 && "Invalid sign kind"); break; \
> > +  }\
> >    return sym
> >
> >  namespace llvm {
> > @@ -238,24 +243,24 @@
> >  x86_stdcallcc   { return X86_STDCALLCC_TOK; }
> >  x86_fastcallcc  { return X86_FASTCALLCC_TOK; }
> >
> > -sbyte           { RET_TY(SBYTE,  Type::Int8Ty,  Signed);  }
> > -ubyte           { RET_TY(UBYTE,  Type::Int8Ty,  Unsigned); }
> > -i8              { RET_TY(UBYTE,  Type::Int8Ty,  Unsigned); }
> > -short           { RET_TY(SHORT,  Type::Int16Ty, Signed);  }
> > -ushort          { RET_TY(USHORT, Type::Int16Ty, Unsigned); }
> > -i16             { RET_TY(USHORT, Type::Int16Ty, Unsigned); }
> > -int             { RET_TY(INT,    Type::Int32Ty, Signed);  }
> > -uint            { RET_TY(UINT,   Type::Int32Ty, Unsigned); }
> > -i32             { RET_TY(UINT,   Type::Int32Ty, Unsigned); }
> > -long            { RET_TY(LONG,   Type::Int64Ty, Signed);  }
> > -ulong           { RET_TY(ULONG,  Type::Int64Ty, Unsigned); }
> > -i64             { RET_TY(ULONG,  Type::Int64Ty, Unsigned); }
> > -void            { RET_TY(VOID,   Type::VoidTy,  Signless  ); }
> > -bool            { RET_TY(BOOL,   Type::Int1Ty,  Unsigned  ); }
> > -i1              { RET_TY(BOOL,   Type::Int1Ty,  Unsigned  ); }
> > -float           { RET_TY(FLOAT,  Type::FloatTy, Signless ); }
> > -double          { RET_TY(DOUBLE, Type::DoubleTy,Signless); }
> > -label           { RET_TY(LABEL,  Type::LabelTy, Signless ); }
> > +sbyte           { RET_TY(SBYTE,  Type::Int8Ty,  2); }
> > +ubyte           { RET_TY(UBYTE,  Type::Int8Ty,  1); }
> > +i8              { RET_TY(UBYTE,  Type::Int8Ty,  1); }
> > +short           { RET_TY(SHORT,  Type::Int16Ty, 2); }
> > +ushort          { RET_TY(USHORT, Type::Int16Ty, 1); }
> > +i16             { RET_TY(USHORT, Type::Int16Ty, 1); }
> > +int             { RET_TY(INT,    Type::Int32Ty, 2); }
> > +uint            { RET_TY(UINT,   Type::Int32Ty, 1); }
> > +i32             { RET_TY(UINT,   Type::Int32Ty, 1); }
> > +long            { RET_TY(LONG,   Type::Int64Ty, 2); }
> > +ulong           { RET_TY(ULONG,  Type::Int64Ty, 1); }
> > +i64             { RET_TY(ULONG,  Type::Int64Ty, 1); }
> > +void            { RET_TY(VOID,   Type::VoidTy,  0); }
> > +bool            { RET_TY(BOOL,   Type::Int1Ty,  1); }
> > +i1              { RET_TY(BOOL,   Type::Int1Ty,  1); }
> > +float           { RET_TY(FLOAT,  Type::FloatTy, 0); }
> > +double          { RET_TY(DOUBLE, Type::DoubleTy,0); }
> > +label           { RET_TY(LABEL,  Type::LabelTy, 0); }
> >  type            { return TYPE;   }
> >  opaque          { return OPAQUE; }
> >
> >
> >
> > Index: llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs
> > diff -u llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.66 llvm/ 
> > tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.67
> > --- llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs:1.66	Wed Mar 14  
> > 22:26:42 2007
> > +++ llvm/tools/llvm-upgrade/UpgradeParser.cpp.cvs	Wed Mar 21  
> > 12:15:50 2007
> > @@ -427,7 +427,7 @@
> >  //
> >  typedef std::vector<Value *> ValueList;           // Numbered defs
> >
> > -typedef std::pair<std::string,const Type*> RenameMapKey;
> > +typedef std::pair<std::string,TypeInfo> RenameMapKey;
> >  typedef std::map<RenameMapKey,std::string> RenameMapType;
> >
> >  static void
> > @@ -438,7 +438,10 @@
> >    Module *CurrentModule;
> >    std::map<const Type *, ValueList> Values; // Module level  
> > numbered definitions
> >    std::map<const Type *,ValueList> LateResolveValues;
> > -  std::vector<PATypeHolder>    Types;
> > +  std::vector<PATypeHolder> Types;
> > +  std::vector<Signedness> TypeSigns;
> > +  std::map<std::string,Signedness> NamedTypeSigns;
> > +  std::map<std::string,Signedness> NamedValueSigns;
> >    std::map<ValID, PATypeHolder> LateResolveTypes;
> >    static Module::Endianness Endian;
> >    static Module::PointerSize PointerSize;
> > @@ -495,6 +498,9 @@
> >
> >      Values.clear();         // Clear out function local definitions
> >      Types.clear();
> > +    TypeSigns.clear();
> > +    NamedTypeSigns.clear();
> > +    NamedValueSigns.clear();
> >      CurrentModule = 0;
> >    }
> >
> > @@ -568,6 +574,24 @@
> >
> >  static bool inFunctionScope() { return CurFun.CurrentFunction != 0; }
> >
> > +/// This function is just a utility to make a Key value for the  
> > rename map.
> > +/// The Key is a combination of the name, type, Signedness of the  
> > original
> > +/// value (global/function). This just constructs the key and  
> > ensures that
> > +/// named Signedness values are resolved to the actual Signedness.
> > +/// @brief Make a key for the RenameMaps
> > +static RenameMapKey makeRenameMapKey(const std::string &Name,  
> > const Type* Ty,
> > +                                     const Signedness &Sign) {
> > +  TypeInfo TI;
> > +  TI.T = Ty;
> > +  if (Sign.isNamed())
> > +    // Don't allow Named Signedness nodes because they won't  
> > match. The actual
> > +    // Signedness must be looked up in the NamedTypeSigns map.
> > +    TI.S.copy(CurModule.NamedTypeSigns[Sign.getName()]);
> > +  else
> > +    TI.S.copy(Sign);
> > +  return std::make_pair(Name, TI);
> > +}
> > +
> >
> >  // 
> > ===------------------------------------------------------------------- 
> > ---===//
> >  //               Code to handle definitions of all the types
> > @@ -593,7 +617,6 @@
> >      break;
> >    case ValID::NameVal:                 // Is it a named definition?
> >      if (const Type *N = CurModule.CurrentModule->getTypeByName 
> > (D.Name)) {
> > -      D.destroy();  // Free old strdup'd memory...
> >        return N;
> >      }
> >      break;
> > @@ -608,7 +631,6 @@
> >    //
> >    if (DoNotImprovise) return 0;  // Do we just want a null to be  
> > returned?
> >
> > -
> >    if (inFunctionScope()) {
> >      if (D.Type == ValID::NameVal) {
> >        error("Reference to an undefined type: '" + D.getName() + "'");
> > @@ -626,13 +648,94 @@
> >    Type *Typ = OpaqueType::get();
> >    CurModule.LateResolveTypes.insert(std::make_pair(D, Typ));
> >    return Typ;
> > - }
> > +}
> > +
> > +/// This is like the getType method except that instead of looking  
> > up the type
> > +/// for a given ID, it looks up that type's sign.
> > +/// @brief Get the signedness of a referenced type
> > +static Signedness getTypeSign(const ValID &D) {
> > +  switch (D.Type) {
> > +  case ValID::NumberVal:               // Is it a numbered  
> > definition?
> > +    // Module constants occupy the lowest numbered slots...
> > +    if ((unsigned)D.Num < CurModule.TypeSigns.size()) {
> > +      return CurModule.TypeSigns[(unsigned)D.Num];
> > +    }
> > +    break;
> > +  case ValID::NameVal: {               // Is it a named definition?
> > +    std::map<std::string,Signedness>::const_iterator I =
> > +      CurModule.NamedTypeSigns.find(D.Name);
> > +    if (I != CurModule.NamedTypeSigns.end())
> > +      return I->second;
> > +    // Perhaps its a named forward .. just cache the name
> > +    Signedness S;
> > +    S.makeNamed(D.Name);
> > +    return S;
> > +  }
> > +  default:
> > +    break;
> > +  }
> > +  // If we don't find it, its signless
> > +  Signedness S;
> > +  S.makeSignless();
> > +  return S;
> > +}
> > +
> > +/// This function is analagous to getElementType in LLVM. It  
> > provides the same
> > +/// function except that it looks up the Signedness instead of the  
> > type. This is
> > +/// used when processing GEP instructions that need to extract the  
> > type of an
> > +/// indexed struct/array/ptr member.
> > +/// @brief Look up an element's sign.
> > +static Signedness getElementSign(const ValueInfo& VI,
> > +                                 const std::vector<Value*>  
> > &Indices) {
> > +  const Type *Ptr = VI.V->getType();
> > +  assert(isa<PointerType>(Ptr) && "Need pointer type");
> > +
> > +  unsigned CurIdx = 0;
> > +  Signedness S(VI.S);
> > +  while (const CompositeType *CT = dyn_cast<CompositeType>(Ptr)) {
> > +    if (CurIdx == Indices.size())
> > +      break;
> > +
> > +    Value *Index = Indices[CurIdx++];
> > +    assert(!isa<PointerType>(CT) || CurIdx == 1 && "Invalid type");
> > +    Ptr = CT->getTypeAtIndex(Index);
> > +    if (const Type* Ty = Ptr->getForwardedType())
> > +      Ptr = Ty;
> > +    assert(S.isComposite() && "Bad Signedness type");
> > +    if (isa<StructType>(CT)) {
> > +      S = S.get(cast<ConstantInt>(Index)->getZExtValue());
> > +    } else {
> > +      S = S.get(0UL);
> > +    }
> > +    if (S.isNamed())
> > +      S = CurModule.NamedTypeSigns[S.getName()];
> > +  }
> > +  Signedness Result;
> > +  Result.makeComposite(S);
> > +  return Result;
> > +}
> > +
> > +/// This function just translates a ConstantInfo into a ValueInfo  
> > and calls
> > +/// getElementSign(ValueInfo,...). Its just a convenience.
> > +/// @brief ConstantInfo version of getElementSign.
> > +static Signedness getElementSign(const ConstInfo& CI,
> > +                                 const std::vector<Constant*>  
> > &Indices) {
> > +  ValueInfo VI;
> > +  VI.V = CI.C;
> > +  VI.S.copy(CI.S);
> > +  std::vector<Value*> Idx;
> > +  for (unsigned i = 0; i < Indices.size(); ++i)
> > +    Idx.push_back(Indices[i]);
> > +  Signedness result = getElementSign(VI, Idx);
> > +  VI.destroy();
> > +  return result;
> > +}
> >
> >  /// This function determines if two function types differ only in  
> > their use of
> >  /// the sret parameter attribute in the first argument. If they  
> > are identical
> >  /// in all other respects, it returns true. Otherwise, it returns  
> > false.
> > -bool FuncTysDifferOnlyBySRet(const FunctionType *F1,
> > -                                   const FunctionType *F2) {
> > +static bool FuncTysDifferOnlyBySRet(const FunctionType *F1,
> > +                                    const FunctionType *F2) {
> >    if (F1->getReturnType() != F2->getReturnType() ||
> >        F1->getNumParams() != F2->getNumParams() ||
> >        F1->getParamAttrs(0) != F2->getParamAttrs(0))
> > @@ -647,10 +750,27 @@
> >    return true;
> >  }
> >
> > +/// This function determines if the type of V and Ty differ only  
> > by the SRet
> > +/// parameter attribute. This is a more generalized case of
> > +/// FuncTysDIfferOnlyBySRet since it doesn't require FunctionType  
> > arguments.
> > +static bool TypesDifferOnlyBySRet(Value *V, const Type* Ty) {
> > +  if (V->getType() == Ty)
> > +    return true;
> > +  const PointerType *PF1 = dyn_cast<PointerType>(Ty);
> > +  const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
> > +  if (PF1 && PF2) {
> > +    const FunctionType* FT1 = dyn_cast<FunctionType>(PF1- 
> > >getElementType());
> > +    const FunctionType* FT2 = dyn_cast<FunctionType>(PF2- 
> > >getElementType());
> > +    if (FT1 && FT2)
> > +      return FuncTysDifferOnlyBySRet(FT1, FT2);
> > +  }
> > +  return false;
> > +}
> > +
> >  // The upgrade of csretcc to sret param attribute may have caused  
> > a function
> >  // to not be found because the param attribute changed the type of  
> > the called
> >  // function. This helper function, used in getExistingValue,  
> > detects that
> > -// situation and returns V if it occurs and 0 otherwise.
> > +// situation and bitcasts the function to the correct type.
> >  static Value* handleSRetFuncTypeMerge(Value *V, const Type* Ty) {
> >    // Handle degenerate cases
> >    if (!V)
> > @@ -658,23 +778,21 @@
> >    if (V->getType() == Ty)
> >      return V;
> >
> > -  Value* Result = 0;
> >    const PointerType *PF1 = dyn_cast<PointerType>(Ty);
> >    const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
> >    if (PF1 && PF2) {
> > -    const FunctionType *FT1 =
> > -      dyn_cast<FunctionType>(PF1->getElementType());
> > -    const FunctionType *FT2 =
> > -      dyn_cast<FunctionType>(PF2->getElementType());
> > +    const FunctionType *FT1 = dyn_cast<FunctionType>(PF1- 
> > >getElementType());
> > +    const FunctionType *FT2 = dyn_cast<FunctionType>(PF2- 
> > >getElementType());
> >      if (FT1 && FT2 && FuncTysDifferOnlyBySRet(FT1, FT2))
> >        if (FT2->paramHasAttr(1, FunctionType::StructRetAttribute))
> > -        Result = V;
> > +        return V;
> >        else if (Constant *C = dyn_cast<Constant>(V))
> > -        Result = ConstantExpr::getBitCast(C, PF1);
> > +        return ConstantExpr::getBitCast(C, PF1);
> >        else
> > -        Result = new BitCastInst(V, PF1, "upgrd.cast", CurBB);
> > +        return new BitCastInst(V, PF1, "upgrd.cast", CurBB);
> > +
> >    }
> > -  return Result;
> > +  return 0;
> >  }
> >
> >  // getExistingValue - Look up the value specified by the provided  
> > type and
> > @@ -710,9 +828,8 @@
> >
> >    case ValID::NameVal: {                // Is it a named definition?
> >      // Get the name out of the ID
> > -    std::string Name(D.Name);
> > -    Value* V = 0;
> > -    RenameMapKey Key = std::make_pair(Name, Ty);
> > +    RenameMapKey Key = makeRenameMapKey(D.Name, Ty, D.S);
> > +    Value *V = 0;
> >      if (inFunctionScope()) {
> >        // See if the name was renamed
> >        RenameMapType::const_iterator I = CurFun.RenameMap.find(Key);
> > @@ -720,10 +837,12 @@
> >        if (I != CurFun.RenameMap.end())
> >          LookupName = I->second;
> >        else
> > -        LookupName = Name;
> > +        LookupName = D.Name;
> >        ValueSymbolTable &SymTab = CurFun.CurrentFunction- 
> > >getValueSymbolTable();
> >        V = SymTab.lookup(LookupName);
> > -      V = handleSRetFuncTypeMerge(V, Ty);
> > +      if (V && V->getType() != Ty)
> > +        V = handleSRetFuncTypeMerge(V, Ty);
> > +      assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong  
> > type");
> >      }
> >      if (!V) {
> >        RenameMapType::const_iterator I = CurModule.RenameMap.find 
> > (Key);
> > @@ -731,9 +850,11 @@
> >        if (I != CurModule.RenameMap.end())
> >          LookupName = I->second;
> >        else
> > -        LookupName = Name;
> > +        LookupName = D.Name;
> >        V = CurModule.CurrentModule->getValueSymbolTable().lookup 
> > (LookupName);
> > -      V = handleSRetFuncTypeMerge(V, Ty);
> > +      if (V && V->getType() != Ty)
> > +        V = handleSRetFuncTypeMerge(V, Ty);
> > +      assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong  
> > type");
> >      }
> >      if (!V)
> >        return 0;
> > @@ -866,14 +987,13 @@
> >      break;
> >    case ValID::NameVal:                  // Is it a named definition?
> >      Name = ID.Name;
> > -    if (Value *N = CurFun.CurrentFunction->
> > -                   getValueSymbolTable().lookup(Name)) {
> > +    if (Value *N = CurFun.CurrentFunction->getValueSymbolTable 
> > ().lookup(Name)) {
> >        if (N->getType() != Type::LabelTy) {
> >          // Register names didn't use to conflict with basic block  
> > names
> >          // because of type planes. Now they all have to be unique.  
> > So, we just
> >          // rename the register and treat this name as if no basic  
> > block
> >          // had been found.
> > -        RenameMapKey Key = std::make_pair(N->getName(),N->getType());
> > +        RenameMapKey Key = makeRenameMapKey(ID.Name, N->getType(),  
> > ID.S);
> >          N->setName(makeNameUnique(N->getName()));
> >          CurModule.RenameMap[Key] = N->getName();
> >          BB = 0;
> > @@ -984,19 +1104,33 @@
> >    LateResolvers.clear();
> >  }
> >
> > -// ResolveTypeTo - A brand new type was just declared.  This means  
> > that (if
> > -// name is not null) things referencing Name can be resolved.   
> > Otherwise, things
> > -// refering to the number can be resolved.  Do this now.
> > -//
> > -static void ResolveTypeTo(char *Name, const Type *ToTy) {
> > +/// This function is used for type resolution and upref handling.  
> > When a type
> > +/// becomes concrete, this function is called to adjust the  
> > signedness for the
> > +/// concrete type.
> > +static void ResolveTypeSign(const Type* oldTy, const Signedness  
> > &Sign) {
> > +  std::string TyName = CurModule.CurrentModule->getTypeName(oldTy);
> > +  if (!TyName.empty())
> > +    CurModule.NamedTypeSigns[TyName] = Sign;
> > +}
> > +
> > +/// ResolveTypeTo - A brand new type was just declared.  This  
> > means that (if
> > +/// name is not null) things referencing Name can be resolved.   
> > Otherwise,
> > +/// things refering to the number can be resolved.  Do this now.
> > +static void ResolveTypeTo(char *Name, const Type *ToTy, const  
> > Signedness& Sign){
> >    ValID D;
> > -  if (Name) D = ValID::create(Name);
> > -  else      D = ValID::create((int)CurModule.Types.size());
> > +  if (Name)
> > +    D = ValID::create(Name);
> > +  else
> > +    D = ValID::create((int)CurModule.Types.size());
> > +  D.S.copy(Sign);
> > +
> > +  CurModule.NamedTypeSigns[Name] = Sign;
> >
> >    std::map<ValID, PATypeHolder>::iterator I =
> >      CurModule.LateResolveTypes.find(D);
> >    if (I != CurModule.LateResolveTypes.end()) {
> > -    ((DerivedType*)I->second.get())->refineAbstractTypeTo(ToTy);
> > +    const Type *OldTy = I->second.get();
> > +    ((DerivedType*)OldTy)->refineAbstractTypeTo(ToTy);
> >      CurModule.LateResolveTypes.erase(I);
> >    }
> >  }
> > @@ -1056,12 +1190,12 @@
> >  // null potentially, in which case this is a noop.  The string  
> > passed in is
> >  // assumed to be a malloc'd string buffer, and is free'd by this  
> > function.
> >  //
> > -static void setValueName(Value *V, char *NameStr) {
> > +static void setValueName(const ValueInfo &V, char *NameStr) {
> >    if (NameStr) {
> >      std::string Name(NameStr);      // Copy string
> >      free(NameStr);                  // Free old string
> >
> > -    if (V->getType() == Type::VoidTy) {
> > +    if (V.V->getType() == Type::VoidTy) {
> >        error("Can't assign name '" + Name + "' to value with void  
> > type");
> >        return;
> >      }
> > @@ -1074,13 +1208,13 @@
> >      if (Existing) {
> >        // An existing value of the same name was found. This might  
> > have happened
> >        // because of the integer type planes collapsing in LLVM 2.0.
> > -      if (Existing->getType() == V->getType() &&
> > +      if (Existing->getType() == V.V->getType() &&
> >            !TypeHasInteger(Existing->getType())) {
> >          // If the type does not contain any integers in them then  
> > this can't be
> >          // a type plane collapsing issue. It truly is a  
> > redefinition and we
> >          // should error out as the assembly is invalid.
> >          error("Redefinition of value named '" + Name + "' of type  
> > '" +
> > -              V->getType()->getDescription() + "'");
> > +              V.V->getType()->getDescription() + "'");
> >          return;
> >        }
> >        // In LLVM 2.0 we don't allow names to be re-used for any  
> > values in a
> > @@ -1094,13 +1228,13 @@
> >        // We're changing the name but it will probably be used by  
> > other
> >        // instructions as operands later on. Consequently we have  
> > to retain
> >        // a mapping of the renaming that we're doing.
> > -      RenameMapKey Key = std::make_pair(Name,V->getType());
> > +      RenameMapKey Key = makeRenameMapKey(Name, V.V->getType(), V.S);
> >        CurFun.RenameMap[Key] = NewName;
> >        Name = NewName;
> >      }
> >
> >      // Set the name.
> > -    V->setName(Name);
> > +    V.V->setName(Name);
> >    }
> >  }
> >
> > @@ -1109,7 +1243,8 @@
> >  static GlobalVariable *
> >  ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage,
> >                      bool isConstantGlobal, const Type *Ty,
> > -                    Constant *Initializer) {
> > +                    Constant *Initializer,
> > +                    const Signedness &Sign) {
> >    if (isa<FunctionType>(Ty))
> >      error("Cannot declare global vars of function type");
> >
> > @@ -1129,6 +1264,7 @@
> >    } else {
> >      ID = ValID::create((int)CurModule.Values[PTy].size());
> >    }
> > +  ID.S.makeComposite(Sign);
> >
> >    if (GlobalValue *FWGV = CurModule.GetForwardRefForGlobal(PTy,  
> > ID)) {
> >      // Move the global to the end of the list, from whereever it was
> > @@ -1154,13 +1290,7 @@
> >        // There is alread a global of the same name which means  
> > there is a
> >        // conflict. Let's see what we can do about it.
> >        std::string NewName(makeNameUnique(Name));
> > -      if (Linkage == GlobalValue::InternalLinkage) {
> > -        // The linkage type is internal so just warn about the  
> > rename without
> > -        // invoking "scarey language" about linkage failures.  
> > GVars with
> > -        // InternalLinkage can be renamed at will.
> > -        warning("Global variable '" + Name + "' was renamed to '"+
> > -                NewName + "'");
> > -      } else {
> > +      if (Linkage != GlobalValue::InternalLinkage) {
> >          // The linkage of this gval is external so we can't  
> > reliably rename
> >          // it because it could potentially create a linking problem.
> >          // However, we can't leave the name conflict in the output  
> > either or
> > @@ -1171,7 +1301,7 @@
> >        }
> >
> >        // Put the renaming in the global rename map
> > -      RenameMapKey Key = std::make_pair(Name,PointerType::get(Ty));
> > +      RenameMapKey Key = makeRenameMapKey(Name, PointerType::get 
> > (Ty), ID.S);
> >        CurModule.RenameMap[Key] = NewName;
> >
> >        // Rename it
> > @@ -1184,6 +1314,8 @@
> >      new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer,  
> > Name,
> >                         CurModule.CurrentModule);
> >    InsertValue(GV, CurModule.Values);
> > +  // Remember the sign of this global.
> > +  CurModule.NamedValueSigns[Name] = ID.S;
> >    return GV;
> >  }
> >
> > @@ -1194,21 +1326,26 @@
> >  // This function returns true if the type has already been  
> > defined, but is
> >  // allowed to be redefined in the specified context.  If the name  
> > is a new name
> >  // for the type plane, it is inserted and false is returned.
> > -static bool setTypeName(const Type *T, char *NameStr) {
> > +static bool setTypeName(const PATypeInfo& TI, char *NameStr) {
> >    assert(!inFunctionScope() && "Can't give types function-local  
> > names");
> >    if (NameStr == 0) return false;
> >
> >    std::string Name(NameStr);      // Copy string
> >    free(NameStr);                  // Free old string
> >
> > +  const Type* Ty = TI.PAT->get();
> > +
> >    // We don't allow assigning names to void type
> > -  if (T == Type::VoidTy) {
> > +  if (Ty == Type::VoidTy) {
> >      error("Can't assign name '" + Name + "' to the void type");
> >      return false;
> >    }
> >
> >    // Set the type name, checking for conflicts as we do so.
> > -  bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name, T);
> > +  bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name,  
> > Ty);
> > +
> > +  // Save the sign information for later use
> > +  CurModule.NamedTypeSigns[Name] = TI.S;
> >
> >    if (AlreadyExists) {   // Inserting a name that is already  
> > defined???
> >      const Type *Existing = CurModule.CurrentModule->getTypeByName 
> > (Name);
> > @@ -1218,7 +1355,7 @@
> >      // opaque type.  In this case, Existing will be an opaque type.
> >      if (const OpaqueType *OpTy = dyn_cast<OpaqueType>(Existing)) {
> >        // We ARE replacing an opaque type!
> > -      const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(T);
> > +      const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(Ty);
> >        return true;
> >      }
> >
> > @@ -1226,11 +1363,11 @@
> >      // the redefinition is identical to the original. This will be  
> > so if
> >      // Existing and T point to the same Type object. In this one  
> > case we
> >      // allow the equivalent redefinition.
> > -    if (Existing == T) return true;  // Yes, it's equal.
> > +    if (Existing == Ty) return true;  // Yes, it's equal.
> >
> >      // Any other kind of (non-equivalent) redefinition is an error.
> >      error("Redefinition of type named '" + Name + "' in the '" +
> > -          T->getDescription() + "' type plane");
> > +          Ty->getDescription() + "' type plane");
> >    }
> >
> >    return false;
> > @@ -1262,7 +1399,7 @@
> >      OpaqueType *UpRefTy;
> >
> >      UpRefRecord(unsigned NL, OpaqueType *URTy)
> > -      : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) {}
> > +      : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) { }
> >    };
> >  }
> >
> > @@ -1276,7 +1413,7 @@
> >  /// count reaches zero, the upreferenced type is the type that is  
> > passed in:
> >  /// thus we can complete the cycle.
> >  ///
> > -static PATypeHolder HandleUpRefs(const Type *ty) {
> > +static PATypeHolder HandleUpRefs(const Type *ty, const Signedness&  
> > Sign) {
> >    // If Ty isn't abstract, or if there are no up-references in it,  
> > then there is
> >    // nothing to resolve here.
> >    if (!ty->isAbstract() || UpRefs.empty()) return ty;
> > @@ -1292,10 +1429,11 @@
> >    // this variable.
> >    OpaqueType *TypeToResolve = 0;
> >
> > -  for (unsigned i = 0; i != UpRefs.size(); ++i) {
> > +  unsigned i = 0;
> > +  for (; i != UpRefs.size(); ++i) {
> >      UR_OUT("  UR#" << i << " - TypeContains(" << Ty->getDescription 
> > () << ", "
> > -           << UpRefs[i].second->getDescription() << ") = "
> > -           << (TypeContains(Ty, UpRefs[i].second) ? "true" :  
> > "false") << "\n");
> > +           << UpRefs[i].UpRefTy->getDescription() << ") = "
> > +           << (TypeContains(Ty, UpRefs[i].UpRefTy) ? "true" :  
> > "false") << "\n");
> >      if (TypeContains(Ty, UpRefs[i].LastContainedTy)) {
> >        // Decrement level of upreference
> >        unsigned Level = --UpRefs[i].NestingLevel;
> > @@ -1306,8 +1444,9 @@
> >            TypeToResolve = UpRefs[i].UpRefTy;
> >          } else {
> >            UR_OUT("  * Resolving upreference for "
> > -                 << UpRefs[i].second->getDescription() << "\n";
> > -                 std::string OldName = UpRefs[i].UpRefTy- 
> > >getDescription());
> > +                 << UpRefs[i].UpRefTy->getDescription() << "\n";
> > +          std::string OldName = UpRefs[i].UpRefTy->getDescription());
> > +          ResolveTypeSign(UpRefs[i].UpRefTy, Sign);
> >            UpRefs[i].UpRefTy->refineAbstractTypeTo(TypeToResolve);
> >            UR_OUT("  * Type '" << OldName << "' refined upreference  
> > to: "
> >                   << (const void*)Ty << ", " << Ty->getDescription 
> > () << "\n");
> > @@ -1320,14 +1459,113 @@
> >
> >    if (TypeToResolve) {
> >      UR_OUT("  * Resolving upreference for "
> > -           << UpRefs[i].second->getDescription() << "\n";
> > +           << UpRefs[i].UpRefTy->getDescription() << "\n";
> >             std::string OldName = TypeToResolve->getDescription());
> > +    ResolveTypeSign(TypeToResolve, Sign);
> >      TypeToResolve->refineAbstractTypeTo(Ty);
> >    }
> >
> >    return Ty;
> >  }
> >
> > +bool Signedness::operator<(const Signedness &that) const {
> > +  if (isNamed()) {
> > +    if (that.isNamed())
> > +      return *(this->name) < *(that.name);
> > +    else
> > +      return CurModule.NamedTypeSigns[*name] < that;
> > +  } else if (that.isNamed()) {
> > +    return *this < CurModule.NamedTypeSigns[*that.name];
> > +  }
> > +
> > +  if (isComposite() && that.isComposite()) {
> > +    if (sv->size() == that.sv->size()) {
> > +      SignVector::const_iterator thisI = sv->begin(), thisE = sv- 
> > >end();
> > +      SignVector::const_iterator thatI = that.sv->begin(),
> > +                                 thatE = that.sv->end();
> > +      for (; thisI != thisE; ++thisI, ++thatI) {
> > +        if (*thisI < *thatI)
> > +          return true;
> > +        else if (!(*thisI == *thatI))
> > +          return false;
> > +      }
> > +      return false;
> > +    }
> > +    return sv->size() < that.sv->size();
> > +  }
> > +  return kind < that.kind;
> > +}
> > +
> > +bool Signedness::operator==(const Signedness &that) const {
> > +  if (isNamed())
> > +    if (that.isNamed())
> > +      return *(this->name) == *(that.name);
> > +    else
> > +      return CurModule.NamedTypeSigns[*(this->name)] == that;
> > +  else if (that.isNamed())
> > +    return *this == CurModule.NamedTypeSigns[*(that.name)];
> > +  if (isComposite() && that.isComposite()) {
> > +    if (sv->size() == that.sv->size()) {
> > +      SignVector::const_iterator thisI = sv->begin(), thisE = sv- 
> > >end();
> > +      SignVector::const_iterator thatI = that.sv->begin(),
> > +                                 thatE = that.sv->end();
> > +      for (; thisI != thisE; ++thisI, ++thatI) {
> > +        if (!(*thisI == *thatI))
> > +          return false;
> > +      }
> > +      return true;
> > +    }
> > +    return false;
> > +  }
> > +  return kind == that.kind;
> > +}
> > +
> > +void Signedness::copy(const Signedness &that) {
> > +  if (that.isNamed()) {
> > +    kind = Named;
> > +    name = new std::string(*that.name);
> > +  } else if (that.isComposite()) {
> > +    kind = Composite;
> > +    sv = new SignVector();
> > +    *sv = *that.sv;
> > +  } else {
> > +    kind = that.kind;
> > +    sv = 0;
> > +  }
> > +}
> > +
> > +void Signedness::destroy() {
> > +  if (isNamed()) {
> > +    delete name;
> > +  } else if (isComposite()) {
> > +    delete sv;
> > +  }
> > +}
> > +
> > +void Signedness::dump() const {
> > +  if (isComposite()) {
> > +    if (sv->size() == 1) {
> > +      (*sv)[0].dump();
> > +      std::cerr << "*";
> > +    } else {
> > +      std::cerr << "{ " ;
> > +      for (unsigned i = 0; i < sv->size(); ++i) {
> > +        if (i != 0)
> > +          std::cerr << ", ";
> > +        (*sv)[i].dump();
> > +      }
> > +      std::cerr << "} " ;
> > +    }
> > +  } else if (isNamed()) {
> > +    std::cerr << *name;
> > +  } else if (isSigned()) {
> > +    std::cerr << "S";
> > +  } else if (isUnsigned()) {
> > +    std::cerr << "U";
> > +  } else
> > +    std::cerr << ".";
> > +}
> > +
> >  static inline Instruction::TermOps
> >  getTermOp(TermOps op) {
> >    switch (op) {
> > @@ -1342,7 +1580,7 @@
> >  }
> >
> >  static inline Instruction::BinaryOps
> > -getBinaryOp(BinaryOps op, const Type *Ty, Signedness Sign) {
> > +getBinaryOp(BinaryOps op, const Type *Ty, const Signedness& Sign) {
> >    switch (op) {
> >      default     : assert(0 && "Invalid OldBinaryOps");
> >      case SetEQ  :
> > @@ -1363,7 +1601,7 @@
> >          isFP = PTy->getElementType()->isFloatingPoint();
> >        if (isFP)
> >          return Instruction::FDiv;
> > -      else if (Sign == Signed)
> > +      else if (Sign.isSigned())
> >          return Instruction::SDiv;
> >        return Instruction::UDiv;
> >      }
> > @@ -1380,7 +1618,7 @@
> >        // Select correct opcode
> >        if (isFP)
> >          return Instruction::FRem;
> > -      else if (Sign == Signed)
> > +      else if (Sign.isSigned())
> >          return Instruction::SRem;
> >        return Instruction::URem;
> >      }
> > @@ -1391,7 +1629,7 @@
> >      case AShrOp : return Instruction::AShr;
> >      case ShlOp  : return Instruction::Shl;
> >      case ShrOp  :
> > -      if (Sign == Signed)
> > +      if (Sign.isSigned())
> >          return Instruction::AShr;
> >        return Instruction::LShr;
> >      case AndOp  : return Instruction::And;
> > @@ -1402,8 +1640,8 @@
> >
> >  static inline Instruction::OtherOps
> >  getCompareOp(BinaryOps op, unsigned short &predicate, const Type*  
> > &Ty,
> > -             Signedness Sign) {
> > -  bool isSigned = Sign == Signed;
> > +             const Signedness &Sign) {
> > +  bool isSigned = Sign.isSigned();
> >    bool isFP = Ty->isFloatingPoint();
> >    switch (op) {
> >      default     : assert(0 && "Invalid OldSetCC");
> > @@ -1483,7 +1721,7 @@
> >  }
> >
> >  static inline Instruction::OtherOps
> > -getOtherOp(OtherOps op, Signedness Sign) {
> > +getOtherOp(OtherOps op, const Signedness &Sign) {
> >    switch (op) {
> >      default               : assert(0 && "Invalid OldOtherOps");
> >      case PHIOp            : return Instruction::PHI;
> > @@ -1501,8 +1739,8 @@
> >  }
> >
> >  static inline Value*
> > -getCast(CastOps op, Value *Src, Signedness SrcSign, const Type  
> > *DstTy,
> > -        Signedness DstSign, bool ForceInstruction = false) {
> > +getCast(CastOps op, Value *Src, const Signedness &SrcSign, const  
> > Type *DstTy,
> > +        const Signedness &DstSign, bool ForceInstruction = false) {
> >    Instruction::CastOps Opcode;
> >    const Type* SrcTy = Src->getType();
> >    if (op == CastOp) {
> > @@ -1539,7 +1777,8 @@
> >      }
> >      // Determine the opcode to use by calling CastInst::getCastOpcode
> >      Opcode =
> > -      CastInst::getCastOpcode(Src, SrcSign == Signed, DstTy,  
> > DstSign == Signed);
> > +      CastInst::getCastOpcode(Src, SrcSign.isSigned(), DstTy,
> > +                              DstSign.isSigned());
> >
> >    } else switch (op) {
> >      default: assert(0 && "Invalid cast token");
> > @@ -1631,7 +1870,7 @@
> >        // all indices for SequentialType elements. We must retain  
> > the same
> >        // semantic (zext) for unsigned types.
> >        if (const IntegerType *Ity = dyn_cast<IntegerType>(Index- 
> > >getType()))
> > -        if (Ity->getBitWidth() < 64 && (*Indices)[i].S == Unsigned) {
> > +        if (Ity->getBitWidth() < 64 && (*Indices)[i].S.isUnsigned 
> > ()) {
> >            if (CIndices)
> >              Index = ConstantExpr::getCast(Instruction::ZExt,
> >                cast<Constant>(Index), Type::Int64Ty);
> > @@ -1830,13 +2069,13 @@
> >  #endif
> >
> >  #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
> > -#line 1454 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1693 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >  typedef union YYSTYPE {
> >    llvm::Module                           *ModuleVal;
> >    llvm::Function                         *FunctionVal;
> >    std::pair<llvm::PATypeInfo, char*>     *ArgVal;
> >    llvm::BasicBlock                       *BasicBlockVal;
> > -  llvm::TerminatorInst                   *TermInstVal;
> > +  llvm::TermInstInfo                     TermInstVal;
> >    llvm::InstrInfo                        InstVal;
> >    llvm::ConstInfo                        ConstVal;
> >    llvm::ValueInfo                        ValueVal;
> > @@ -1873,7 +2112,7 @@
> >    llvm::Module::Endianness          Endianness;
> >  } YYSTYPE;
> >  /* Line 196 of yacc.c.  */
> > -#line 1877 "UpgradeParser.tab.c"
> > +#line 2116 "UpgradeParser.tab.c"
> >  # define yystype YYSTYPE /* obsolescent; will be withdrawn */
> >  # define YYSTYPE_IS_DECLARED 1
> >  # define YYSTYPE_IS_TRIVIAL 1
> > @@ -1885,7 +2124,7 @@
> >
> >
> >  /* Line 219 of yacc.c.  */
> > -#line 1889 "UpgradeParser.tab.c"
> > +#line 2128 "UpgradeParser.tab.c"
> >
> >  #if ! defined (YYSIZE_T) && defined (__SIZE_TYPE__)
> >  # define YYSIZE_T __SIZE_TYPE__
> > @@ -2244,37 +2483,37 @@
> >  /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
> >  static const unsigned short int yyrline[] =
> >  {
> > -       0,  1594,  1594,  1595,  1603,  1604,  1614,  1614,  1614,   
> > 1614,
> > -    1614,  1614,  1614,  1614,  1614,  1614,  1614,  1618,  1618,   
> > 1618,
> > -    1622,  1622,  1622,  1622,  1622,  1622,  1626,  1626,  1627,   
> > 1627,
> > -    1628,  1628,  1629,  1629,  1630,  1630,  1634,  1634,  1635,   
> > 1635,
> > -    1636,  1636,  1637,  1637,  1638,  1638,  1639,  1639,  1640,   
> > 1640,
> > -    1641,  1642,  1645,  1645,  1645,  1645,  1649,  1649,  1649,   
> > 1649,
> > -    1649,  1649,  1649,  1650,  1650,  1650,  1650,  1650,  1650,   
> > 1656,
> > -    1656,  1656,  1656,  1660,  1660,  1660,  1660,  1664,  1664,   
> > 1668,
> > -    1668,  1673,  1676,  1681,  1682,  1683,  1684,  1685,  1686,   
> > 1687,
> > -    1688,  1692,  1693,  1694,  1695,  1696,  1697,  1698,  1699,   
> > 1709,
> > -    1710,  1718,  1719,  1727,  1736,  1737,  1744,  1745,  1749,   
> > 1753,
> > -    1769,  1770,  1777,  1778,  1785,  1793,  1793,  1793,  1793,   
> > 1793,
> > -    1793,  1793,  1794,  1794,  1794,  1794,  1794,  1799,  1803,   
> > 1807,
> > -    1812,  1821,  1838,  1844,  1857,  1866,  1870,  1881,  1885,   
> > 1898,
> > -    1902,  1909,  1910,  1916,  1923,  1935,  1965,  1978,  2001,   
> > 2029,
> > -    2051,  2062,  2084,  2095,  2104,  2109,  2167,  2174,  2182,   
> > 2189,
> > -    2196,  2200,  2204,  2213,  2228,  2241,  2250,  2278,  2291,   
> > 2300,
> > -    2306,  2312,  2323,  2329,  2335,  2346,  2347,  2356,  2357,   
> > 2369,
> > -    2378,  2379,  2380,  2381,  2382,  2398,  2418,  2420,  2422,   
> > 2422,
> > -    2429,  2429,  2436,  2436,  2443,  2443,  2451,  2453,  2455,   
> > 2460,
> > -    2474,  2475,  2479,  2482,  2490,  2494,  2501,  2505,  2509,   
> > 2513,
> > -    2521,  2521,  2525,  2526,  2530,  2538,  2543,  2551,  2552,   
> > 2559,
> > -    2566,  2570,  2746,  2746,  2750,  2760,  2760,  2764,  2769,   
> > 2770,
> > -    2771,  2775,  2776,  2775,  2788,  2789,  2794,  2795,  2796,   
> > 2797,
> > -    2798,  2799,  2800,  2801,  2802,  2823,  2826,  2841,  2842,   
> > 2847,
> > -    2847,  2855,  2864,  2867,  2876,  2886,  2891,  2900,  2911,   
> > 2911,
> > -    2914,  2917,  2920,  2924,  2930,  2945,  2951,  3007,  3010,   
> > 3016,
> > -    3026,  3039,  3068,  3076,  3084,  3088,  3095,  3096,  3100,   
> > 3103,
> > -    3109,  3126,  3142,  3156,  3168,  3180,  3191,  3209,  3218,   
> > 3227,
> > -    3234,  3255,  3279,  3285,  3291,  3297,  3313,  3391,  3399,   
> > 3400,
> > -    3404,  3405,  3409,  3415,  3421,  3427,  3433,  3440,  3452,   
> > 3477
> > +       0,  1833,  1833,  1834,  1842,  1843,  1853,  1853,  1853,   
> > 1853,
> > +    1853,  1853,  1853,  1853,  1853,  1853,  1853,  1857,  1857,   
> > 1857,
> > +    1861,  1861,  1861,  1861,  1861,  1861,  1865,  1865,  1866,   
> > 1866,
> > +    1867,  1867,  1868,  1868,  1869,  1869,  1873,  1873,  1874,   
> > 1874,
> > +    1875,  1875,  1876,  1876,  1877,  1877,  1878,  1878,  1879,   
> > 1879,
> > +    1880,  1881,  1884,  1884,  1884,  1884,  1888,  1888,  1888,   
> > 1888,
> > +    1888,  1888,  1888,  1889,  1889,  1889,  1889,  1889,  1889,   
> > 1895,
> > +    1895,  1895,  1895,  1899,  1899,  1899,  1899,  1903,  1903,   
> > 1907,
> > +    1907,  1912,  1915,  1920,  1921,  1922,  1923,  1924,  1925,   
> > 1926,
> > +    1927,  1931,  1932,  1933,  1934,  1935,  1936,  1937,  1938,   
> > 1948,
> > +    1949,  1957,  1958,  1966,  1975,  1976,  1983,  1984,  1988,   
> > 1992,
> > +    2008,  2009,  2016,  2017,  2024,  2032,  2032,  2032,  2032,   
> > 2032,
> > +    2032,  2032,  2033,  2033,  2033,  2033,  2033,  2038,  2042,   
> > 2046,
> > +    2051,  2060,  2078,  2084,  2097,  2108,  2112,  2125,  2129,   
> > 2143,
> > +    2147,  2154,  2155,  2161,  2168,  2180,  2210,  2223,  2246,   
> > 2274,
> > +    2296,  2307,  2329,  2340,  2349,  2354,  2413,  2420,  2428,   
> > 2435,
> > +    2442,  2446,  2450,  2459,  2474,  2487,  2496,  2524,  2537,   
> > 2546,
> > +    2552,  2558,  2569,  2575,  2581,  2592,  2593,  2602,  2603,   
> > 2615,
> > +    2624,  2625,  2626,  2627,  2628,  2644,  2664,  2666,  2668,   
> > 2668,
> > +    2675,  2675,  2683,  2683,  2691,  2691,  2700,  2702,  2704,   
> > 2709,
> > +    2723,  2724,  2728,  2731,  2739,  2743,  2750,  2754,  2758,   
> > 2762,
> > +    2770,  2770,  2774,  2775,  2779,  2787,  2792,  2800,  2801,   
> > 2808,
> > +    2815,  2819,  3004,  3004,  3008,  3018,  3018,  3022,  3027,   
> > 3028,
> > +    3029,  3033,  3034,  3033,  3046,  3047,  3052,  3053,  3054,   
> > 3055,
> > +    3059,  3063,  3064,  3065,  3066,  3087,  3091,  3105,  3106,   
> > 3111,
> > +    3111,  3119,  3129,  3132,  3141,  3152,  3157,  3166,  3177,   
> > 3177,
> > +    3180,  3184,  3188,  3193,  3203,  3221,  3230,  3295,  3299,   
> > 3306,
> > +    3318,  3333,  3363,  3373,  3383,  3387,  3394,  3395,  3399,   
> > 3402,
> > +    3408,  3427,  3445,  3461,  3475,  3489,  3500,  3518,  3527,   
> > 3536,
> > +    3543,  3564,  3588,  3594,  3600,  3606,  3622,  3706,  3714,   
> > 3715,
> > +    3719,  3720,  3724,  3730,  3737,  3743,  3750,  3757,  3770,   
> > 3796
> >  };
> >  #endif
> >
> > @@ -3686,7 +3925,7 @@
> >    switch (yyn)
> >      {
> >          case 3:
> > -#line 1595 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1834 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if ((yyvsp[0].UIntVal) > (uint32_t)INT32_MAX)     // Outside  
> > of my range!
> >        error("Value too large for type");
> > @@ -3695,7 +3934,7 @@
> >      break;
> >
> >    case 5:
> > -#line 1604 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1843 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if ((yyvsp[0].UInt64Val) > (uint64_t)INT64_MAX)     // Outside  
> > of my range!
> >        error("Value too large for type");
> > @@ -3704,226 +3943,226 @@
> >      break;
> >
> >    case 26:
> > -#line 1626 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1865 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.IPred) = ICmpInst::ICMP_EQ; ;}
> >      break;
> >
> >    case 27:
> > -#line 1626 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1865 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.IPred) = ICmpInst::ICMP_NE; ;}
> >      break;
> >
> >    case 28:
> > -#line 1627 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1866 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.IPred) = ICmpInst::ICMP_SLT; ;}
> >      break;
> >
> >    case 29:
> > -#line 1627 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1866 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.IPred) = ICmpInst::ICMP_SGT; ;}
> >      break;
> >
> >    case 30:
> > -#line 1628 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1867 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.IPred) = ICmpInst::ICMP_SLE; ;}
> >      break;
> >
> >    case 31:
> > -#line 1628 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1867 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.IPred) = ICmpInst::ICMP_SGE; ;}
> >      break;
> >
> >    case 32:
> > -#line 1629 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1868 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.IPred) = ICmpInst::ICMP_ULT; ;}
> >      break;
> >
> >    case 33:
> > -#line 1629 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1868 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.IPred) = ICmpInst::ICMP_UGT; ;}
> >      break;
> >
> >    case 34:
> > -#line 1630 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1869 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.IPred) = ICmpInst::ICMP_ULE; ;}
> >      break;
> >
> >    case 35:
> > -#line 1630 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1869 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.IPred) = ICmpInst::ICMP_UGE; ;}
> >      break;
> >
> >    case 36:
> > -#line 1634 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1873 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_OEQ; ;}
> >      break;
> >
> >    case 37:
> > -#line 1634 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1873 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_ONE; ;}
> >      break;
> >
> >    case 38:
> > -#line 1635 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1874 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_OLT; ;}
> >      break;
> >
> >    case 39:
> > -#line 1635 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1874 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_OGT; ;}
> >      break;
> >
> >    case 40:
> > -#line 1636 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1875 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_OLE; ;}
> >      break;
> >
> >    case 41:
> > -#line 1636 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1875 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_OGE; ;}
> >      break;
> >
> >    case 42:
> > -#line 1637 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1876 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_ORD; ;}
> >      break;
> >
> >    case 43:
> > -#line 1637 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1876 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_UNO; ;}
> >      break;
> >
> >    case 44:
> > -#line 1638 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1877 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_UEQ; ;}
> >      break;
> >
> >    case 45:
> > -#line 1638 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1877 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_UNE; ;}
> >      break;
> >
> >    case 46:
> > -#line 1639 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1878 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_ULT; ;}
> >      break;
> >
> >    case 47:
> > -#line 1639 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1878 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_UGT; ;}
> >      break;
> >
> >    case 48:
> > -#line 1640 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1879 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_ULE; ;}
> >      break;
> >
> >    case 49:
> > -#line 1640 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1879 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_UGE; ;}
> >      break;
> >
> >    case 50:
> > -#line 1641 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1880 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_TRUE; ;}
> >      break;
> >
> >    case 51:
> > -#line 1642 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1881 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.FPred) = FCmpInst::FCMP_FALSE; ;}
> >      break;
> >
> >    case 81:
> > -#line 1673 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1912 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.StrVal) = (yyvsp[-1].StrVal);
> >    ;}
> >      break;
> >
> >    case 82:
> > -#line 1676 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1915 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.StrVal) = 0;
> >    ;}
> >      break;
> >
> >    case 83:
> > -#line 1681 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1920 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.Linkage) = GlobalValue::InternalLinkage; ;}
> >      break;
> >
> >    case 84:
> > -#line 1682 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1921 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.Linkage) = GlobalValue::LinkOnceLinkage; ;}
> >      break;
> >
> >    case 85:
> > -#line 1683 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1922 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.Linkage) = GlobalValue::WeakLinkage; ;}
> >      break;
> >
> >    case 86:
> > -#line 1684 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1923 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.Linkage) = GlobalValue::AppendingLinkage; ;}
> >      break;
> >
> >    case 87:
> > -#line 1685 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1924 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
> >      break;
> >
> >    case 88:
> > -#line 1686 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1925 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.Linkage) = GlobalValue::DLLExportLinkage; ;}
> >      break;
> >
> >    case 89:
> > -#line 1687 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1926 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
> >      break;
> >
> >    case 90:
> > -#line 1688 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1927 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
> >      break;
> >
> >    case 91:
> > -#line 1692 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1931 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.UIntVal) = OldCallingConv::C; ;}
> >      break;
> >
> >    case 92:
> > -#line 1693 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1932 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.UIntVal) = OldCallingConv::C; ;}
> >      break;
> >
> >    case 93:
> > -#line 1694 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1933 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.UIntVal) = OldCallingConv::CSRet; ;}
> >      break;
> >
> >    case 94:
> > -#line 1695 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1934 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.UIntVal) = OldCallingConv::Fast; ;}
> >      break;
> >
> >    case 95:
> > -#line 1696 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1935 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.UIntVal) = OldCallingConv::Cold; ;}
> >      break;
> >
> >    case 96:
> > -#line 1697 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1936 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.UIntVal) = OldCallingConv::X86_StdCall; ;}
> >      break;
> >
> >    case 97:
> > -#line 1698 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1937 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.UIntVal) = OldCallingConv::X86_FastCall; ;}
> >      break;
> >
> >    case 98:
> > -#line 1699 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1938 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if ((unsigned)(yyvsp[0].UInt64Val) != (yyvsp[0].UInt64Val))
> >        error("Calling conv too large");
> > @@ -3932,12 +4171,12 @@
> >      break;
> >
> >    case 99:
> > -#line 1709 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1948 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.UIntVal) = 0; ;}
> >      break;
> >
> >    case 100:
> > -#line 1710 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1949 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.UIntVal) = (yyvsp[0].UInt64Val);
> >      if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
> > @@ -3946,12 +4185,12 @@
> >      break;
> >
> >    case 101:
> > -#line 1718 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1957 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.UIntVal) = 0; ;}
> >      break;
> >
> >    case 102:
> > -#line 1719 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1958 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.UIntVal) = (yyvsp[0].UInt64Val);
> >      if ((yyval.UIntVal) != 0 && !isPowerOf2_32((yyval.UIntVal)))
> > @@ -3960,7 +4199,7 @@
> >      break;
> >
> >    case 103:
> > -#line 1727 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1966 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      for (unsigned i = 0, e = strlen((yyvsp[0].StrVal)); i != e; ++i)
> >        if ((yyvsp[0].StrVal)[i] == '"' || (yyvsp[0].StrVal)[i] == '\ 
> > \')
> > @@ -3970,27 +4209,27 @@
> >      break;
> >
> >    case 104:
> > -#line 1736 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1975 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.StrVal) = 0; ;}
> >      break;
> >
> >    case 105:
> > -#line 1737 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1976 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.StrVal) = (yyvsp[0].StrVal); ;}
> >      break;
> >
> >    case 106:
> > -#line 1744 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1983 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {;}
> >      break;
> >
> >    case 107:
> > -#line 1745 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1984 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {;}
> >      break;
> >
> >    case 108:
> > -#line 1749 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1988 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      CurGV->setSection((yyvsp[0].StrVal));
> >      free((yyvsp[0].StrVal));
> > @@ -3998,7 +4237,7 @@
> >      break;
> >
> >    case 109:
> > -#line 1753 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1992 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if ((yyvsp[0].UInt64Val) != 0 && !isPowerOf2_32((yyvsp 
> > [0].UInt64Val)))
> >        error("Alignment must be a power of two");
> > @@ -4008,23 +4247,23 @@
> >      break;
> >
> >    case 111:
> > -#line 1770 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2009 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[0].PrimType).T);
> > -    (yyval.TypeVal).S = Signless;
> > +    (yyval.TypeVal).S.makeSignless();
> >    ;}
> >      break;
> >
> >    case 113:
> > -#line 1778 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2017 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[0].PrimType).T);
> > -    (yyval.TypeVal).S = Signless;
> > +    (yyval.TypeVal).S.makeSignless();
> >    ;}
> >      break;
> >
> >    case 114:
> > -#line 1785 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2024 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if (!UpRefs.empty())
> >        error("Invalid upreference in type: " + (*(yyvsp 
> > [0].TypeVal).PAT)->getDescription());
> > @@ -4033,50 +4272,52 @@
> >      break;
> >
> >    case 127:
> > -#line 1799 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2038 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.TypeVal).PAT = new PATypeHolder((yyvsp[0].PrimType).T);
> > -    (yyval.TypeVal).S = (yyvsp[0].PrimType).S;
> > +    (yyval.TypeVal).S.copy((yyvsp[0].PrimType).S);
> >    ;}
> >      break;
> >
> >    case 128:
> > -#line 1803 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2042 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.TypeVal).PAT = new PATypeHolder(OpaqueType::get());
> > -    (yyval.TypeVal).S = Signless;
> > +    (yyval.TypeVal).S.makeSignless();
> >    ;}
> >      break;
> >
> >    case 129:
> > -#line 1807 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2046 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {            // Named types are also simple types...
> > +    (yyval.TypeVal).S.copy(getTypeSign((yyvsp[0].ValIDVal)));
> >      const Type* tmp = getType((yyvsp[0].ValIDVal));
> >      (yyval.TypeVal).PAT = new PATypeHolder(tmp);
> > -    (yyval.TypeVal).S = Signless; // FIXME: what if its signed?
> >    ;}
> >      break;
> >
> >    case 130:
> > -#line 1812 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2051 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {                   // Type UpReference
> >      if ((yyvsp[0].UInt64Val) > (uint64_t)~0U)
> >        error("Value out of range");
> >      OpaqueType *OT = OpaqueType::get();        // Use temporary  
> > placeholder
> >      UpRefs.push_back(UpRefRecord((unsigned)(yyvsp[0].UInt64Val),  
> > OT));  // Add to vector...
> >      (yyval.TypeVal).PAT = new PATypeHolder(OT);
> > -    (yyval.TypeVal).S = Signless;
> > +    (yyval.TypeVal).S.makeSignless();
> >      UR_OUT("New Upreference!\n");
> >    ;}
> >      break;
> >
> >    case 131:
> > -#line 1821 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2060 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {           // Function derived type?
> > +    (yyval.TypeVal).S.makeComposite((yyvsp[-3].TypeVal).S);
> >      std::vector<const Type*> Params;
> >      for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp 
> > [-1].TypeList)->begin(),
> >             E = (yyvsp[-1].TypeList)->end(); I != E; ++I) {
> >        Params.push_back(I->PAT->get());
> > +      (yyval.TypeVal).S.add(I->S);
> >      }
> >      FunctionType::ParamAttrsList ParamAttrs;
> >      bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
> > @@ -4084,97 +4325,101 @@
> >
> >      (yyval.TypeVal).PAT = new PATypeHolder(
> >        HandleUpRefs(FunctionType::get((yyvsp[-3].TypeVal).PAT->get 
> > (), Params, isVarArg,
> > -                   ParamAttrs)));
> > -    (yyval.TypeVal).S = (yyvsp[-3].TypeVal).S;
> > -    delete (yyvsp[-3].TypeVal).PAT;    // Delete the return type  
> > handle
> > +                   ParamAttrs), (yyval.TypeVal).S));
> > +    delete (yyvsp[-3].TypeVal).PAT;  // Delete the return type handle
> >      delete (yyvsp[-1].TypeList);      // Delete the argument list
> >    ;}
> >      break;
> >
> >    case 132:
> > -#line 1838 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2078 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {          // Sized array type?
> > +    (yyval.TypeVal).S.makeComposite((yyvsp[-1].TypeVal).S);
> >      (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> > (ArrayType::get((yyvsp[-1].TypeVal).PAT->get(),
> > -                                                        (unsigned) 
> > (yyvsp[-3].UInt64Val))));
> > -    (yyval.TypeVal).S = (yyvsp[-1].TypeVal).S;
> > +                                           (unsigned)(yyvsp 
> > [-3].UInt64Val)), (yyval.TypeVal).S));
> >      delete (yyvsp[-1].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 133:
> > -#line 1844 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2084 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {          // Vector type?
> > -     const llvm::Type* ElemTy = (yyvsp[-1].TypeVal).PAT->get();
> > -     if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
> > -        error("Unsigned result not equal to signed result");
> > -     if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
> > -        error("Elements of a VectorType must be integer or  
> > floating point");
> > -     if (!isPowerOf2_32((yyvsp[-3].UInt64Val)))
> > -       error("VectorType length should be a power of 2");
> > -     (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> > (VectorType::get(ElemTy,
> > -                                          (unsigned)(yyvsp 
> > [-3].UInt64Val))));
> > -     (yyval.TypeVal).S = (yyvsp[-1].TypeVal).S;
> > -     delete (yyvsp[-1].TypeVal).PAT;
> > +    const llvm::Type* ElemTy = (yyvsp[-1].TypeVal).PAT->get();
> > +    if ((unsigned)(yyvsp[-3].UInt64Val) != (yyvsp[-3].UInt64Val))
> > +       error("Unsigned result not equal to signed result");
> > +    if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
> > +       error("Elements of a VectorType must be integer or floating  
> > point");
> > +    if (!isPowerOf2_32((yyvsp[-3].UInt64Val)))
> > +      error("VectorType length should be a power of 2");
> > +    (yyval.TypeVal).S.makeComposite((yyvsp[-1].TypeVal).S);
> > +    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> > (VectorType::get(ElemTy,
> > +                                         (unsigned)(yyvsp 
> > [-3].UInt64Val)), (yyval.TypeVal).S));
> > +    delete (yyvsp[-1].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 134:
> > -#line 1857 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2097 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {                        // Structure type?
> >      std::vector<const Type*> Elements;
> > +    (yyval.TypeVal).S.makeComposite();
> >      for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp 
> > [-1].TypeList)->begin(),
> > -           E = (yyvsp[-1].TypeList)->end(); I != E; ++I)
> > +           E = (yyvsp[-1].TypeList)->end(); I != E; ++I) {
> >        Elements.push_back(I->PAT->get());
> > -    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> > (StructType::get(Elements)));
> > -    (yyval.TypeVal).S = Signless;
> > +      (yyval.TypeVal).S.add(I->S);
> > +    }
> > +    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> > (StructType::get(Elements), (yyval.TypeVal).S));
> >      delete (yyvsp[-1].TypeList);
> >    ;}
> >      break;
> >
> >    case 135:
> > -#line 1866 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2108 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {                                  // Empty structure type?
> >      (yyval.TypeVal).PAT = new PATypeHolder(StructType::get 
> > (std::vector<const Type*>()));
> > -    (yyval.TypeVal).S = Signless;
> > +    (yyval.TypeVal).S.makeComposite();
> >    ;}
> >      break;
> >
> >    case 136:
> > -#line 1870 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2112 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {                // Packed Structure type?
> > +    (yyval.TypeVal).S.makeComposite();
> >      std::vector<const Type*> Elements;
> >      for (std::list<llvm::PATypeInfo>::iterator I = (yyvsp 
> > [-2].TypeList)->begin(),
> >             E = (yyvsp[-2].TypeList)->end(); I != E; ++I) {
> >        Elements.push_back(I->PAT->get());
> > +      (yyval.TypeVal).S.add(I->S);
> >        delete I->PAT;
> >      }
> > -    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> > (StructType::get(Elements, true)));
> > -    (yyval.TypeVal).S = Signless;
> > +    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> > (StructType::get(Elements, true),
> > +                                           (yyval.TypeVal).S));
> >      delete (yyvsp[-2].TypeList);
> >    ;}
> >      break;
> >
> >    case 137:
> > -#line 1881 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2125 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {                          // Empty packed structure type?
> >      (yyval.TypeVal).PAT = new PATypeHolder(StructType::get 
> > (std::vector<const Type*>(),true));
> > -    (yyval.TypeVal).S = Signless;
> > +    (yyval.TypeVal).S.makeComposite();
> >    ;}
> >      break;
> >
> >    case 138:
> > -#line 1885 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2129 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {                             // Pointer type?
> >      if ((yyvsp[-1].TypeVal).PAT->get() == Type::LabelTy)
> >        error("Cannot form a pointer to a basic block");
> > -    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> > (PointerType::get((yyvsp[-1].TypeVal).PAT->get())));
> > -    (yyval.TypeVal).S = (yyvsp[-1].TypeVal).S;
> > +    (yyval.TypeVal).S.makeComposite((yyvsp[-1].TypeVal).S);
> > +    (yyval.TypeVal).PAT = new PATypeHolder(HandleUpRefs 
> > (PointerType::get((yyvsp[-1].TypeVal).PAT->get()),
> > +                                           (yyval.TypeVal).S));
> >      delete (yyvsp[-1].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 139:
> > -#line 1898 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2143 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.TypeList) = new std::list<PATypeInfo>();
> >      (yyval.TypeList)->push_back((yyvsp[0].TypeVal));
> > @@ -4182,42 +4427,42 @@
> >      break;
> >
> >    case 140:
> > -#line 1902 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2147 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back((yyvsp 
> > [0].TypeVal));
> >    ;}
> >      break;
> >
> >    case 142:
> > -#line 1910 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2155 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      PATypeInfo VoidTI;
> >      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> > -    VoidTI.S = Signless;
> > +    VoidTI.S.makeSignless();
> >      ((yyval.TypeList)=(yyvsp[-2].TypeList))->push_back(VoidTI);
> >    ;}
> >      break;
> >
> >    case 143:
> > -#line 1916 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2161 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.TypeList) = new std::list<PATypeInfo>();
> >      PATypeInfo VoidTI;
> >      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> > -    VoidTI.S = Signless;
> > +    VoidTI.S.makeSignless();
> >      (yyval.TypeList)->push_back(VoidTI);
> >    ;}
> >      break;
> >
> >    case 144:
> > -#line 1923 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2168 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.TypeList) = new std::list<PATypeInfo>();
> >    ;}
> >      break;
> >
> >    case 145:
> > -#line 1935 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { // Nonempty unsized arr
> >      const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp 
> > [-3].TypeVal).PAT->get());
> >      if (ATy == 0)
> > @@ -4244,14 +4489,14 @@
> >        Elems.push_back(C);
> >      }
> >      (yyval.ConstVal).C = ConstantArray::get(ATy, Elems);
> > -    (yyval.ConstVal).S = (yyvsp[-3].TypeVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-3].TypeVal).S);
> >      delete (yyvsp[-3].TypeVal).PAT;
> >      delete (yyvsp[-1].ConstVector);
> >    ;}
> >      break;
> >
> >    case 146:
> > -#line 1965 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2210 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp 
> > [-2].TypeVal).PAT->get());
> >      if (ATy == 0)
> > @@ -4262,13 +4507,13 @@
> >        error("Type mismatch: constant sized array initialized with 0"
> >              " arguments, but has size of " + itostr(NumElements)  
> > +"");
> >      (yyval.ConstVal).C = ConstantArray::get(ATy,  
> > std::vector<Constant*>());
> > -    (yyval.ConstVal).S = (yyvsp[-2].TypeVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-2].TypeVal).S);
> >      delete (yyvsp[-2].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 147:
> > -#line 1978 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2223 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const ArrayType *ATy = dyn_cast<ArrayType>((yyvsp 
> > [-2].TypeVal).PAT->get());
> >      if (ATy == 0)
> > @@ -4289,13 +4534,13 @@
> >        Vals.push_back(ConstantInt::get(ETy, *C));
> >      free((yyvsp[0].StrVal));
> >      (yyval.ConstVal).C = ConstantArray::get(ATy, Vals);
> > -    (yyval.ConstVal).S = (yyvsp[-2].TypeVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-2].TypeVal).S);
> >      delete (yyvsp[-2].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 148:
> > -#line 2001 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2246 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { // Nonempty unsized arr
> >      const VectorType *PTy = dyn_cast<VectorType>((yyvsp 
> > [-3].TypeVal).PAT->get());
> >      if (PTy == 0)
> > @@ -4320,14 +4565,14 @@
> >        Elems.push_back(C);
> >      }
> >      (yyval.ConstVal).C = ConstantVector::get(PTy, Elems);
> > -    (yyval.ConstVal).S = (yyvsp[-3].TypeVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-3].TypeVal).S);
> >      delete (yyvsp[-3].TypeVal).PAT;
> >      delete (yyvsp[-1].ConstVector);
> >    ;}
> >      break;
> >
> >    case 149:
> > -#line 2029 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2274 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const StructType *STy = dyn_cast<StructType>((yyvsp 
> > [-3].TypeVal).PAT->get());
> >      if (STy == 0)
> > @@ -4346,14 +4591,14 @@
> >        Fields.push_back(C);
> >      }
> >      (yyval.ConstVal).C = ConstantStruct::get(STy, Fields);
> > -    (yyval.ConstVal).S = (yyvsp[-3].TypeVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-3].TypeVal).S);
> >      delete (yyvsp[-3].TypeVal).PAT;
> >      delete (yyvsp[-1].ConstVector);
> >    ;}
> >      break;
> >
> >    case 150:
> > -#line 2051 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2296 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const StructType *STy = dyn_cast<StructType>((yyvsp 
> > [-2].TypeVal).PAT->get());
> >      if (STy == 0)
> > @@ -4362,13 +4607,13 @@
> >      if (STy->getNumContainedTypes() != 0)
> >        error("Illegal number of initializers for structure type");
> >      (yyval.ConstVal).C = ConstantStruct::get(STy,  
> > std::vector<Constant*>());
> > -    (yyval.ConstVal).S = (yyvsp[-2].TypeVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-2].TypeVal).S);
> >      delete (yyvsp[-2].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 151:
> > -#line 2062 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2307 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const StructType *STy = dyn_cast<StructType>((yyvsp 
> > [-5].TypeVal).PAT->get());
> >      if (STy == 0)
> > @@ -4387,14 +4632,14 @@
> >        Fields.push_back(C);
> >      }
> >      (yyval.ConstVal).C = ConstantStruct::get(STy, Fields);
> > -    (yyval.ConstVal).S = (yyvsp[-5].TypeVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-5].TypeVal).S);
> >      delete (yyvsp[-5].TypeVal).PAT;
> >      delete (yyvsp[-2].ConstVector);
> >    ;}
> >      break;
> >
> >    case 152:
> > -#line 2084 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2329 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const StructType *STy = dyn_cast<StructType>((yyvsp 
> > [-4].TypeVal).PAT->get());
> >      if (STy == 0)
> > @@ -4403,35 +4648,35 @@
> >      if (STy->getNumContainedTypes() != 0)
> >        error("Illegal number of initializers for packed structure  
> > type");
> >      (yyval.ConstVal).C = ConstantStruct::get(STy,  
> > std::vector<Constant*>());
> > -    (yyval.ConstVal).S = (yyvsp[-4].TypeVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-4].TypeVal).S);
> >      delete (yyvsp[-4].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 153:
> > -#line 2095 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2340 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const PointerType *PTy = dyn_cast<PointerType>((yyvsp 
> > [-1].TypeVal).PAT->get());
> >      if (PTy == 0)
> >        error("Cannot make null pointer constant with type: '" +
> >              (yyvsp[-1].TypeVal).PAT->get()->getDescription() + "'");
> >      (yyval.ConstVal).C = ConstantPointerNull::get(PTy);
> > -    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
> >      delete (yyvsp[-1].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 154:
> > -#line 2104 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2349 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.ConstVal).C = UndefValue::get((yyvsp[-1].TypeVal).PAT- 
> > >get());
> > -    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
> >      delete (yyvsp[-1].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 155:
> > -#line 2109 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2354 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const PointerType *Ty = dyn_cast<PointerType>((yyvsp 
> > [-1].TypeVal).PAT->get());
> >      if (Ty == 0)
> > @@ -4447,6 +4692,7 @@
> >      //
> >      Function *SavedCurFn = CurFun.CurrentFunction;
> >      CurFun.CurrentFunction = 0;
> > +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
> >      Value *V = getExistingValue(Ty, (yyvsp[0].ValIDVal));
> >      CurFun.CurrentFunction = SavedCurFn;
> >
> > @@ -4487,89 +4733,89 @@
> >        }
> >      }
> >      (yyval.ConstVal).C = cast<GlobalValue>(V);
> > -    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
> >      delete (yyvsp[-1].TypeVal).PAT;            // Free the type  
> > handle
> >    ;}
> >      break;
> >
> >    case 156:
> > -#line 2167 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2413 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if ((yyvsp[-1].TypeVal).PAT->get() != (yyvsp[0].ConstVal).C- 
> > >getType())
> >        error("Mismatched types for constant expression");
> >      (yyval.ConstVal) = (yyvsp[0].ConstVal);
> > -    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
> >      delete (yyvsp[-1].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 157:
> > -#line 2174 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2420 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
> >      if (isa<FunctionType>(Ty) || Ty == Type::LabelTy ||  
> > isa<OpaqueType>(Ty))
> >        error("Cannot create a null initialized value of this type");
> >      (yyval.ConstVal).C = Constant::getNullValue(Ty);
> > -    (yyval.ConstVal).S = (yyvsp[-1].TypeVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-1].TypeVal).S);
> >      delete (yyvsp[-1].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 158:
> > -#line 2182 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2428 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {      // integral constants
> >      const Type *Ty = (yyvsp[-1].PrimType).T;
> >      if (!ConstantInt::isValueValidForType(Ty, (yyvsp[0].SInt64Val)))
> >        error("Constant value doesn't fit in type");
> >      (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[0].SInt64Val));
> > -    (yyval.ConstVal).S = Signed;
> > +    (yyval.ConstVal).S.makeSigned();
> >    ;}
> >      break;
> >
> >    case 159:
> > -#line 2189 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2435 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {            // integral constants
> >      const Type *Ty = (yyvsp[-1].PrimType).T;
> >      if (!ConstantInt::isValueValidForType(Ty, (yyvsp[0].UInt64Val)))
> >        error("Constant value doesn't fit in type");
> >      (yyval.ConstVal).C = ConstantInt::get(Ty, (yyvsp[0].UInt64Val));
> > -    (yyval.ConstVal).S = Unsigned;
> > +    (yyval.ConstVal).S.makeUnsigned();
> >    ;}
> >      break;
> >
> >    case 160:
> > -#line 2196 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2442 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {                      // Boolean constants
> >      (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, true);
> > -    (yyval.ConstVal).S = Unsigned;
> > +    (yyval.ConstVal).S.makeUnsigned();
> >    ;}
> >      break;
> >
> >    case 161:
> > -#line 2200 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2446 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {                     // Boolean constants
> >      (yyval.ConstVal).C = ConstantInt::get(Type::Int1Ty, false);
> > -    (yyval.ConstVal).S = Unsigned;
> > +    (yyval.ConstVal).S.makeUnsigned();
> >    ;}
> >      break;
> >
> >    case 162:
> > -#line 2204 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2450 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {                   // Float & Double constants
> >      if (!ConstantFP::isValueValidForType((yyvsp[-1].PrimType).T,  
> > (yyvsp[0].FPVal)))
> >        error("Floating point constant invalid for type");
> >      (yyval.ConstVal).C = ConstantFP::get((yyvsp[-1].PrimType).T,  
> > (yyvsp[0].FPVal));
> > -    (yyval.ConstVal).S = Signless;
> > +    (yyval.ConstVal).S.makeSignless();
> >    ;}
> >      break;
> >
> >    case 163:
> > -#line 2213 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2459 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type* SrcTy = (yyvsp[-3].ConstVal).C->getType();
> >      const Type* DstTy = (yyvsp[-1].TypeVal).PAT->get();
> > -    Signedness SrcSign = (yyvsp[-3].ConstVal).S;
> > -    Signedness DstSign = (yyvsp[-1].TypeVal).S;
> > +    Signedness SrcSign((yyvsp[-3].ConstVal).S);
> > +    Signedness DstSign((yyvsp[-1].TypeVal).S);
> >      if (!SrcTy->isFirstClassType())
> >        error("cast constant expression from a non-primitive type: '" +
> >              SrcTy->getDescription() + "'");
> > @@ -4577,13 +4823,13 @@
> >        error("cast constant expression to a non-primitive type: '" +
> >              DstTy->getDescription() + "'");
> >      (yyval.ConstVal).C = cast<Constant>(getCast((yyvsp 
> > [-5].CastOpVal), (yyvsp[-3].ConstVal).C, SrcSign, DstTy, DstSign));
> > -    (yyval.ConstVal).S = DstSign;
> > +    (yyval.ConstVal).S.copy(DstSign);
> >      delete (yyvsp[-1].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 164:
> > -#line 2228 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2474 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *Ty = (yyvsp[-2].ConstVal).C->getType();
> >      if (!isa<PointerType>(Ty))
> > @@ -4595,12 +4841,12 @@
> >
> >      delete (yyvsp[-1].ValueList);
> >      (yyval.ConstVal).C = ConstantExpr::getGetElementPtr((yyvsp 
> > [-2].ConstVal).C, &CIndices[0], CIndices.size());
> > -    (yyval.ConstVal).S = Signless;
> > +    (yyval.ConstVal).S.copy(getElementSign((yyvsp[-2].ConstVal),  
> > CIndices));
> >    ;}
> >      break;
> >
> >    case 165:
> > -#line 2241 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2487 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if (!(yyvsp[-5].ConstVal).C->getType()->isInteger() ||
> >          cast<IntegerType>((yyvsp[-5].ConstVal).C->getType())- 
> > >getBitWidth() != 1)
> > @@ -4608,12 +4854,12 @@
> >      if ((yyvsp[-3].ConstVal).C->getType() != (yyvsp 
> > [-1].ConstVal).C->getType())
> >        error("Select operand types must match");
> >      (yyval.ConstVal).C = ConstantExpr::getSelect((yyvsp 
> > [-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> > -    (yyval.ConstVal).S = Unsigned;
> > +    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S);
> >    ;}
> >      break;
> >
> >    case 166:
> > -#line 2250 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2496 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *Ty = (yyvsp[-3].ConstVal).C->getType();
> >      if (Ty != (yyvsp[-1].ConstVal).C->getType())
> > @@ -4640,12 +4886,12 @@
> >               ConstantExpr::getCast(Instruction::PtrToInt, (yyvsp 
> > [-1].ConstVal).C, IntPtrTy));
> >        (yyval.ConstVal).C = ConstantExpr::getCast 
> > (Instruction::IntToPtr, (yyval.ConstVal).C, Ty);
> >      }
> > -    (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S);
> >    ;}
> >      break;
> >
> >    case 167:
> > -#line 2278 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2524 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type* Ty = (yyvsp[-3].ConstVal).C->getType();
> >      if (Ty != (yyvsp[-1].ConstVal).C->getType())
> > @@ -4657,12 +4903,12 @@
> >      }
> >      Instruction::BinaryOps Opcode = getBinaryOp((yyvsp 
> > [-5].BinaryOpVal), Ty, (yyvsp[-3].ConstVal).S);
> >      (yyval.ConstVal).C = ConstantExpr::get(Opcode, (yyvsp 
> > [-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> > -    (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S);
> >    ;}
> >      break;
> >
> >    case 168:
> > -#line 2291 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2537 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type* Ty = (yyvsp[-3].ConstVal).C->getType();
> >      if (Ty != (yyvsp[-1].ConstVal).C->getType())
> > @@ -4670,32 +4916,32 @@
> >      unsigned short pred;
> >      Instruction::OtherOps Opcode = getCompareOp((yyvsp 
> > [-5].BinaryOpVal), pred, Ty, (yyvsp[-3].ConstVal).S);
> >      (yyval.ConstVal).C = ConstantExpr::getCompare(Opcode, (yyvsp 
> > [-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> > -    (yyval.ConstVal).S = Unsigned;
> > +    (yyval.ConstVal).S.makeUnsigned();
> >    ;}
> >      break;
> >
> >    case 169:
> > -#line 2300 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2546 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if ((yyvsp[-3].ConstVal).C->getType() != (yyvsp 
> > [-1].ConstVal).C->getType())
> >        error("icmp operand types must match");
> >      (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp 
> > [-5].IPred), (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> > -    (yyval.ConstVal).S = Unsigned;
> > +    (yyval.ConstVal).S.makeUnsigned();
> >    ;}
> >      break;
> >
> >    case 170:
> > -#line 2306 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2552 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if ((yyvsp[-3].ConstVal).C->getType() != (yyvsp 
> > [-1].ConstVal).C->getType())
> >        error("fcmp operand types must match");
> >      (yyval.ConstVal).C = ConstantExpr::getCompare((yyvsp 
> > [-5].FPred), (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> > -    (yyval.ConstVal).S = Unsigned;
> > +    (yyval.ConstVal).S.makeUnsigned();
> >    ;}
> >      break;
> >
> >    case 171:
> > -#line 2312 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2558 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if (!(yyvsp[-1].ConstVal).C->getType()->isInteger() ||
> >          cast<IntegerType>((yyvsp[-1].ConstVal).C->getType())- 
> > >getBitWidth() != 8)
> > @@ -4705,47 +4951,47 @@
> >        error("Shift constant expression requires integer operand");
> >      Constant *ShiftAmt = ConstantExpr::getZExt((yyvsp 
> > [-1].ConstVal).C, Ty);
> >      (yyval.ConstVal).C = ConstantExpr::get(getBinaryOp((yyvsp 
> > [-5].BinaryOpVal), Ty, (yyvsp[-3].ConstVal).S), (yyvsp 
> > [-3].ConstVal).C, ShiftAmt);
> > -    (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S);
> >    ;}
> >      break;
> >
> >    case 172:
> > -#line 2323 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2569 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if (!ExtractElementInst::isValidOperands((yyvsp 
> > [-3].ConstVal).C, (yyvsp[-1].ConstVal).C))
> >        error("Invalid extractelement operands");
> >      (yyval.ConstVal).C = ConstantExpr::getExtractElement((yyvsp 
> > [-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> > -    (yyval.ConstVal).S = (yyvsp[-3].ConstVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-3].ConstVal).S.get(0));
> >    ;}
> >      break;
> >
> >    case 173:
> > -#line 2329 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2575 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if (!InsertElementInst::isValidOperands((yyvsp 
> > [-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C))
> >        error("Invalid insertelement operands");
> >      (yyval.ConstVal).C = ConstantExpr::getInsertElement((yyvsp 
> > [-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> > -    (yyval.ConstVal).S = (yyvsp[-5].ConstVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-5].ConstVal).S);
> >    ;}
> >      break;
> >
> >    case 174:
> > -#line 2335 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2581 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if (!ShuffleVectorInst::isValidOperands((yyvsp 
> > [-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C))
> >        error("Invalid shufflevector operands");
> >      (yyval.ConstVal).C = ConstantExpr::getShuffleVector((yyvsp 
> > [-5].ConstVal).C, (yyvsp[-3].ConstVal).C, (yyvsp[-1].ConstVal).C);
> > -    (yyval.ConstVal).S = (yyvsp[-5].ConstVal).S;
> > +    (yyval.ConstVal).S.copy((yyvsp[-5].ConstVal).S);
> >    ;}
> >      break;
> >
> >    case 175:
> > -#line 2346 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2592 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { ((yyval.ConstVector) = (yyvsp[-2].ConstVector))->push_back 
> > ((yyvsp[0].ConstVal)); ;}
> >      break;
> >
> >    case 176:
> > -#line 2347 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2593 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.ConstVector) = new std::vector<ConstInfo>();
> >      (yyval.ConstVector)->push_back((yyvsp[0].ConstVal));
> > @@ -4753,17 +4999,17 @@
> >      break;
> >
> >    case 177:
> > -#line 2356 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2602 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.BoolVal) = false; ;}
> >      break;
> >
> >    case 178:
> > -#line 2357 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2603 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.BoolVal) = true; ;}
> >      break;
> >
> >    case 179:
> > -#line 2369 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2615 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.ModuleVal) = ParserResult = (yyvsp[0].ModuleVal);
> >      CurModule.ModuleDone();
> > @@ -4771,27 +5017,27 @@
> >      break;
> >
> >    case 180:
> > -#line 2378 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2624 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal);  
> > CurFun.FunctionDone(); ;}
> >      break;
> >
> >    case 181:
> > -#line 2379 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2625 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); ;}
> >      break;
> >
> >    case 182:
> > -#line 2380 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2626 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.ModuleVal) = (yyvsp[-3].ModuleVal); ;}
> >      break;
> >
> >    case 183:
> > -#line 2381 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2627 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.ModuleVal) = (yyvsp[-1].ModuleVal); ;}
> >      break;
> >
> >    case 184:
> > -#line 2382 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2628 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.ModuleVal) = CurModule.CurrentModule;
> >      // Emit an error if there are any unresolved types left.
> > @@ -4807,7 +5053,7 @@
> >      break;
> >
> >    case 185:
> > -#line 2398 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2644 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      // Eagerly resolve types.  This is not an optimization, this is a
> >      // requirement that is due to the fact that we could have this:
> > @@ -4818,115 +5064,118 @@
> >      // If types are not resolved eagerly, then the two types will  
> > not be
> >      // determined to be the same type!
> >      //
> > -    const Type* Ty = (yyvsp[0].TypeVal).PAT->get();
> > -    ResolveTypeTo((yyvsp[-2].StrVal), Ty);
> > +    ResolveTypeTo((yyvsp[-2].StrVal), (yyvsp[0].TypeVal).PAT->get 
> > (), (yyvsp[0].TypeVal).S);
> >
> > -    if (!setTypeName(Ty, (yyvsp[-2].StrVal)) && !(yyvsp 
> > [-2].StrVal)) {
> > -      // If this is a named type that is not a redefinition, add  
> > it to the slot
> > -      // table.
> > -      CurModule.Types.push_back(Ty);
> > +    if (!setTypeName((yyvsp[0].TypeVal), (yyvsp[-2].StrVal)) && ! 
> > (yyvsp[-2].StrVal)) {
> > +      // If this is a numbered type that is not a redefinition,  
> > add it to the
> > +      // slot table.
> > +      CurModule.Types.push_back((yyvsp[0].TypeVal).PAT->get());
> > +      CurModule.TypeSigns.push_back((yyvsp[0].TypeVal).S);
> >      }
> >      delete (yyvsp[0].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 186:
> > -#line 2418 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2664 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {       // Function prototypes can be in const pool
> >    ;}
> >      break;
> >
> >    case 187:
> > -#line 2420 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2666 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {  // Asm blocks can be in the const pool
> >    ;}
> >      break;
> >
> >    case 188:
> > -#line 2422 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2668 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if ((yyvsp[0].ConstVal).C == 0)
> >        error("Global value initializer is not a constant");
> > -    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), (yyvsp 
> > [-2].Linkage), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal).C->getType 
> > (), (yyvsp[0].ConstVal).C);
> > +    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal), (yyvsp 
> > [-2].Linkage), (yyvsp[-1].BoolVal), (yyvsp[0].ConstVal).C->getType 
> > (), (yyvsp[0].ConstVal).C, (yyvsp[0].ConstVal).S);
> >    ;}
> >      break;
> >
> >    case 189:
> > -#line 2426 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2672 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      CurGV = 0;
> >    ;}
> >      break;
> >
> >    case 190:
> > -#line 2429 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2675 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
> > -    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal),  
> > GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), Ty, 0);
> > +    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal),  
> > GlobalValue::ExternalLinkage, (yyvsp[-1].BoolVal), Ty, 0,
> > +                                (yyvsp[0].TypeVal).S);
> >      delete (yyvsp[0].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 191:
> > -#line 2433 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2680 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      CurGV = 0;
> >    ;}
> >      break;
> >
> >    case 192:
> > -#line 2436 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2683 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
> > -    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal),  
> > GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), Ty, 0);
> > +    CurGV = ParseGlobalVariable((yyvsp[-3].StrVal),  
> > GlobalValue::DLLImportLinkage, (yyvsp[-1].BoolVal), Ty, 0,
> > +                                (yyvsp[0].TypeVal).S);
> >      delete (yyvsp[0].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 193:
> > -#line 2440 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2688 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      CurGV = 0;
> >    ;}
> >      break;
> >
> >    case 194:
> > -#line 2443 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2691 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
> >      CurGV =
> > -      ParseGlobalVariable((yyvsp[-3].StrVal),  
> > GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), Ty, 0);
> > +      ParseGlobalVariable((yyvsp[-3].StrVal),  
> > GlobalValue::ExternalWeakLinkage, (yyvsp[-1].BoolVal), Ty, 0,
> > +                          (yyvsp[0].TypeVal).S);
> >      delete (yyvsp[0].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 195:
> > -#line 2448 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2697 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      CurGV = 0;
> >    ;}
> >      break;
> >
> >    case 196:
> > -#line 2451 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2700 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >    ;}
> >      break;
> >
> >    case 197:
> > -#line 2453 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2702 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >    ;}
> >      break;
> >
> >    case 198:
> > -#line 2455 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2704 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >    ;}
> >      break;
> >
> >    case 199:
> > -#line 2460 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2709 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const std::string &AsmSoFar = CurModule.CurrentModule- 
> > >getModuleInlineAsm();
> >      char *EndStr = UnEscapeLexed((yyvsp[0].StrVal), true);
> > @@ -4941,24 +5190,24 @@
> >      break;
> >
> >    case 200:
> > -#line 2474 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2723 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.Endianness) = Module::BigEndian; ;}
> >      break;
> >
> >    case 201:
> > -#line 2475 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2724 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.Endianness) = Module::LittleEndian; ;}
> >      break;
> >
> >    case 202:
> > -#line 2479 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2728 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      CurModule.setEndianness((yyvsp[0].Endianness));
> >    ;}
> >      break;
> >
> >    case 203:
> > -#line 2482 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2731 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if ((yyvsp[0].UInt64Val) == 32)
> >        CurModule.setPointerSize(Module::Pointer32);
> > @@ -4970,7 +5219,7 @@
> >      break;
> >
> >    case 204:
> > -#line 2490 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2739 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      CurModule.CurrentModule->setTargetTriple((yyvsp[0].StrVal));
> >      free((yyvsp[0].StrVal));
> > @@ -4978,7 +5227,7 @@
> >      break;
> >
> >    case 205:
> > -#line 2494 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2743 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      CurModule.CurrentModule->setDataLayout((yyvsp[0].StrVal));
> >      free((yyvsp[0].StrVal));
> > @@ -4986,7 +5235,7 @@
> >      break;
> >
> >    case 207:
> > -#line 2505 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2754 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >        CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
> >        free((yyvsp[0].StrVal));
> > @@ -4994,7 +5243,7 @@
> >      break;
> >
> >    case 208:
> > -#line 2509 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2758 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      CurModule.CurrentModule->addLibrary((yyvsp[0].StrVal));
> >      free((yyvsp[0].StrVal));
> > @@ -5002,17 +5251,17 @@
> >      break;
> >
> >    case 209:
> > -#line 2513 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2762 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { ;}
> >      break;
> >
> >    case 213:
> > -#line 2526 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2775 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.StrVal) = 0; ;}
> >      break;
> >
> >    case 214:
> > -#line 2530 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2779 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if ((yyvsp[-1].TypeVal).PAT->get() == Type::VoidTy)
> >        error("void typed arguments are invalid");
> > @@ -5021,7 +5270,7 @@
> >      break;
> >
> >    case 215:
> > -#line 2538 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2787 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.ArgList) = (yyvsp[-2].ArgList);
> >      (yyval.ArgList)->push_back(*(yyvsp[0].ArgVal));
> > @@ -5030,7 +5279,7 @@
> >      break;
> >
> >    case 216:
> > -#line 2543 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2792 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.ArgList) = new std::vector<std::pair<PATypeInfo,char*> > 
> > ();
> >      (yyval.ArgList)->push_back(*(yyvsp[0].ArgVal));
> > @@ -5039,39 +5288,39 @@
> >      break;
> >
> >    case 217:
> > -#line 2551 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2800 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.ArgList) = (yyvsp[0].ArgList); ;}
> >      break;
> >
> >    case 218:
> > -#line 2552 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2801 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.ArgList) = (yyvsp[-2].ArgList);
> >      PATypeInfo VoidTI;
> >      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> > -    VoidTI.S = Signless;
> > +    VoidTI.S.makeSignless();
> >      (yyval.ArgList)->push_back(std::pair<PATypeInfo, char*> 
> > (VoidTI, 0));
> >    ;}
> >      break;
> >
> >    case 219:
> > -#line 2559 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2808 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.ArgList) = new std::vector<std::pair<PATypeInfo,char*> > 
> > ();
> >      PATypeInfo VoidTI;
> >      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> > -    VoidTI.S = Signless;
> > +    VoidTI.S.makeSignless();
> >      (yyval.ArgList)->push_back(std::pair<PATypeInfo, char*> 
> > (VoidTI, 0));
> >    ;}
> >      break;
> >
> >    case 220:
> > -#line 2566 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2815 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.ArgList) = 0; ;}
> >      break;
> >
> >    case 221:
> > -#line 2570 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 2819 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      UnEscapeLexed((yyvsp[-5].StrVal));
> >      std::string FunctionName((yyvsp[-5].StrVal));
> > @@ -5082,6 +5331,8 @@
> >      if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
> >        error("LLVM functions cannot return aggregate types");
> >
> > +    Signedness FTySign;
> > +    FTySign.makeComposite((yyvsp[-6].TypeVal).S);
> >      std::vector<const Type*> ParamTyList;
> >
> >      // In LLVM 2.0 the signatures of three varargs intrinsics  
> > changed to take
> > @@ -5097,6 +5348,7 @@
> >             I = (yyvsp[-3].ArgList)->begin(), E = (yyvsp 
> > [-3].ArgList)->end(); I != E; ++I) {
> >          const Type *Ty = I->first.PAT->get();
> >          ParamTyList.push_back(Ty);
> > +        FTySign.add(I->first.S);
> >        }
> >      }
> >
> > @@ -5123,6 +5375,7 @@
> >      } else {
> >        ID = ValID::create((int)CurModule.Values[PFT].size());
> >      }
> > +    ID.S.makeComposite(FTySign);
> >
> >      Function *Fn = 0;
> >      Module* M = CurModule.CurrentModule;
> > @@ -5149,14 +5402,16 @@
> >            std::string NewName(makeNameUnique(FunctionName));
> >            if (Conflict->hasInternalLinkage()) {
> >              Conflict->setName(NewName);
> > -            RenameMapKey Key = std::make_pair 
> > (FunctionName,Conflict->getType());
> > +            RenameMapKey Key =
> > +              makeRenameMapKey(FunctionName, Conflict->getType(),  
> > ID.S);
> >              CurModule.RenameMap[Key] = NewName;
> >              Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
> >              InsertValue(Fn, CurModule.Values);
> >            } else {
> >              Fn = new Function(FT, CurFun.Linkage, NewName, M);
> >              InsertValue(Fn, CurModule.Values);
> > -            RenameMapKey Key = std::make_pair(FunctionName,PFT);
> > +            RenameMapKey Key =
> > +              makeRenameMapKey(FunctionName, PFT, ID.S);
> >              CurModule.RenameMap[Key] = NewName;
> >            }
> >          } else {
> > @@ -5178,9 +5433,11 @@
> >          // type plane. After PR411 was fixed, this is no loner the  
> > case.
> >          // To resolve this we must rename one of the two.
> >          if (Conflict->hasInternalLinkage()) {
> > -          // We can safely renamed the Conflict.
> > +          // We can safely rename the Conflict.
> > +          RenameMapKey Key =
> > +            makeRenameMapKey(Conflict->getName(), Conflict->getType 
> > (),
> > +              CurModule.NamedValueSigns[Conflict->getName()]);
> >            Conflict->setName(makeNameUnique(Conflict->getName()));
> > -          RenameMapKey Key = std::make_pair(FunctionName,Conflict- 
> > >getType());
> >            CurModule.RenameMap[Key] = Conflict->getName();
> >            Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
> >            InsertValue(Fn, CurModule.Values);
> > @@ -5189,7 +5446,7 @@
> >            std::string NewName = makeNameUnique(FunctionName);
> >            Fn = new Function(FT, CurFun.Linkage, NewName, M);
> >            InsertValue(Fn, CurModule.Values);
> > -          RenameMapKey Key = std::make_pair(FunctionName,PFT);
> > +          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT,  
> > ID.S);
> >            CurModule.RenameMap[Key] = NewName;
> >          } else {
> >            // We can't quietly rename either of these things, but  
> > we must
> > @@ -5200,7 +5457,7 @@
> >                    "' may cause linkage errors");
> >            Fn = new Function(FT, CurFun.Linkage, NewName, M);
> >            InsertValue(Fn, CurModule.Values);
> > -          RenameMapKey Key = std::make_pair(FunctionName,PFT);
> > +          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT,  
> > ID.S);
> >            CurModule.RenameMap[Key] = NewName;
> >          }
> >        } else {
> > @@ -5239,7 +5496,8 @@
> >        std::vector<std::pair<PATypeInfo,char*> >::iterator E =  
> > (yyvsp[-3].ArgList)->end();
> >        for ( ; I != E && ArgIt != ArgEnd; ++I, ++ArgIt) {
> >          delete I->first.PAT;                      // Delete the  
> > typeholder...
> > -        setValueName(ArgIt, I->second);           // Insert arg  
> > into symtab...
> > +        ValueInfo VI; VI.V = ArgIt; VI.S.copy(I->first.S);
> > +        setValueName(VI, I->second);           // Insert arg into  
> > symtab...
> >          InsertValue(ArgIt);
> >        }
> >        delete (yyvsp[-3].ArgList);                     // We're now  
> > done with the argument list
> > @@ -5248,7 +5506,7 @@
> >      break;
> >
> >    case 224:
> > -#line 2750 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3008 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.FunctionVal) = CurFun.CurrentFunction;
> >
> > @@ -5259,39 +5517,39 @@
> >      break;
> >
> >    case 227:
> > -#line 2764 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3022 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
> >    ;}
> >      break;
> >
> >    case 228:
> > -#line 2769 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3027 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.Linkage) = GlobalValue::ExternalLinkage; ;}
> >      break;
> >
> >    case 229:
> > -#line 2770 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3028 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.Linkage) = GlobalValue::DLLImportLinkage; ;}
> >      break;
> >
> >    case 230:
> > -#line 2771 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3029 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.Linkage) = GlobalValue::ExternalWeakLinkage; ;}
> >      break;
> >
> >    case 231:
> > -#line 2775 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3033 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { CurFun.isDeclare = true; ;}
> >      break;
> >
> >    case 232:
> > -#line 2776 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3034 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { CurFun.Linkage = (yyvsp[0].Linkage); ;}
> >      break;
> >
> >    case 233:
> > -#line 2776 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3034 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.FunctionVal) = CurFun.CurrentFunction;
> >      CurFun.FunctionDone();
> > @@ -5300,63 +5558,69 @@
> >      break;
> >
> >    case 234:
> > -#line 2788 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3046 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.BoolVal) = false; ;}
> >      break;
> >
> >    case 235:
> > -#line 2789 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3047 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.BoolVal) = true; ;}
> >      break;
> >
> >    case 236:
> > -#line 2794 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > -    {    (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val)); ;}
> > +#line 3052 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +    { (yyval.ValIDVal) = ValID::create((yyvsp[0].SInt64Val)); ;}
> >      break;
> >
> >    case 237:
> > -#line 2795 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3053 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.ValIDVal) = ValID::create((yyvsp[0].UInt64Val)); ;}
> >      break;
> >
> >    case 238:
> > -#line 2796 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3054 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.ValIDVal) = ValID::create((yyvsp[0].FPVal)); ;}
> >      break;
> >
> >    case 239:
> > -#line 2797 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > -    { (yyval.ValIDVal) = ValID::create(ConstantInt::get 
> > (Type::Int1Ty, true)); ;}
> > +#line 3055 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +    {
> > +    (yyval.ValIDVal) = ValID::create(ConstantInt::get 
> > (Type::Int1Ty, true));
> > +    (yyval.ValIDVal).S.makeUnsigned();
> > +  ;}
> >      break;
> >
> >    case 240:
> > -#line 2798 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > -    { (yyval.ValIDVal) = ValID::create(ConstantInt::get 
> > (Type::Int1Ty, false)); ;}
> > +#line 3059 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +    {
> > +    (yyval.ValIDVal) = ValID::create(ConstantInt::get 
> > (Type::Int1Ty, false));
> > +    (yyval.ValIDVal).S.makeUnsigned();
> > +  ;}
> >      break;
> >
> >    case 241:
> > -#line 2799 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3063 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.ValIDVal) = ValID::createNull(); ;}
> >      break;
> >
> >    case 242:
> > -#line 2800 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3064 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.ValIDVal) = ValID::createUndef(); ;}
> >      break;
> >
> >    case 243:
> > -#line 2801 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3065 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.ValIDVal) = ValID::createZeroInit(); ;}
> >      break;
> >
> >    case 244:
> > -#line 2802 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3066 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { // Nonempty unsized packed vector
> >      const Type *ETy = (*(yyvsp[-1].ConstVector))[0].C->getType();
> >      int NumElements = (yyvsp[-1].ConstVector)->size();
> >      VectorType* pt = VectorType::get(ETy, NumElements);
> > -    PATypeHolder* PTy = new PATypeHolder(
> > -      HandleUpRefs(VectorType::get(ETy, NumElements)));
> > +    (yyval.ValIDVal).S.makeComposite((*(yyvsp[-1].ConstVector)) 
> > [0].S);
> > +    PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt,  
> > (yyval.ValIDVal).S));
> >
> >      // Verify all elements are correct type!
> >      std::vector<Constant*> Elems;
> > @@ -5375,14 +5639,15 @@
> >      break;
> >
> >    case 245:
> > -#line 2823 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3087 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.ValIDVal) = ValID::create((yyvsp[0].ConstVal).C);
> > +    (yyval.ValIDVal).S.copy((yyvsp[0].ConstVal).S);
> >    ;}
> >      break;
> >
> >    case 246:
> > -#line 2826 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3091 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      char *End = UnEscapeLexed((yyvsp[-2].StrVal), true);
> >      std::string AsmStr = std::string((yyvsp[-2].StrVal), End);
> > @@ -5395,52 +5660,54 @@
> >      break;
> >
> >    case 247:
> > -#line 2841 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > -    {  (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal)); ;}
> > +#line 3105 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +    {  (yyval.ValIDVal) = ValID::create((yyvsp[0].SIntVal));  
> > (yyval.ValIDVal).S.makeSignless(); ;}
> >      break;
> >
> >    case 248:
> > -#line 2842 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > -    {  (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal)); ;}
> > +#line 3106 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +    {  (yyval.ValIDVal) = ValID::create((yyvsp[0].StrVal));  
> > (yyval.ValIDVal).S.makeSignless(); ;}
> >      break;
> >
> >    case 251:
> > -#line 2855 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3119 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
> > -    (yyval.ValueVal).S = (yyvsp[-1].TypeVal).S;
> > +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
> >      (yyval.ValueVal).V = getVal(Ty, (yyvsp[0].ValIDVal));
> > +    (yyval.ValueVal).S.copy((yyvsp[-1].TypeVal).S);
> >      delete (yyvsp[-1].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 252:
> > -#line 2864 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3129 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
> >    ;}
> >      break;
> >
> >    case 253:
> > -#line 2867 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3132 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { // Do not allow functions with 0 basic blocks
> >      (yyval.FunctionVal) = (yyvsp[-1].FunctionVal);
> >    ;}
> >      break;
> >
> >    case 254:
> > -#line 2876 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3141 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > -    setValueName((yyvsp[0].TermInstVal), (yyvsp[-1].StrVal));
> > -    InsertValue((yyvsp[0].TermInstVal));
> > -    (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp 
> > [0].TermInstVal));
> > +    ValueInfo VI; VI.V = (yyvsp[0].TermInstVal).TI; VI.S.copy 
> > ((yyvsp[0].TermInstVal).S);
> > +    setValueName(VI, (yyvsp[-1].StrVal));
> > +    InsertValue((yyvsp[0].TermInstVal).TI);
> > +    (yyvsp[-2].BasicBlockVal)->getInstList().push_back((yyvsp 
> > [0].TermInstVal).TI);
> >      InsertValue((yyvsp[-2].BasicBlockVal));
> >      (yyval.BasicBlockVal) = (yyvsp[-2].BasicBlockVal);
> >    ;}
> >      break;
> >
> >    case 255:
> > -#line 2886 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3152 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if ((yyvsp[0].InstVal).I)
> >        (yyvsp[-1].BasicBlockVal)->getInstList().push_back((yyvsp 
> > [0].InstVal).I);
> > @@ -5449,9 +5716,9 @@
> >      break;
> >
> >    case 256:
> > -#line 2891 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3157 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > -    (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int) 
> > CurFun.NextBBNum++), true);
> > +    (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((int) 
> > CurFun.NextBBNum++),true);
> >      // Make sure to move the basic block to the correct location  
> > in the
> >      // function, instead of leaving it inserted wherever it was first
> >      // referenced.
> > @@ -5462,7 +5729,7 @@
> >      break;
> >
> >    case 257:
> > -#line 2900 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3166 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.BasicBlockVal) = CurBB = getBBVal(ValID::create((yyvsp 
> > [0].StrVal)), true);
> >      // Make sure to move the basic block to the correct location  
> > in the
> > @@ -5475,44 +5742,54 @@
> >      break;
> >
> >    case 260:
> > -#line 2914 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {              // Return with a result...
> > -    (yyval.TermInstVal) = new ReturnInst((yyvsp[0].ValueVal).V);
> > +    (yyval.TermInstVal).TI = new ReturnInst((yyvsp[0].ValueVal).V);
> > +    (yyval.TermInstVal).S.makeSignless();
> >    ;}
> >      break;
> >
> >    case 261:
> > -#line 2917 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3184 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {                                       // Return with no  
> > result...
> > -    (yyval.TermInstVal) = new ReturnInst();
> > +    (yyval.TermInstVal).TI = new ReturnInst();
> > +    (yyval.TermInstVal).S.makeSignless();
> >    ;}
> >      break;
> >
> >    case 262:
> > -#line 2920 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3188 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {                         // Unconditional Branch...
> >      BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
> > -    (yyval.TermInstVal) = new BranchInst(tmpBB);
> > +    (yyval.TermInstVal).TI = new BranchInst(tmpBB);
> > +    (yyval.TermInstVal).S.makeSignless();
> >    ;}
> >      break;
> >
> >    case 263:
> > -#line 2924 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3193 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > +    (yyvsp[-3].ValIDVal).S.makeSignless();
> > +    (yyvsp[0].ValIDVal).S.makeSignless();
> >      BasicBlock* tmpBBA = getBBVal((yyvsp[-3].ValIDVal));
> >      BasicBlock* tmpBBB = getBBVal((yyvsp[0].ValIDVal));
> > +    (yyvsp[-6].ValIDVal).S.makeUnsigned();
> >      Value* tmpVal = getVal(Type::Int1Ty, (yyvsp[-6].ValIDVal));
> > -    (yyval.TermInstVal) = new BranchInst(tmpBBA, tmpBBB, tmpVal);
> > +    (yyval.TermInstVal).TI = new BranchInst(tmpBBA, tmpBBB, tmpVal);
> > +    (yyval.TermInstVal).S.makeSignless();
> >    ;}
> >      break;
> >
> >    case 264:
> > -#line 2930 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3203 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > +    (yyvsp[-6].ValIDVal).S.copy((yyvsp[-7].PrimType).S);
> >      Value* tmpVal = getVal((yyvsp[-7].PrimType).T, (yyvsp 
> > [-6].ValIDVal));
> > +    (yyvsp[-3].ValIDVal).S.makeSignless();
> >      BasicBlock* tmpBB = getBBVal((yyvsp[-3].ValIDVal));
> >      SwitchInst *S = new SwitchInst(tmpVal, tmpBB, (yyvsp 
> > [-1].JumpTable)->size());
> > -    (yyval.TermInstVal) = S;
> > +    (yyval.TermInstVal).TI = S;
> > +    (yyval.TermInstVal).S.makeSignless();
> >      std::vector<std::pair<Constant*,BasicBlock*> >::iterator I =  
> > (yyvsp[-1].JumpTable)->begin(),
> >        E = (yyvsp[-1].JumpTable)->end();
> >      for (; I != E; ++I) {
> > @@ -5526,29 +5803,36 @@
> >      break;
> >
> >    case 265:
> > -#line 2945 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3221 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > +    (yyvsp[-5].ValIDVal).S.copy((yyvsp[-6].PrimType).S);
> >      Value* tmpVal = getVal((yyvsp[-6].PrimType).T, (yyvsp 
> > [-5].ValIDVal));
> > +    (yyvsp[-2].ValIDVal).S.makeSignless();
> >      BasicBlock* tmpBB = getBBVal((yyvsp[-2].ValIDVal));
> >      SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
> > -    (yyval.TermInstVal) = S;
> > +    (yyval.TermInstVal).TI = S;
> > +    (yyval.TermInstVal).S.makeSignless();
> >    ;}
> >      break;
> >
> >    case 266:
> > -#line 2952 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3231 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const PointerType *PFTy;
> >      const FunctionType *Ty;
> > +    Signedness FTySign;
> >
> >      if (!(PFTy = dyn_cast<PointerType>((yyvsp[-10].TypeVal).PAT- 
> > >get())) ||
> >          !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
> >        // Pull out the types of all of the arguments...
> >        std::vector<const Type*> ParamTypes;
> > +      FTySign.makeComposite((yyvsp[-10].TypeVal).S);
> >        if ((yyvsp[-7].ValueList)) {
> >          for (std::vector<ValueInfo>::iterator I = (yyvsp 
> > [-7].ValueList)->begin(), E = (yyvsp[-7].ValueList)->end();
> > -             I != E; ++I)
> > +             I != E; ++I) {
> >            ParamTypes.push_back((*I).V->getType());
> > +          FTySign.add(I->S);
> > +        }
> >        }
> >        FunctionType::ParamAttrsList ParamAttrs;
> >        if ((yyvsp[-11].UIntVal) == OldCallingConv::CSRet) {
> > @@ -5559,14 +5843,19 @@
> >        if (isVarArg) ParamTypes.pop_back();
> >        Ty = FunctionType::get((yyvsp[-10].TypeVal).PAT->get(),  
> > ParamTypes, isVarArg, ParamAttrs);
> >        PFTy = PointerType::get(Ty);
> > +      (yyval.TermInstVal).S.copy((yyvsp[-10].TypeVal).S);
> > +    } else {
> > +      FTySign = (yyvsp[-10].TypeVal).S;
> > +      (yyval.TermInstVal).S.copy((yyvsp[-10].TypeVal).S.get 
> > (0)); // 0th element of FuncTy sign is result ty
> >      }
> > +    (yyvsp[-9].ValIDVal).S.makeComposite(FTySign);
> >      Value *V = getVal(PFTy, (yyvsp[-9].ValIDVal));   // Get the  
> > function we're calling...
> >      BasicBlock *Normal = getBBVal((yyvsp[-3].ValIDVal));
> >      BasicBlock *Except = getBBVal((yyvsp[0].ValIDVal));
> >
> >      // Create the call node...
> >      if (!(yyvsp[-7].ValueList))  
> > {                                   // Has no arguments?
> > -      (yyval.TermInstVal) = new InvokeInst(V, Normal, Except, 0, 0);
> > +      (yyval.TermInstVal).TI = new InvokeInst(V, Normal, Except,  
> > 0, 0);
> >      } else {                                     // Has arguments?
> >        // Loop through FunctionType's arguments and ensure they are  
> > specified
> >        // correctly!
> > @@ -5586,58 +5875,64 @@
> >        if (I != E || (ArgI != ArgE && !Ty->isVarArg()))
> >          error("Invalid number of parameters detected");
> >
> > -      (yyval.TermInstVal) = new InvokeInst(V, Normal, Except, &Args 
> > [0], Args.size());
> > +      (yyval.TermInstVal).TI = new InvokeInst(V, Normal, Except,  
> > &Args[0], Args.size());
> >      }
> > -    cast<InvokeInst>((yyval.TermInstVal))->setCallingConv 
> > (upgradeCallingConv((yyvsp[-11].UIntVal)));
> > +    cast<InvokeInst>((yyval.TermInstVal).TI)->setCallingConv 
> > (upgradeCallingConv((yyvsp[-11].UIntVal)));
> >      delete (yyvsp[-10].TypeVal).PAT;
> >      delete (yyvsp[-7].ValueList);
> >    ;}
> >      break;
> >
> >    case 267:
> > -#line 3007 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3295 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > -    (yyval.TermInstVal) = new UnwindInst();
> > +    (yyval.TermInstVal).TI = new UnwindInst();
> > +    (yyval.TermInstVal).S.makeSignless();
> >    ;}
> >      break;
> >
> >    case 268:
> > -#line 3010 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3299 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > -    (yyval.TermInstVal) = new UnreachableInst();
> > +    (yyval.TermInstVal).TI = new UnreachableInst();
> > +    (yyval.TermInstVal).S.makeSignless();
> >    ;}
> >      break;
> >
> >    case 269:
> > -#line 3016 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3306 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.JumpTable) = (yyvsp[-5].JumpTable);
> > +    (yyvsp[-3].ValIDVal).S.copy((yyvsp[-4].PrimType).S);
> >      Constant *V = cast<Constant>(getExistingValue((yyvsp 
> > [-4].PrimType).T, (yyvsp[-3].ValIDVal)));
> >
> >      if (V == 0)
> >        error("May only switch on a constant pool value");
> >
> > +    (yyvsp[0].ValIDVal).S.makeSignless();
> >      BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
> >      (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
> >    ;}
> >      break;
> >
> >    case 270:
> > -#line 3026 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3318 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.JumpTable) = new std::vector<std::pair<Constant*,  
> > BasicBlock*> >();
> > +    (yyvsp[-3].ValIDVal).S.copy((yyvsp[-4].PrimType).S);
> >      Constant *V = cast<Constant>(getExistingValue((yyvsp 
> > [-4].PrimType).T, (yyvsp[-3].ValIDVal)));
> >
> >      if (V == 0)
> >        error("May only switch on a constant pool value");
> >
> > +    (yyvsp[0].ValIDVal).S.makeSignless();
> >      BasicBlock* tmpBB = getBBVal((yyvsp[0].ValIDVal));
> >      (yyval.JumpTable)->push_back(std::make_pair(V, tmpBB));
> >    ;}
> >      break;
> >
> >    case 271:
> > -#line 3039 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3333 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      bool omit = false;
> >      if ((yyvsp[-1].StrVal))
> > @@ -5659,9 +5954,10 @@
> >            omit = true;
> >      if (omit) {
> >        (yyval.InstVal).I = 0;
> > -      (yyval.InstVal).S = Signless;
> > +      (yyval.InstVal).S.makeSignless();
> >      } else {
> > -      setValueName((yyvsp[0].InstVal).I, (yyvsp[-1].StrVal));
> > +      ValueInfo VI; VI.V = (yyvsp[0].InstVal).I; VI.S.copy((yyvsp 
> > [0].InstVal).S);
> > +      setValueName(VI, (yyvsp[-1].StrVal));
> >        InsertValue((yyvsp[0].InstVal).I);
> >        (yyval.InstVal) = (yyvsp[0].InstVal);
> >      }
> > @@ -5669,11 +5965,13 @@
> >      break;
> >
> >    case 272:
> > -#line 3068 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3363 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {    // Used for PHI nodes
> >      (yyval.PHIList).P = new std::list<std::pair<Value*,  
> > BasicBlock*> >();
> > -    (yyval.PHIList).S = (yyvsp[-5].TypeVal).S;
> > +    (yyval.PHIList).S.copy((yyvsp[-5].TypeVal).S);
> > +    (yyvsp[-3].ValIDVal).S.copy((yyvsp[-5].TypeVal).S);
> >      Value* tmpVal = getVal((yyvsp[-5].TypeVal).PAT->get(), (yyvsp 
> > [-3].ValIDVal));
> > +    (yyvsp[-1].ValIDVal).S.makeSignless();
> >      BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
> >      (yyval.PHIList).P->push_back(std::make_pair(tmpVal, tmpBB));
> >      delete (yyvsp[-5].TypeVal).PAT;
> > @@ -5681,17 +5979,19 @@
> >      break;
> >
> >    case 273:
> > -#line 3076 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3373 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.PHIList) = (yyvsp[-6].PHIList);
> > +    (yyvsp[-3].ValIDVal).S.copy((yyvsp[-6].PHIList).S);
> >      Value* tmpVal = getVal((yyvsp[-6].PHIList).P->front().first- 
> > >getType(), (yyvsp[-3].ValIDVal));
> > +    (yyvsp[-1].ValIDVal).S.makeSignless();
> >      BasicBlock* tmpBB = getBBVal((yyvsp[-1].ValIDVal));
> >      (yyvsp[-6].PHIList).P->push_back(std::make_pair(tmpVal, tmpBB));
> >    ;}
> >      break;
> >
> >    case 274:
> > -#line 3084 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3383 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {    // Used for call statements, and memory insts...
> >      (yyval.ValueList) = new std::vector<ValueInfo>();
> >      (yyval.ValueList)->push_back((yyvsp[0].ValueVal));
> > @@ -5699,7 +5999,7 @@
> >      break;
> >
> >    case 275:
> > -#line 3088 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3387 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.ValueList) = (yyvsp[-2].ValueList);
> >      (yyvsp[-2].ValueList)->push_back((yyvsp[0].ValueVal));
> > @@ -5707,27 +6007,29 @@
> >      break;
> >
> >    case 277:
> > -#line 3096 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3395 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.ValueList) = 0; ;}
> >      break;
> >
> >    case 278:
> > -#line 3100 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3399 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.BoolVal) = true;
> >    ;}
> >      break;
> >
> >    case 279:
> > -#line 3103 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3402 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.BoolVal) = false;
> >    ;}
> >      break;
> >
> >    case 280:
> > -#line 3109 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3408 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > +    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> > +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> >      const Type* Ty = (yyvsp[-3].TypeVal).PAT->get();
> >      if (!Ty->isInteger() && !Ty->isFloatingPoint() && ! 
> > isa<VectorType>(Ty))
> >        error("Arithmetic operator requires integer, FP, or packed  
> > operands");
> > @@ -5741,14 +6043,16 @@
> >      (yyval.InstVal).I = BinaryOperator::create(Opcode, val1, val2);
> >      if ((yyval.InstVal).I == 0)
> >        error("binary operator returned null");
> > -    (yyval.InstVal).S = (yyvsp[-3].TypeVal).S;
> > +    (yyval.InstVal).S.copy((yyvsp[-3].TypeVal).S);
> >      delete (yyvsp[-3].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 281:
> > -#line 3126 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3427 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > +    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> > +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> >      const Type *Ty = (yyvsp[-3].TypeVal).PAT->get();
> >      if (!Ty->isInteger()) {
> >        if (!isa<VectorType>(Ty) ||
> > @@ -5761,14 +6065,16 @@
> >      (yyval.InstVal).I = BinaryOperator::create(Opcode, tmpVal1,  
> > tmpVal2);
> >      if ((yyval.InstVal).I == 0)
> >        error("binary operator returned null");
> > -    (yyval.InstVal).S = (yyvsp[-3].TypeVal).S;
> > +    (yyval.InstVal).S.copy((yyvsp[-3].TypeVal).S);
> >      delete (yyvsp[-3].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 282:
> > -#line 3142 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3445 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > +    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> > +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> >      const Type* Ty = (yyvsp[-3].TypeVal).PAT->get();
> >      if(isa<VectorType>(Ty))
> >        error("VectorTypes currently not supported in setcc  
> > instructions");
> > @@ -5779,14 +6085,16 @@
> >      (yyval.InstVal).I = CmpInst::create(Opcode, pred, tmpVal1,  
> > tmpVal2);
> >      if ((yyval.InstVal).I == 0)
> >        error("binary operator returned null");
> > -    (yyval.InstVal).S = Unsigned;
> > +    (yyval.InstVal).S.makeUnsigned();
> >      delete (yyvsp[-3].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 283:
> > -#line 3156 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3461 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > +    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> > +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> >      const Type *Ty = (yyvsp[-3].TypeVal).PAT->get();
> >      if (isa<VectorType>(Ty))
> >        error("VectorTypes currently not supported in icmp  
> > instructions");
> > @@ -5795,14 +6103,16 @@
> >      Value* tmpVal1 = getVal(Ty, (yyvsp[-2].ValIDVal));
> >      Value* tmpVal2 = getVal(Ty, (yyvsp[0].ValIDVal));
> >      (yyval.InstVal).I = new ICmpInst((yyvsp[-4].IPred), tmpVal1,  
> > tmpVal2);
> > -    (yyval.InstVal).S = Unsigned;
> > +    (yyval.InstVal).S.makeUnsigned();
> >      delete (yyvsp[-3].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 284:
> > -#line 3168 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3475 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > +    (yyvsp[-2].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> > +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-3].TypeVal).S);
> >      const Type *Ty = (yyvsp[-3].TypeVal).PAT->get();
> >      if (isa<VectorType>(Ty))
> >        error("VectorTypes currently not supported in fcmp  
> > instructions");
> > @@ -5811,13 +6121,13 @@
> >      Value* tmpVal1 = getVal(Ty, (yyvsp[-2].ValIDVal));
> >      Value* tmpVal2 = getVal(Ty, (yyvsp[0].ValIDVal));
> >      (yyval.InstVal).I = new FCmpInst((yyvsp[-4].FPred), tmpVal1,  
> > tmpVal2);
> > -    (yyval.InstVal).S = Unsigned;
> > +    (yyval.InstVal).S.makeUnsigned();
> >      delete (yyvsp[-3].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 285:
> > -#line 3180 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3489 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      warning("Use of obsolete 'not' instruction: Replacing with  
> > 'xor");
> >      const Type *Ty = (yyvsp[0].ValueVal).V->getType();
> > @@ -5827,12 +6137,12 @@
> >      (yyval.InstVal).I = BinaryOperator::create(Instruction::Xor,  
> > (yyvsp[0].ValueVal).V, Ones);
> >      if ((yyval.InstVal).I == 0)
> >        error("Could not create a xor instruction");
> > -    (yyval.InstVal).S = (yyvsp[0].ValueVal).S;
> > +    (yyval.InstVal).S.copy((yyvsp[0].ValueVal).S);
> >    ;}
> >      break;
> >
> >    case 286:
> > -#line 3191 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3500 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if (!(yyvsp[0].ValueVal).V->getType()->isInteger() ||
> >          cast<IntegerType>((yyvsp[0].ValueVal).V->getType())- 
> > >getBitWidth() != 8)
> > @@ -5849,25 +6159,25 @@
> >      else
> >        ShiftAmt = (yyvsp[0].ValueVal).V;
> >      (yyval.InstVal).I = BinaryOperator::create(getBinaryOp((yyvsp 
> > [-3].BinaryOpVal), Ty, (yyvsp[-2].ValueVal).S), (yyvsp 
> > [-2].ValueVal).V, ShiftAmt);
> > -    (yyval.InstVal).S = (yyvsp[-2].ValueVal).S;
> > +    (yyval.InstVal).S.copy((yyvsp[-2].ValueVal).S);
> >    ;}
> >      break;
> >
> >    case 287:
> > -#line 3209 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3518 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *DstTy = (yyvsp[0].TypeVal).PAT->get();
> >      if (!DstTy->isFirstClassType())
> >        error("cast instruction to a non-primitive type: '" +
> >              DstTy->getDescription() + "'");
> >      (yyval.InstVal).I = cast<Instruction>(getCast((yyvsp 
> > [-3].CastOpVal), (yyvsp[-2].ValueVal).V, (yyvsp[-2].ValueVal).S,  
> > DstTy, (yyvsp[0].TypeVal).S, true));
> > -    (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
> > +    (yyval.InstVal).S.copy((yyvsp[0].TypeVal).S);
> >      delete (yyvsp[0].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 288:
> > -#line 3218 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3527 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if (!(yyvsp[-4].ValueVal).V->getType()->isInteger() ||
> >          cast<IntegerType>((yyvsp[-4].ValueVal).V->getType())- 
> > >getBitWidth() != 1)
> > @@ -5875,23 +6185,23 @@
> >      if ((yyvsp[-2].ValueVal).V->getType() != (yyvsp[0].ValueVal).V- 
> > >getType())
> >        error("select value types should match");
> >      (yyval.InstVal).I = new SelectInst((yyvsp[-4].ValueVal).V,  
> > (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V);
> > -    (yyval.InstVal).S = (yyvsp[-4].ValueVal).S;
> > +    (yyval.InstVal).S.copy((yyvsp[-2].ValueVal).S);
> >    ;}
> >      break;
> >
> >    case 289:
> > -#line 3227 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3536 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *Ty = (yyvsp[0].TypeVal).PAT->get();
> >      NewVarArgs = true;
> >      (yyval.InstVal).I = new VAArgInst((yyvsp[-2].ValueVal).V, Ty);
> > -    (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
> > +    (yyval.InstVal).S.copy((yyvsp[0].TypeVal).S);
> >      delete (yyvsp[0].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 290:
> > -#line 3234 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3543 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type* ArgTy = (yyvsp[-2].ValueVal).V->getType();
> >      const Type* DstTy = (yyvsp[0].TypeVal).PAT->get();
> > @@ -5910,13 +6220,13 @@
> >      CurBB->getInstList().push_back(bar);
> >      CurBB->getInstList().push_back(new StoreInst(bar, foo));
> >      (yyval.InstVal).I = new VAArgInst(foo, DstTy);
> > -    (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
> > +    (yyval.InstVal).S.copy((yyvsp[0].TypeVal).S);
> >      delete (yyvsp[0].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 291:
> > -#line 3255 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3564 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type* ArgTy = (yyvsp[-2].ValueVal).V->getType();
> >      const Type* DstTy = (yyvsp[0].TypeVal).PAT->get();
> > @@ -5938,43 +6248,43 @@
> >      Instruction* tmp = new VAArgInst(foo, DstTy);
> >      CurBB->getInstList().push_back(tmp);
> >      (yyval.InstVal).I = new LoadInst(foo);
> > -    (yyval.InstVal).S = (yyvsp[0].TypeVal).S;
> > +    (yyval.InstVal).S.copy((yyvsp[0].TypeVal).S);
> >      delete (yyvsp[0].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 292:
> > -#line 3279 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3588 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if (!ExtractElementInst::isValidOperands((yyvsp 
> > [-2].ValueVal).V, (yyvsp[0].ValueVal).V))
> >        error("Invalid extractelement operands");
> >      (yyval.InstVal).I = new ExtractElementInst((yyvsp 
> > [-2].ValueVal).V, (yyvsp[0].ValueVal).V);
> > -    (yyval.InstVal).S = (yyvsp[-2].ValueVal).S;
> > +    (yyval.InstVal).S.copy((yyvsp[-2].ValueVal).S.get(0));
> >    ;}
> >      break;
> >
> >    case 293:
> > -#line 3285 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3594 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if (!InsertElementInst::isValidOperands((yyvsp 
> > [-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
> >        error("Invalid insertelement operands");
> >      (yyval.InstVal).I = new InsertElementInst((yyvsp 
> > [-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V);
> > -    (yyval.InstVal).S = (yyvsp[-4].ValueVal).S;
> > +    (yyval.InstVal).S.copy((yyvsp[-4].ValueVal).S);
> >    ;}
> >      break;
> >
> >    case 294:
> > -#line 3291 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3600 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      if (!ShuffleVectorInst::isValidOperands((yyvsp 
> > [-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V))
> >        error("Invalid shufflevector operands");
> >      (yyval.InstVal).I = new ShuffleVectorInst((yyvsp 
> > [-4].ValueVal).V, (yyvsp[-2].ValueVal).V, (yyvsp[0].ValueVal).V);
> > -    (yyval.InstVal).S = (yyvsp[-4].ValueVal).S;
> > +    (yyval.InstVal).S.copy((yyvsp[-4].ValueVal).S);
> >    ;}
> >      break;
> >
> >    case 295:
> > -#line 3297 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3606 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *Ty = (yyvsp[0].PHIList).P->front().first->getType();
> >      if (!Ty->isFirstClassType())
> > @@ -5988,26 +6298,29 @@
> >        (yyvsp[0].PHIList).P->pop_front();
> >      }
> >      (yyval.InstVal).I = PHI;
> > -    (yyval.InstVal).S = (yyvsp[0].PHIList).S;
> > +    (yyval.InstVal).S.copy((yyvsp[0].PHIList).S);
> >      delete (yyvsp[0].PHIList).P;  // Free the list...
> >    ;}
> >      break;
> >
> >    case 296:
> > -#line 3313 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3622 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > -
> >      // Handle the short call syntax
> >      const PointerType *PFTy;
> >      const FunctionType *FTy;
> > +    Signedness FTySign;
> >      if (!(PFTy = dyn_cast<PointerType>((yyvsp[-4].TypeVal).PAT->get 
> > ())) ||
> >          !(FTy = dyn_cast<FunctionType>(PFTy->getElementType()))) {
> >        // Pull out the types of all of the arguments...
> >        std::vector<const Type*> ParamTypes;
> > +      FTySign.makeComposite((yyvsp[-4].TypeVal).S);
> >        if ((yyvsp[-1].ValueList)) {
> >          for (std::vector<ValueInfo>::iterator I = (yyvsp 
> > [-1].ValueList)->begin(), E = (yyvsp[-1].ValueList)->end();
> > -             I != E; ++I)
> > +             I != E; ++I) {
> >            ParamTypes.push_back((*I).V->getType());
> > +          FTySign.add(I->S);
> > +        }
> >        }
> >
> >        FunctionType::ParamAttrsList ParamAttrs;
> > @@ -6024,7 +6337,12 @@
> >
> >        FTy = FunctionType::get(RetTy, ParamTypes, isVarArg,  
> > ParamAttrs);
> >        PFTy = PointerType::get(FTy);
> > +      (yyval.InstVal).S.copy((yyvsp[-4].TypeVal).S);
> > +    } else {
> > +      FTySign = (yyvsp[-4].TypeVal).S;
> > +      (yyval.InstVal).S.copy((yyvsp[-4].TypeVal).S.get(0)); // 0th  
> > element of FuncTy signedness is result sign
> >      }
> > +    (yyvsp[-3].ValIDVal).S.makeComposite(FTySign);
> >
> >      // First upgrade any intrinsic calls.
> >      std::vector<Value*> Args;
> > @@ -6036,7 +6354,6 @@
> >      // If we got an upgraded intrinsic
> >      if (Inst) {
> >        (yyval.InstVal).I = Inst;
> > -      (yyval.InstVal).S = Signless;
> >      } else {
> >        // Get the function we're calling
> >        Value *V = getVal(PFTy, (yyvsp[-3].ValIDVal));
> > @@ -6068,7 +6385,6 @@
> >        CI->setTailCall((yyvsp[-6].BoolVal));
> >        CI->setCallingConv(upgradeCallingConv((yyvsp[-5].UIntVal)));
> >        (yyval.InstVal).I = CI;
> > -      (yyval.InstVal).S = (yyvsp[-4].TypeVal).S;
> >      }
> >      delete (yyvsp[-4].TypeVal).PAT;
> >      delete (yyvsp[-1].ValueList);
> > @@ -6076,88 +6392,90 @@
> >      break;
> >
> >    case 297:
> > -#line 3391 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3706 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      (yyval.InstVal) = (yyvsp[0].InstVal);
> >    ;}
> >      break;
> >
> >    case 298:
> > -#line 3399 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3714 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.ValueList) = (yyvsp[0].ValueList); ;}
> >      break;
> >
> >    case 299:
> > -#line 3400 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3715 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.ValueList) = new std::vector<ValueInfo>(); ;}
> >      break;
> >
> >    case 300:
> > -#line 3404 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3719 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.BoolVal) = true; ;}
> >      break;
> >
> >    case 301:
> > -#line 3405 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3720 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      { (yyval.BoolVal) = false; ;}
> >      break;
> >
> >    case 302:
> > -#line 3409 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3724 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
> > -    (yyval.InstVal).S = (yyvsp[-1].TypeVal).S;
> > +    (yyval.InstVal).S.makeComposite((yyvsp[-1].TypeVal).S);
> >      (yyval.InstVal).I = new MallocInst(Ty, 0, (yyvsp[0].UIntVal));
> >      delete (yyvsp[-1].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 303:
> > -#line 3415 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3730 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *Ty = (yyvsp[-4].TypeVal).PAT->get();
> > -    (yyval.InstVal).S = (yyvsp[-4].TypeVal).S;
> > +    (yyvsp[-1].ValIDVal).S.makeUnsigned();
> > +    (yyval.InstVal).S.makeComposite((yyvsp[-4].TypeVal).S);
> >      (yyval.InstVal).I = new MallocInst(Ty, getVal((yyvsp 
> > [-2].PrimType).T, (yyvsp[-1].ValIDVal)), (yyvsp[0].UIntVal));
> >      delete (yyvsp[-4].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 304:
> > -#line 3421 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3737 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *Ty = (yyvsp[-1].TypeVal).PAT->get();
> > -    (yyval.InstVal).S = (yyvsp[-1].TypeVal).S;
> > +    (yyval.InstVal).S.makeComposite((yyvsp[-1].TypeVal).S);
> >      (yyval.InstVal).I = new AllocaInst(Ty, 0, (yyvsp[0].UIntVal));
> >      delete (yyvsp[-1].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 305:
> > -#line 3427 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3743 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *Ty = (yyvsp[-4].TypeVal).PAT->get();
> > -    (yyval.InstVal).S = (yyvsp[-4].TypeVal).S;
> > +    (yyvsp[-1].ValIDVal).S.makeUnsigned();
> > +    (yyval.InstVal).S.makeComposite((yyvsp[-2].PrimType).S);
> >      (yyval.InstVal).I = new AllocaInst(Ty, getVal((yyvsp 
> > [-2].PrimType).T, (yyvsp[-1].ValIDVal)), (yyvsp[0].UIntVal));
> >      delete (yyvsp[-4].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 306:
> > -#line 3433 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3750 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type *PTy = (yyvsp[0].ValueVal).V->getType();
> >      if (!isa<PointerType>(PTy))
> >        error("Trying to free nonpointer type '" + PTy- 
> > >getDescription() + "'");
> >      (yyval.InstVal).I = new FreeInst((yyvsp[0].ValueVal).V);
> > -    (yyval.InstVal).S = Signless;
> > +    (yyval.InstVal).S.makeSignless();
> >    ;}
> >      break;
> >
> >    case 307:
> > -#line 3440 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3757 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> >      const Type* Ty = (yyvsp[-1].TypeVal).PAT->get();
> > -    (yyval.InstVal).S = (yyvsp[-1].TypeVal).S;
> > +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
> >      if (!isa<PointerType>(Ty))
> >        error("Can't load from nonpointer type: " + Ty- 
> > >getDescription());
> >      if (!cast<PointerType>(Ty)->getElementType()->isFirstClassType())
> > @@ -6165,13 +6483,15 @@
> >                       Ty->getDescription());
> >      Value* tmpVal = getVal(Ty, (yyvsp[0].ValIDVal));
> >      (yyval.InstVal).I = new LoadInst(tmpVal, "", (yyvsp 
> > [-3].BoolVal));
> > +    (yyval.InstVal).S.copy((yyvsp[-1].TypeVal).S.get(0));
> >      delete (yyvsp[-1].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 308:
> > -#line 3452 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3770 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > +    (yyvsp[0].ValIDVal).S.copy((yyvsp[-1].TypeVal).S);
> >      const PointerType *PTy = dyn_cast<PointerType>((yyvsp 
> > [-1].TypeVal).PAT->get());
> >      if (!PTy)
> >        error("Can't store to a nonpointer type: " +
> > @@ -6193,14 +6513,15 @@
> >        }
> >      }
> >      (yyval.InstVal).I = new StoreInst(StoreVal, tmpVal, (yyvsp 
> > [-5].BoolVal));
> > -    (yyval.InstVal).S = Signless;
> > +    (yyval.InstVal).S.makeSignless();
> >      delete (yyvsp[-1].TypeVal).PAT;
> >    ;}
> >      break;
> >
> >    case 309:
> > -#line 3477 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3796 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >      {
> > +    (yyvsp[-1].ValIDVal).S.copy((yyvsp[-2].TypeVal).S);
> >      const Type* Ty = (yyvsp[-2].TypeVal).PAT->get();
> >      if (!isa<PointerType>(Ty))
> >        error("getelementptr insn requires pointer operand");
> > @@ -6210,7 +6531,8 @@
> >
> >      Value* tmpVal = getVal(Ty, (yyvsp[-1].ValIDVal));
> >      (yyval.InstVal).I = new GetElementPtrInst(tmpVal, &VIndices 
> > [0], VIndices.size());
> > -    (yyval.InstVal).S = Signless;
> > +    ValueInfo VI; VI.V = tmpVal; VI.S.copy((yyvsp[-2].TypeVal).S);
> > +    (yyval.InstVal).S.copy(getElementSign(VI, VIndices));
> >      delete (yyvsp[-2].TypeVal).PAT;
> >      delete (yyvsp[0].ValueList);
> >    ;}
> > @@ -6221,7 +6543,7 @@
> >      }
> >
> >  /* Line 1126 of yacc.c.  */
> > -#line 6225 "UpgradeParser.tab.c"
> > +#line 6547 "UpgradeParser.tab.c"
> >  
> >    yyvsp -= yylen;
> >    yyssp -= yylen;
> > @@ -6489,7 +6811,7 @@
> >  }
> >
> >
> > -#line 3493 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 3814 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >
> >
> >  int yyerror(const char *ErrorMsg) {
> >
> >
> > Index: llvm/tools/llvm-upgrade/UpgradeParser.h.cvs
> > diff -u llvm/tools/llvm-upgrade/UpgradeParser.h.cvs:1.50 llvm/tools/ 
> > llvm-upgrade/UpgradeParser.h.cvs:1.51
> > --- llvm/tools/llvm-upgrade/UpgradeParser.h.cvs:1.50	Wed Mar 14  
> > 22:26:42 2007
> > +++ llvm/tools/llvm-upgrade/UpgradeParser.h.cvs	Wed Mar 21 12:15:50  
> > 2007
> > @@ -335,13 +335,13 @@
> >
> >
> >  #if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
> > -#line 1454 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> > +#line 1693 "/proj/llvm/llvm-1/tools/llvm-upgrade/UpgradeParser.y"
> >  typedef union YYSTYPE {
> >    llvm::Module                           *ModuleVal;
> >    llvm::Function                         *FunctionVal;
> >    std::pair<llvm::PATypeInfo, char*>     *ArgVal;
> >    llvm::BasicBlock                       *BasicBlockVal;
> > -  llvm::TerminatorInst                   *TermInstVal;
> > +  llvm::TermInstInfo                     TermInstVal;
> >    llvm::InstrInfo                        InstVal;
> >    llvm::ConstInfo                        ConstVal;
> >    llvm::ValueInfo                        ValueVal;
> >
> >
> > Index: llvm/tools/llvm-upgrade/UpgradeParser.y.cvs
> > diff -u llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.65 llvm/tools/ 
> > llvm-upgrade/UpgradeParser.y.cvs:1.66
> > --- llvm/tools/llvm-upgrade/UpgradeParser.y.cvs:1.65	Wed Mar 14  
> > 22:26:42 2007
> > +++ llvm/tools/llvm-upgrade/UpgradeParser.y.cvs	Wed Mar 21 12:15:50  
> > 2007
> > @@ -67,7 +67,7 @@
> >  //
> >  typedef std::vector<Value *> ValueList;           // Numbered defs
> >
> > -typedef std::pair<std::string,const Type*> RenameMapKey;
> > +typedef std::pair<std::string,TypeInfo> RenameMapKey;
> >  typedef std::map<RenameMapKey,std::string> RenameMapType;
> >
> >  static void
> > @@ -78,7 +78,10 @@
> >    Module *CurrentModule;
> >    std::map<const Type *, ValueList> Values; // Module level  
> > numbered definitions
> >    std::map<const Type *,ValueList> LateResolveValues;
> > -  std::vector<PATypeHolder>    Types;
> > +  std::vector<PATypeHolder> Types;
> > +  std::vector<Signedness> TypeSigns;
> > +  std::map<std::string,Signedness> NamedTypeSigns;
> > +  std::map<std::string,Signedness> NamedValueSigns;
> >    std::map<ValID, PATypeHolder> LateResolveTypes;
> >    static Module::Endianness Endian;
> >    static Module::PointerSize PointerSize;
> > @@ -135,6 +138,9 @@
> >
> >      Values.clear();         // Clear out function local definitions
> >      Types.clear();
> > +    TypeSigns.clear();
> > +    NamedTypeSigns.clear();
> > +    NamedValueSigns.clear();
> >      CurrentModule = 0;
> >    }
> >
> > @@ -208,6 +214,24 @@
> >
> >  static bool inFunctionScope() { return CurFun.CurrentFunction != 0; }
> >
> > +/// This function is just a utility to make a Key value for the  
> > rename map.
> > +/// The Key is a combination of the name, type, Signedness of the  
> > original
> > +/// value (global/function). This just constructs the key and  
> > ensures that
> > +/// named Signedness values are resolved to the actual Signedness.
> > +/// @brief Make a key for the RenameMaps
> > +static RenameMapKey makeRenameMapKey(const std::string &Name,  
> > const Type* Ty,
> > +                                     const Signedness &Sign) {
> > +  TypeInfo TI;
> > +  TI.T = Ty;
> > +  if (Sign.isNamed())
> > +    // Don't allow Named Signedness nodes because they won't  
> > match. The actual
> > +    // Signedness must be looked up in the NamedTypeSigns map.
> > +    TI.S.copy(CurModule.NamedTypeSigns[Sign.getName()]);
> > +  else
> > +    TI.S.copy(Sign);
> > +  return std::make_pair(Name, TI);
> > +}
> > +
> >
> >  // 
> > ===------------------------------------------------------------------- 
> > ---===//
> >  //               Code to handle definitions of all the types
> > @@ -233,7 +257,6 @@
> >      break;
> >    case ValID::NameVal:                 // Is it a named definition?
> >      if (const Type *N = CurModule.CurrentModule->getTypeByName 
> > (D.Name)) {
> > -      D.destroy();  // Free old strdup'd memory...
> >        return N;
> >      }
> >      break;
> > @@ -248,7 +271,6 @@
> >    //
> >    if (DoNotImprovise) return 0;  // Do we just want a null to be  
> > returned?
> >
> > -
> >    if (inFunctionScope()) {
> >      if (D.Type == ValID::NameVal) {
> >        error("Reference to an undefined type: '" + D.getName() + "'");
> > @@ -266,13 +288,94 @@
> >    Type *Typ = OpaqueType::get();
> >    CurModule.LateResolveTypes.insert(std::make_pair(D, Typ));
> >    return Typ;
> > - }
> > +}
> > +
> > +/// This is like the getType method except that instead of looking  
> > up the type
> > +/// for a given ID, it looks up that type's sign.
> > +/// @brief Get the signedness of a referenced type
> > +static Signedness getTypeSign(const ValID &D) {
> > +  switch (D.Type) {
> > +  case ValID::NumberVal:               // Is it a numbered  
> > definition?
> > +    // Module constants occupy the lowest numbered slots...
> > +    if ((unsigned)D.Num < CurModule.TypeSigns.size()) {
> > +      return CurModule.TypeSigns[(unsigned)D.Num];
> > +    }
> > +    break;
> > +  case ValID::NameVal: {               // Is it a named definition?
> > +    std::map<std::string,Signedness>::const_iterator I =
> > +      CurModule.NamedTypeSigns.find(D.Name);
> > +    if (I != CurModule.NamedTypeSigns.end())
> > +      return I->second;
> > +    // Perhaps its a named forward .. just cache the name
> > +    Signedness S;
> > +    S.makeNamed(D.Name);
> > +    return S;
> > +  }
> > +  default:
> > +    break;
> > +  }
> > +  // If we don't find it, its signless
> > +  Signedness S;
> > +  S.makeSignless();
> > +  return S;
> > +}
> > +
> > +/// This function is analagous to getElementType in LLVM. It  
> > provides the same
> > +/// function except that it looks up the Signedness instead of the  
> > type. This is
> > +/// used when processing GEP instructions that need to extract the  
> > type of an
> > +/// indexed struct/array/ptr member.
> > +/// @brief Look up an element's sign.
> > +static Signedness getElementSign(const ValueInfo& VI,
> > +                                 const std::vector<Value*>  
> > &Indices) {
> > +  const Type *Ptr = VI.V->getType();
> > +  assert(isa<PointerType>(Ptr) && "Need pointer type");
> > +
> > +  unsigned CurIdx = 0;
> > +  Signedness S(VI.S);
> > +  while (const CompositeType *CT = dyn_cast<CompositeType>(Ptr)) {
> > +    if (CurIdx == Indices.size())
> > +      break;
> > +
> > +    Value *Index = Indices[CurIdx++];
> > +    assert(!isa<PointerType>(CT) || CurIdx == 1 && "Invalid type");
> > +    Ptr = CT->getTypeAtIndex(Index);
> > +    if (const Type* Ty = Ptr->getForwardedType())
> > +      Ptr = Ty;
> > +    assert(S.isComposite() && "Bad Signedness type");
> > +    if (isa<StructType>(CT)) {
> > +      S = S.get(cast<ConstantInt>(Index)->getZExtValue());
> > +    } else {
> > +      S = S.get(0UL);
> > +    }
> > +    if (S.isNamed())
> > +      S = CurModule.NamedTypeSigns[S.getName()];
> > +  }
> > +  Signedness Result;
> > +  Result.makeComposite(S);
> > +  return Result;
> > +}
> > +
> > +/// This function just translates a ConstantInfo into a ValueInfo  
> > and calls
> > +/// getElementSign(ValueInfo,...). Its just a convenience.
> > +/// @brief ConstantInfo version of getElementSign.
> > +static Signedness getElementSign(const ConstInfo& CI,
> > +                                 const std::vector<Constant*>  
> > &Indices) {
> > +  ValueInfo VI;
> > +  VI.V = CI.C;
> > +  VI.S.copy(CI.S);
> > +  std::vector<Value*> Idx;
> > +  for (unsigned i = 0; i < Indices.size(); ++i)
> > +    Idx.push_back(Indices[i]);
> > +  Signedness result = getElementSign(VI, Idx);
> > +  VI.destroy();
> > +  return result;
> > +}
> >
> >  /// This function determines if two function types differ only in  
> > their use of
> >  /// the sret parameter attribute in the first argument. If they  
> > are identical
> >  /// in all other respects, it returns true. Otherwise, it returns  
> > false.
> > -bool FuncTysDifferOnlyBySRet(const FunctionType *F1,
> > -                                   const FunctionType *F2) {
> > +static bool FuncTysDifferOnlyBySRet(const FunctionType *F1,
> > +                                    const FunctionType *F2) {
> >    if (F1->getReturnType() != F2->getReturnType() ||
> >        F1->getNumParams() != F2->getNumParams() ||
> >        F1->getParamAttrs(0) != F2->getParamAttrs(0))
> > @@ -287,10 +390,27 @@
> >    return true;
> >  }
> >
> > +/// This function determines if the type of V and Ty differ only  
> > by the SRet
> > +/// parameter attribute. This is a more generalized case of
> > +/// FuncTysDIfferOnlyBySRet since it doesn't require FunctionType  
> > arguments.
> > +static bool TypesDifferOnlyBySRet(Value *V, const Type* Ty) {
> > +  if (V->getType() == Ty)
> > +    return true;
> > +  const PointerType *PF1 = dyn_cast<PointerType>(Ty);
> > +  const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
> > +  if (PF1 && PF2) {
> > +    const FunctionType* FT1 = dyn_cast<FunctionType>(PF1- 
> > >getElementType());
> > +    const FunctionType* FT2 = dyn_cast<FunctionType>(PF2- 
> > >getElementType());
> > +    if (FT1 && FT2)
> > +      return FuncTysDifferOnlyBySRet(FT1, FT2);
> > +  }
> > +  return false;
> > +}
> > +
> >  // The upgrade of csretcc to sret param attribute may have caused  
> > a function
> >  // to not be found because the param attribute changed the type of  
> > the called
> >  // function. This helper function, used in getExistingValue,  
> > detects that
> > -// situation and returns V if it occurs and 0 otherwise.
> > +// situation and bitcasts the function to the correct type.
> >  static Value* handleSRetFuncTypeMerge(Value *V, const Type* Ty) {
> >    // Handle degenerate cases
> >    if (!V)
> > @@ -298,23 +418,21 @@
> >    if (V->getType() == Ty)
> >      return V;
> >
> > -  Value* Result = 0;
> >    const PointerType *PF1 = dyn_cast<PointerType>(Ty);
> >    const PointerType *PF2 = dyn_cast<PointerType>(V->getType());
> >    if (PF1 && PF2) {
> > -    const FunctionType *FT1 =
> > -      dyn_cast<FunctionType>(PF1->getElementType());
> > -    const FunctionType *FT2 =
> > -      dyn_cast<FunctionType>(PF2->getElementType());
> > +    const FunctionType *FT1 = dyn_cast<FunctionType>(PF1- 
> > >getElementType());
> > +    const FunctionType *FT2 = dyn_cast<FunctionType>(PF2- 
> > >getElementType());
> >      if (FT1 && FT2 && FuncTysDifferOnlyBySRet(FT1, FT2))
> >        if (FT2->paramHasAttr(1, FunctionType::StructRetAttribute))
> > -        Result = V;
> > +        return V;
> >        else if (Constant *C = dyn_cast<Constant>(V))
> > -        Result = ConstantExpr::getBitCast(C, PF1);
> > +        return ConstantExpr::getBitCast(C, PF1);
> >        else
> > -        Result = new BitCastInst(V, PF1, "upgrd.cast", CurBB);
> > +        return new BitCastInst(V, PF1, "upgrd.cast", CurBB);
> > +
> >    }
> > -  return Result;
> > +  return 0;
> >  }
> >
> >  // getExistingValue - Look up the value specified by the provided  
> > type and
> > @@ -350,9 +468,8 @@
> >
> >    case ValID::NameVal: {                // Is it a named definition?
> >      // Get the name out of the ID
> > -    std::string Name(D.Name);
> > -    Value* V = 0;
> > -    RenameMapKey Key = std::make_pair(Name, Ty);
> > +    RenameMapKey Key = makeRenameMapKey(D.Name, Ty, D.S);
> > +    Value *V = 0;
> >      if (inFunctionScope()) {
> >        // See if the name was renamed
> >        RenameMapType::const_iterator I = CurFun.RenameMap.find(Key);
> > @@ -360,10 +477,12 @@
> >        if (I != CurFun.RenameMap.end())
> >          LookupName = I->second;
> >        else
> > -        LookupName = Name;
> > +        LookupName = D.Name;
> >        ValueSymbolTable &SymTab = CurFun.CurrentFunction- 
> > >getValueSymbolTable();
> >        V = SymTab.lookup(LookupName);
> > -      V = handleSRetFuncTypeMerge(V, Ty);
> > +      if (V && V->getType() != Ty)
> > +        V = handleSRetFuncTypeMerge(V, Ty);
> > +      assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong  
> > type");
> >      }
> >      if (!V) {
> >        RenameMapType::const_iterator I = CurModule.RenameMap.find 
> > (Key);
> > @@ -371,9 +490,11 @@
> >        if (I != CurModule.RenameMap.end())
> >          LookupName = I->second;
> >        else
> > -        LookupName = Name;
> > +        LookupName = D.Name;
> >        V = CurModule.CurrentModule->getValueSymbolTable().lookup 
> > (LookupName);
> > -      V = handleSRetFuncTypeMerge(V, Ty);
> > +      if (V && V->getType() != Ty)
> > +        V = handleSRetFuncTypeMerge(V, Ty);
> > +      assert((!V || TypesDifferOnlyBySRet(V, Ty)) && "Found wrong  
> > type");
> >      }
> >      if (!V)
> >        return 0;
> > @@ -506,14 +627,13 @@
> >      break;
> >    case ValID::NameVal:                  // Is it a named definition?
> >      Name = ID.Name;
> > -    if (Value *N = CurFun.CurrentFunction->
> > -                   getValueSymbolTable().lookup(Name)) {
> > +    if (Value *N = CurFun.CurrentFunction->getValueSymbolTable 
> > ().lookup(Name)) {
> >        if (N->getType() != Type::LabelTy) {
> >          // Register names didn't use to conflict with basic block  
> > names
> >          // because of type planes. Now they all have to be unique.  
> > So, we just
> >          // rename the register and treat this name as if no basic  
> > block
> >          // had been found.
> > -        RenameMapKey Key = std::make_pair(N->getName(),N->getType());
> > +        RenameMapKey Key = makeRenameMapKey(ID.Name, N->getType(),  
> > ID.S);
> >          N->setName(makeNameUnique(N->getName()));
> >          CurModule.RenameMap[Key] = N->getName();
> >          BB = 0;
> > @@ -624,19 +744,33 @@
> >    LateResolvers.clear();
> >  }
> >
> > -// ResolveTypeTo - A brand new type was just declared.  This means  
> > that (if
> > -// name is not null) things referencing Name can be resolved.   
> > Otherwise, things
> > -// refering to the number can be resolved.  Do this now.
> > -//
> > -static void ResolveTypeTo(char *Name, const Type *ToTy) {
> > +/// This function is used for type resolution and upref handling.  
> > When a type
> > +/// becomes concrete, this function is called to adjust the  
> > signedness for the
> > +/// concrete type.
> > +static void ResolveTypeSign(const Type* oldTy, const Signedness  
> > &Sign) {
> > +  std::string TyName = CurModule.CurrentModule->getTypeName(oldTy);
> > +  if (!TyName.empty())
> > +    CurModule.NamedTypeSigns[TyName] = Sign;
> > +}
> > +
> > +/// ResolveTypeTo - A brand new type was just declared.  This  
> > means that (if
> > +/// name is not null) things referencing Name can be resolved.   
> > Otherwise,
> > +/// things refering to the number can be resolved.  Do this now.
> > +static void ResolveTypeTo(char *Name, const Type *ToTy, const  
> > Signedness& Sign){
> >    ValID D;
> > -  if (Name) D = ValID::create(Name);
> > -  else      D = ValID::create((int)CurModule.Types.size());
> > +  if (Name)
> > +    D = ValID::create(Name);
> > +  else
> > +    D = ValID::create((int)CurModule.Types.size());
> > +  D.S.copy(Sign);
> > +
> > +  CurModule.NamedTypeSigns[Name] = Sign;
> >
> >    std::map<ValID, PATypeHolder>::iterator I =
> >      CurModule.LateResolveTypes.find(D);
> >    if (I != CurModule.LateResolveTypes.end()) {
> > -    ((DerivedType*)I->second.get())->refineAbstractTypeTo(ToTy);
> > +    const Type *OldTy = I->second.get();
> > +    ((DerivedType*)OldTy)->refineAbstractTypeTo(ToTy);
> >      CurModule.LateResolveTypes.erase(I);
> >    }
> >  }
> > @@ -696,12 +830,12 @@
> >  // null potentially, in which case this is a noop.  The string  
> > passed in is
> >  // assumed to be a malloc'd string buffer, and is free'd by this  
> > function.
> >  //
> > -static void setValueName(Value *V, char *NameStr) {
> > +static void setValueName(const ValueInfo &V, char *NameStr) {
> >    if (NameStr) {
> >      std::string Name(NameStr);      // Copy string
> >      free(NameStr);                  // Free old string
> >
> > -    if (V->getType() == Type::VoidTy) {
> > +    if (V.V->getType() == Type::VoidTy) {
> >        error("Can't assign name '" + Name + "' to value with void  
> > type");
> >        return;
> >      }
> > @@ -714,13 +848,13 @@
> >      if (Existing) {
> >        // An existing value of the same name was found. This might  
> > have happened
> >        // because of the integer type planes collapsing in LLVM 2.0.
> > -      if (Existing->getType() == V->getType() &&
> > +      if (Existing->getType() == V.V->getType() &&
> >            !TypeHasInteger(Existing->getType())) {
> >          // If the type does not contain any integers in them then  
> > this can't be
> >          // a type plane collapsing issue. It truly is a  
> > redefinition and we
> >          // should error out as the assembly is invalid.
> >          error("Redefinition of value named '" + Name + "' of type  
> > '" +
> > -              V->getType()->getDescription() + "'");
> > +              V.V->getType()->getDescription() + "'");
> >          return;
> >        }
> >        // In LLVM 2.0 we don't allow names to be re-used for any  
> > values in a
> > @@ -734,13 +868,13 @@
> >        // We're changing the name but it will probably be used by  
> > other
> >        // instructions as operands later on. Consequently we have  
> > to retain
> >        // a mapping of the renaming that we're doing.
> > -      RenameMapKey Key = std::make_pair(Name,V->getType());
> > +      RenameMapKey Key = makeRenameMapKey(Name, V.V->getType(), V.S);
> >        CurFun.RenameMap[Key] = NewName;
> >        Name = NewName;
> >      }
> >
> >      // Set the name.
> > -    V->setName(Name);
> > +    V.V->setName(Name);
> >    }
> >  }
> >
> > @@ -749,7 +883,8 @@
> >  static GlobalVariable *
> >  ParseGlobalVariable(char *NameStr,GlobalValue::LinkageTypes Linkage,
> >                      bool isConstantGlobal, const Type *Ty,
> > -                    Constant *Initializer) {
> > +                    Constant *Initializer,
> > +                    const Signedness &Sign) {
> >    if (isa<FunctionType>(Ty))
> >      error("Cannot declare global vars of function type");
> >
> > @@ -769,6 +904,7 @@
> >    } else {
> >      ID = ValID::create((int)CurModule.Values[PTy].size());
> >    }
> > +  ID.S.makeComposite(Sign);
> >
> >    if (GlobalValue *FWGV = CurModule.GetForwardRefForGlobal(PTy,  
> > ID)) {
> >      // Move the global to the end of the list, from whereever it was
> > @@ -794,13 +930,7 @@
> >        // There is alread a global of the same name which means  
> > there is a
> >        // conflict. Let's see what we can do about it.
> >        std::string NewName(makeNameUnique(Name));
> > -      if (Linkage == GlobalValue::InternalLinkage) {
> > -        // The linkage type is internal so just warn about the  
> > rename without
> > -        // invoking "scarey language" about linkage failures.  
> > GVars with
> > -        // InternalLinkage can be renamed at will.
> > -        warning("Global variable '" + Name + "' was renamed to '"+
> > -                NewName + "'");
> > -      } else {
> > +      if (Linkage != GlobalValue::InternalLinkage) {
> >          // The linkage of this gval is external so we can't  
> > reliably rename
> >          // it because it could potentially create a linking problem.
> >          // However, we can't leave the name conflict in the output  
> > either or
> > @@ -811,7 +941,7 @@
> >        }
> >
> >        // Put the renaming in the global rename map
> > -      RenameMapKey Key = std::make_pair(Name,PointerType::get(Ty));
> > +      RenameMapKey Key = makeRenameMapKey(Name, PointerType::get 
> > (Ty), ID.S);
> >        CurModule.RenameMap[Key] = NewName;
> >
> >        // Rename it
> > @@ -824,6 +954,8 @@
> >      new GlobalVariable(Ty, isConstantGlobal, Linkage, Initializer,  
> > Name,
> >                         CurModule.CurrentModule);
> >    InsertValue(GV, CurModule.Values);
> > +  // Remember the sign of this global.
> > +  CurModule.NamedValueSigns[Name] = ID.S;
> >    return GV;
> >  }
> >
> > @@ -834,21 +966,26 @@
> >  // This function returns true if the type has already been  
> > defined, but is
> >  // allowed to be redefined in the specified context.  If the name  
> > is a new name
> >  // for the type plane, it is inserted and false is returned.
> > -static bool setTypeName(const Type *T, char *NameStr) {
> > +static bool setTypeName(const PATypeInfo& TI, char *NameStr) {
> >    assert(!inFunctionScope() && "Can't give types function-local  
> > names");
> >    if (NameStr == 0) return false;
> >
> >    std::string Name(NameStr);      // Copy string
> >    free(NameStr);                  // Free old string
> >
> > +  const Type* Ty = TI.PAT->get();
> > +
> >    // We don't allow assigning names to void type
> > -  if (T == Type::VoidTy) {
> > +  if (Ty == Type::VoidTy) {
> >      error("Can't assign name '" + Name + "' to the void type");
> >      return false;
> >    }
> >
> >    // Set the type name, checking for conflicts as we do so.
> > -  bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name, T);
> > +  bool AlreadyExists = CurModule.CurrentModule->addTypeName(Name,  
> > Ty);
> > +
> > +  // Save the sign information for later use
> > +  CurModule.NamedTypeSigns[Name] = TI.S;
> >
> >    if (AlreadyExists) {   // Inserting a name that is already  
> > defined???
> >      const Type *Existing = CurModule.CurrentModule->getTypeByName 
> > (Name);
> > @@ -858,7 +995,7 @@
> >      // opaque type.  In this case, Existing will be an opaque type.
> >      if (const OpaqueType *OpTy = dyn_cast<OpaqueType>(Existing)) {
> >        // We ARE replacing an opaque type!
> > -      const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(T);
> > +      const_cast<OpaqueType*>(OpTy)->refineAbstractTypeTo(Ty);
> >        return true;
> >      }
> >
> > @@ -866,11 +1003,11 @@
> >      // the redefinition is identical to the original. This will be  
> > so if
> >      // Existing and T point to the same Type object. In this one  
> > case we
> >      // allow the equivalent redefinition.
> > -    if (Existing == T) return true;  // Yes, it's equal.
> > +    if (Existing == Ty) return true;  // Yes, it's equal.
> >
> >      // Any other kind of (non-equivalent) redefinition is an error.
> >      error("Redefinition of type named '" + Name + "' in the '" +
> > -          T->getDescription() + "' type plane");
> > +          Ty->getDescription() + "' type plane");
> >    }
> >
> >    return false;
> > @@ -902,7 +1039,7 @@
> >      OpaqueType *UpRefTy;
> >
> >      UpRefRecord(unsigned NL, OpaqueType *URTy)
> > -      : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) {}
> > +      : NestingLevel(NL), LastContainedTy(URTy), UpRefTy(URTy) { }
> >    };
> >  }
> >
> > @@ -916,7 +1053,7 @@
> >  /// count reaches zero, the upreferenced type is the type that is  
> > passed in:
> >  /// thus we can complete the cycle.
> >  ///
> > -static PATypeHolder HandleUpRefs(const Type *ty) {
> > +static PATypeHolder HandleUpRefs(const Type *ty, const Signedness&  
> > Sign) {
> >    // If Ty isn't abstract, or if there are no up-references in it,  
> > then there is
> >    // nothing to resolve here.
> >    if (!ty->isAbstract() || UpRefs.empty()) return ty;
> > @@ -932,10 +1069,11 @@
> >    // this variable.
> >    OpaqueType *TypeToResolve = 0;
> >
> > -  for (unsigned i = 0; i != UpRefs.size(); ++i) {
> > +  unsigned i = 0;
> > +  for (; i != UpRefs.size(); ++i) {
> >      UR_OUT("  UR#" << i << " - TypeContains(" << Ty->getDescription 
> > () << ", "
> > -           << UpRefs[i].second->getDescription() << ") = "
> > -           << (TypeContains(Ty, UpRefs[i].second) ? "true" :  
> > "false") << "\n");
> > +           << UpRefs[i].UpRefTy->getDescription() << ") = "
> > +           << (TypeContains(Ty, UpRefs[i].UpRefTy) ? "true" :  
> > "false") << "\n");
> >      if (TypeContains(Ty, UpRefs[i].LastContainedTy)) {
> >        // Decrement level of upreference
> >        unsigned Level = --UpRefs[i].NestingLevel;
> > @@ -946,8 +1084,9 @@
> >            TypeToResolve = UpRefs[i].UpRefTy;
> >          } else {
> >            UR_OUT("  * Resolving upreference for "
> > -                 << UpRefs[i].second->getDescription() << "\n";
> > -                 std::string OldName = UpRefs[i].UpRefTy- 
> > >getDescription());
> > +                 << UpRefs[i].UpRefTy->getDescription() << "\n";
> > +          std::string OldName = UpRefs[i].UpRefTy->getDescription());
> > +          ResolveTypeSign(UpRefs[i].UpRefTy, Sign);
> >            UpRefs[i].UpRefTy->refineAbstractTypeTo(TypeToResolve);
> >            UR_OUT("  * Type '" << OldName << "' refined upreference  
> > to: "
> >                   << (const void*)Ty << ", " << Ty->getDescription 
> > () << "\n");
> > @@ -960,14 +1099,113 @@
> >
> >    if (TypeToResolve) {
> >      UR_OUT("  * Resolving upreference for "
> > -           << UpRefs[i].second->getDescription() << "\n";
> > +           << UpRefs[i].UpRefTy->getDescription() << "\n";
> >             std::string OldName = TypeToResolve->getDescription());
> > +    ResolveTypeSign(TypeToResolve, Sign);
> >      TypeToResolve->refineAbstractTypeTo(Ty);
> >    }
> >
> >    return Ty;
> >  }
> >
> > +bool Signedness::operator<(const Signedness &that) const {
> > +  if (isNamed()) {
> > +    if (that.isNamed())
> > +      return *(this->name) < *(that.name);
> > +    else
> > +      return CurModule.NamedTypeSigns[*name] < that;
> > +  } else if (that.isNamed()) {
> > +    return *this < CurModule.NamedTypeSigns[*that.name];
> > +  }
> > +
> > +  if (isComposite() && that.isComposite()) {
> > +    if (sv->size() == that.sv->size()) {
> > +      SignVector::const_iterator thisI = sv->begin(), thisE = sv- 
> > >end();
> > +      SignVector::const_iterator thatI = that.sv->begin(),
> > +                                 thatE = that.sv->end();
> > +      for (; thisI != thisE; ++thisI, ++thatI) {
> > +        if (*thisI < *thatI)
> > +          return true;
> > +        else if (!(*thisI == *thatI))
> > +          return false;
> > +      }
> > +      return false;
> > +    }
> > +    return sv->size() < that.sv->size();
> > +  }
> > +  return kind < that.kind;
> > +}
> > +
> > +bool Signedness::operator==(const Signedness &that) const {
> > +  if (isNamed())
> > +    if (that.isNamed())
> > +      return *(this->name) == *(that.name);
> > +    else
> > +      return CurModule.NamedTypeSigns[*(this->name)] == that;
> > +  else if (that.isNamed())
> > +    return *this == CurModule.NamedTypeSigns[*(that.name)];
> > +  if (isComposite() && that.isComposite()) {
> > +    if (sv->size() == that.sv->size()) {
> > +      SignVector::const_iterator thisI = sv->begin(), thisE = sv- 
> > >end();
> > +      SignVector::const_iterator thatI = that.sv->begin(),
> > +                                 thatE = that.sv->end();
> > +      for (; thisI != thisE; ++thisI, ++thatI) {
> > +        if (!(*thisI == *thatI))
> > +          return false;
> > +      }
> > +      return true;
> > +    }
> > +    return false;
> > +  }
> > +  return kind == that.kind;
> > +}
> > +
> > +void Signedness::copy(const Signedness &that) {
> > +  if (that.isNamed()) {
> > +    kind = Named;
> > +    name = new std::string(*that.name);
> > +  } else if (that.isComposite()) {
> > +    kind = Composite;
> > +    sv = new SignVector();
> > +    *sv = *that.sv;
> > +  } else {
> > +    kind = that.kind;
> > +    sv = 0;
> > +  }
> > +}
> > +
> > +void Signedness::destroy() {
> > +  if (isNamed()) {
> > +    delete name;
> > +  } else if (isComposite()) {
> > +    delete sv;
> > +  }
> > +}
> > +
> > +void Signedness::dump() const {
> > +  if (isComposite()) {
> > +    if (sv->size() == 1) {
> > +      (*sv)[0].dump();
> > +      std::cerr << "*";
> > +    } else {
> > +      std::cerr << "{ " ;
> > +      for (unsigned i = 0; i < sv->size(); ++i) {
> > +        if (i != 0)
> > +          std::cerr << ", ";
> > +        (*sv)[i].dump();
> > +      }
> > +      std::cerr << "} " ;
> > +    }
> > +  } else if (isNamed()) {
> > +    std::cerr << *name;
> > +  } else if (isSigned()) {
> > +    std::cerr << "S";
> > +  } else if (isUnsigned()) {
> > +    std::cerr << "U";
> > +  } else
> > +    std::cerr << ".";
> > +}
> > +
> >  static inline Instruction::TermOps
> >  getTermOp(TermOps op) {
> >    switch (op) {
> > @@ -982,7 +1220,7 @@
> >  }
> >
> >  static inline Instruction::BinaryOps
> > -getBinaryOp(BinaryOps op, const Type *Ty, Signedness Sign) {
> > +getBinaryOp(BinaryOps op, const Type *Ty, const Signedness& Sign) {
> >    switch (op) {
> >      default     : assert(0 && "Invalid OldBinaryOps");
> >      case SetEQ  :
> > @@ -1003,7 +1241,7 @@
> >          isFP = PTy->getElementType()->isFloatingPoint();
> >        if (isFP)
> >          return Instruction::FDiv;
> > -      else if (Sign == Signed)
> > +      else if (Sign.isSigned())
> >          return Instruction::SDiv;
> >        return Instruction::UDiv;
> >      }
> > @@ -1020,7 +1258,7 @@
> >        // Select correct opcode
> >        if (isFP)
> >          return Instruction::FRem;
> > -      else if (Sign == Signed)
> > +      else if (Sign.isSigned())
> >          return Instruction::SRem;
> >        return Instruction::URem;
> >      }
> > @@ -1031,7 +1269,7 @@
> >      case AShrOp : return Instruction::AShr;
> >      case ShlOp  : return Instruction::Shl;
> >      case ShrOp  :
> > -      if (Sign == Signed)
> > +      if (Sign.isSigned())
> >          return Instruction::AShr;
> >        return Instruction::LShr;
> >      case AndOp  : return Instruction::And;
> > @@ -1042,8 +1280,8 @@
> >
> >  static inline Instruction::OtherOps
> >  getCompareOp(BinaryOps op, unsigned short &predicate, const Type*  
> > &Ty,
> > -             Signedness Sign) {
> > -  bool isSigned = Sign == Signed;
> > +             const Signedness &Sign) {
> > +  bool isSigned = Sign.isSigned();
> >    bool isFP = Ty->isFloatingPoint();
> >    switch (op) {
> >      default     : assert(0 && "Invalid OldSetCC");
> > @@ -1123,7 +1361,7 @@
> >  }
> >
> >  static inline Instruction::OtherOps
> > -getOtherOp(OtherOps op, Signedness Sign) {
> > +getOtherOp(OtherOps op, const Signedness &Sign) {
> >    switch (op) {
> >      default               : assert(0 && "Invalid OldOtherOps");
> >      case PHIOp            : return Instruction::PHI;
> > @@ -1141,8 +1379,8 @@
> >  }
> >
> >  static inline Value*
> > -getCast(CastOps op, Value *Src, Signedness SrcSign, const Type  
> > *DstTy,
> > -        Signedness DstSign, bool ForceInstruction = false) {
> > +getCast(CastOps op, Value *Src, const Signedness &SrcSign, const  
> > Type *DstTy,
> > +        const Signedness &DstSign, bool ForceInstruction = false) {
> >    Instruction::CastOps Opcode;
> >    const Type* SrcTy = Src->getType();
> >    if (op == CastOp) {
> > @@ -1179,7 +1417,8 @@
> >      }
> >      // Determine the opcode to use by calling CastInst::getCastOpcode
> >      Opcode =
> > -      CastInst::getCastOpcode(Src, SrcSign == Signed, DstTy,  
> > DstSign == Signed);
> > +      CastInst::getCastOpcode(Src, SrcSign.isSigned(), DstTy,
> > +                              DstSign.isSigned());
> >
> >    } else switch (op) {
> >      default: assert(0 && "Invalid cast token");
> > @@ -1271,7 +1510,7 @@
> >        // all indices for SequentialType elements. We must retain  
> > the same
> >        // semantic (zext) for unsigned types.
> >        if (const IntegerType *Ity = dyn_cast<IntegerType>(Index- 
> > >getType()))
> > -        if (Ity->getBitWidth() < 64 && (*Indices)[i].S == Unsigned) {
> > +        if (Ity->getBitWidth() < 64 && (*Indices)[i].S.isUnsigned 
> > ()) {
> >            if (CIndices)
> >              Index = ConstantExpr::getCast(Instruction::ZExt,
> >                cast<Constant>(Index), Type::Int64Ty);
> > @@ -1456,7 +1695,7 @@
> >    llvm::Function                         *FunctionVal;
> >    std::pair<llvm::PATypeInfo, char*>     *ArgVal;
> >    llvm::BasicBlock                       *BasicBlockVal;
> > -  llvm::TerminatorInst                   *TermInstVal;
> > +  llvm::TermInstInfo                     TermInstVal;
> >    llvm::InstrInfo                        InstVal;
> >    llvm::ConstInfo                        ConstVal;
> >    llvm::ValueInfo                        ValueVal;
> > @@ -1769,7 +2008,7 @@
> >    : Types
> >    | VOID {
> >      $$.PAT = new PATypeHolder($1.T);
> > -    $$.S = Signless;
> > +    $$.S.makeSignless();
> >    }
> >    ;
> >
> > @@ -1777,7 +2016,7 @@
> >    : UpRTypes
> >    | VOID {
> >      $$.PAT = new PATypeHolder($1.T);
> > -    $$.S = Signless;
> > +    $$.S.makeSignless();
> >    }
> >    ;
> >
> > @@ -1798,16 +2037,16 @@
> >  UpRTypes
> >    : PrimType {
> >      $$.PAT = new PATypeHolder($1.T);
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> >    }
> >    | OPAQUE {
> >      $$.PAT = new PATypeHolder(OpaqueType::get());
> > -    $$.S = Signless;
> > +    $$.S.makeSignless();
> >    }
> >    | SymbolicValueRef {            // Named types are also simple  
> > types...
> > +    $$.S.copy(getTypeSign($1));
> >      const Type* tmp = getType($1);
> >      $$.PAT = new PATypeHolder(tmp);
> > -    $$.S = Signless; // FIXME: what if its signed?
> >    }
> >    | '\\' EUINT64VAL {                   // Type UpReference
> >      if ($2 > (uint64_t)~0U)
> > @@ -1815,14 +2054,16 @@
> >      OpaqueType *OT = OpaqueType::get();        // Use temporary  
> > placeholder
> >      UpRefs.push_back(UpRefRecord((unsigned)$2, OT));  // Add to  
> > vector...
> >      $$.PAT = new PATypeHolder(OT);
> > -    $$.S = Signless;
> > +    $$.S.makeSignless();
> >      UR_OUT("New Upreference!\n");
> >    }
> >    | UpRTypesV '(' ArgTypeListI ')' {           // Function derived  
> > type?
> > +    $$.S.makeComposite($1.S);
> >      std::vector<const Type*> Params;
> >      for (std::list<llvm::PATypeInfo>::iterator I = $3->begin(),
> >             E = $3->end(); I != E; ++I) {
> >        Params.push_back(I->PAT->get());
> > +      $$.S.add(I->S);
> >      }
> >      FunctionType::ParamAttrsList ParamAttrs;
> >      bool isVarArg = Params.size() && Params.back() == Type::VoidTy;
> > @@ -1830,63 +2071,67 @@
> >
> >      $$.PAT = new PATypeHolder(
> >        HandleUpRefs(FunctionType::get($1.PAT->get(), Params, isVarArg,
> > -                   ParamAttrs)));
> > -    $$.S = $1.S;
> > -    delete $1.PAT;    // Delete the return type handle
> > +                   ParamAttrs), $$.S));
> > +    delete $1.PAT;  // Delete the return type handle
> >      delete $3;      // Delete the argument list
> >    }
> >    | '[' EUINT64VAL 'x' UpRTypes ']' {          // Sized array type?
> > +    $$.S.makeComposite($4.S);
> >      $$.PAT = new PATypeHolder(HandleUpRefs(ArrayType::get($4.PAT- 
> > >get(),
> > -                                                        (unsigned) 
> > $2)));
> > -    $$.S = $4.S;
> > +                                           (unsigned)$2), $$.S));
> >      delete $4.PAT;
> >    }
> >    | '<' EUINT64VAL 'x' UpRTypes '>' {          // Vector type?
> > -     const llvm::Type* ElemTy = $4.PAT->get();
> > -     if ((unsigned)$2 != $2)
> > -        error("Unsigned result not equal to signed result");
> > -     if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
> > -        error("Elements of a VectorType must be integer or  
> > floating point");
> > -     if (!isPowerOf2_32($2))
> > -       error("VectorType length should be a power of 2");
> > -     $$.PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy,
> > -                                          (unsigned)$2)));
> > -     $$.S = $4.S;
> > -     delete $4.PAT;
> > +    const llvm::Type* ElemTy = $4.PAT->get();
> > +    if ((unsigned)$2 != $2)
> > +       error("Unsigned result not equal to signed result");
> > +    if (!(ElemTy->isInteger() || ElemTy->isFloatingPoint()))
> > +       error("Elements of a VectorType must be integer or floating  
> > point");
> > +    if (!isPowerOf2_32($2))
> > +      error("VectorType length should be a power of 2");
> > +    $$.S.makeComposite($4.S);
> > +    $$.PAT = new PATypeHolder(HandleUpRefs(VectorType::get(ElemTy,
> > +                                         (unsigned)$2), $$.S));
> > +    delete $4.PAT;
> >    }
> >    | '{' TypeListI '}' {                        // Structure type?
> >      std::vector<const Type*> Elements;
> > +    $$.S.makeComposite();
> >      for (std::list<llvm::PATypeInfo>::iterator I = $2->begin(),
> > -           E = $2->end(); I != E; ++I)
> > +           E = $2->end(); I != E; ++I) {
> >        Elements.push_back(I->PAT->get());
> > -    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get 
> > (Elements)));
> > -    $$.S = Signless;
> > +      $$.S.add(I->S);
> > +    }
> > +    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get 
> > (Elements), $$.S));
> >      delete $2;
> >    }
> >    | '{' '}' {                                  // Empty structure  
> > type?
> >      $$.PAT = new PATypeHolder(StructType::get(std::vector<const  
> > Type*>()));
> > -    $$.S = Signless;
> > +    $$.S.makeComposite();
> >    }
> >    | '<' '{' TypeListI '}' '>' {                // Packed Structure  
> > type?
> > +    $$.S.makeComposite();
> >      std::vector<const Type*> Elements;
> >      for (std::list<llvm::PATypeInfo>::iterator I = $3->begin(),
> >             E = $3->end(); I != E; ++I) {
> >        Elements.push_back(I->PAT->get());
> > +      $$.S.add(I->S);
> >        delete I->PAT;
> >      }
> > -    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get 
> > (Elements, true)));
> > -    $$.S = Signless;
> > +    $$.PAT = new PATypeHolder(HandleUpRefs(StructType::get 
> > (Elements, true),
> > +                                           $$.S));
> >      delete $3;
> >    }
> >    | '<' '{' '}' '>' {                          // Empty packed  
> > structure type?
> >      $$.PAT = new PATypeHolder(StructType::get(std::vector<const  
> > Type*>(),true));
> > -    $$.S = Signless;
> > +    $$.S.makeComposite();
> >    }
> >    | UpRTypes '*' {                             // Pointer type?
> >      if ($1.PAT->get() == Type::LabelTy)
> >        error("Cannot form a pointer to a basic block");
> > -    $$.PAT = new PATypeHolder(HandleUpRefs(PointerType::get($1.PAT- 
> > >get())));
> > -    $$.S = $1.S;
> > +    $$.S.makeComposite($1.S);
> > +    $$.PAT = new PATypeHolder(HandleUpRefs(PointerType::get($1.PAT- 
> > >get()),
> > +                                           $$.S));
> >      delete $1.PAT;
> >    }
> >    ;
> > @@ -1910,14 +2155,14 @@
> >    | TypeListI ',' DOTDOTDOT {
> >      PATypeInfo VoidTI;
> >      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> > -    VoidTI.S = Signless;
> > +    VoidTI.S.makeSignless();
> >      ($$=$1)->push_back(VoidTI);
> >    }
> >    | DOTDOTDOT {
> >      $$ = new std::list<PATypeInfo>();
> >      PATypeInfo VoidTI;
> >      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> > -    VoidTI.S = Signless;
> > +    VoidTI.S.makeSignless();
> >      $$->push_back(VoidTI);
> >    }
> >    | /*empty*/ {
> > @@ -1958,7 +2203,7 @@
> >        Elems.push_back(C);
> >      }
> >      $$.C = ConstantArray::get(ATy, Elems);
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> >      delete $1.PAT;
> >      delete $3;
> >    }
> > @@ -1972,7 +2217,7 @@
> >        error("Type mismatch: constant sized array initialized with 0"
> >              " arguments, but has size of " + itostr(NumElements)  
> > +"");
> >      $$.C = ConstantArray::get(ATy, std::vector<Constant*>());
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> >      delete $1.PAT;
> >    }
> >    | Types 'c' STRINGCONSTANT {
> > @@ -1995,7 +2240,7 @@
> >        Vals.push_back(ConstantInt::get(ETy, *C));
> >      free($3);
> >      $$.C = ConstantArray::get(ATy, Vals);
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> >      delete $1.PAT;
> >    }
> >    | Types '<' ConstVector '>' { // Nonempty unsized arr
> > @@ -2022,7 +2267,7 @@
> >        Elems.push_back(C);
> >      }
> >      $$.C = ConstantVector::get(PTy, Elems);
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> >      delete $1.PAT;
> >      delete $3;
> >    }
> > @@ -2044,7 +2289,7 @@
> >        Fields.push_back(C);
> >      }
> >      $$.C = ConstantStruct::get(STy, Fields);
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> >      delete $1.PAT;
> >      delete $3;
> >    }
> > @@ -2056,7 +2301,7 @@
> >      if (STy->getNumContainedTypes() != 0)
> >        error("Illegal number of initializers for structure type");
> >      $$.C = ConstantStruct::get(STy, std::vector<Constant*>());
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> >      delete $1.PAT;
> >    }
> >    | Types '<' '{' ConstVector '}' '>' {
> > @@ -2077,7 +2322,7 @@
> >        Fields.push_back(C);
> >      }
> >      $$.C = ConstantStruct::get(STy, Fields);
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> >      delete $1.PAT;
> >      delete $4;
> >    }
> > @@ -2089,7 +2334,7 @@
> >      if (STy->getNumContainedTypes() != 0)
> >        error("Illegal number of initializers for packed structure  
> > type");
> >      $$.C = ConstantStruct::get(STy, std::vector<Constant*>());
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> >      delete $1.PAT;
> >    }
> >    | Types NULL_TOK {
> > @@ -2098,12 +2343,12 @@
> >        error("Cannot make null pointer constant with type: '" +
> >              $1.PAT->get()->getDescription() + "'");
> >      $$.C = ConstantPointerNull::get(PTy);
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> >      delete $1.PAT;
> >    }
> >    | Types UNDEF {
> >      $$.C = UndefValue::get($1.PAT->get());
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> >      delete $1.PAT;
> >    }
> >    | Types SymbolicValueRef {
> > @@ -2121,6 +2366,7 @@
> >      //
> >      Function *SavedCurFn = CurFun.CurrentFunction;
> >      CurFun.CurrentFunction = 0;
> > +    $2.S.copy($1.S);
> >      Value *V = getExistingValue(Ty, $2);
> >      CurFun.CurrentFunction = SavedCurFn;
> >
> > @@ -2161,14 +2407,14 @@
> >        }
> >      }
> >      $$.C = cast<GlobalValue>(V);
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> >      delete $1.PAT;            // Free the type handle
> >    }
> >    | Types ConstExpr {
> >      if ($1.PAT->get() != $2.C->getType())
> >        error("Mismatched types for constant expression");
> >      $$ = $2;
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> >      delete $1.PAT;
> >    }
> >    | Types ZEROINITIALIZER {
> > @@ -2176,7 +2422,7 @@
> >      if (isa<FunctionType>(Ty) || Ty == Type::LabelTy ||  
> > isa<OpaqueType>(Ty))
> >        error("Cannot create a null initialized value of this type");
> >      $$.C = Constant::getNullValue(Ty);
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> >      delete $1.PAT;
> >    }
> >    | SIntType EINT64VAL {      // integral constants
> > @@ -2184,28 +2430,28 @@
> >      if (!ConstantInt::isValueValidForType(Ty, $2))
> >        error("Constant value doesn't fit in type");
> >      $$.C = ConstantInt::get(Ty, $2);
> > -    $$.S = Signed;
> > +    $$.S.makeSigned();
> >    }
> >    | UIntType EUINT64VAL {            // integral constants
> >      const Type *Ty = $1.T;
> >      if (!ConstantInt::isValueValidForType(Ty, $2))
> >        error("Constant value doesn't fit in type");
> >      $$.C = ConstantInt::get(Ty, $2);
> > -    $$.S = Unsigned;
> > +    $$.S.makeUnsigned();
> >    }
> >    | BOOL TRUETOK {                      // Boolean constants
> >      $$.C = ConstantInt::get(Type::Int1Ty, true);
> > -    $$.S = Unsigned;
> > +    $$.S.makeUnsigned();
> >    }
> >    | BOOL FALSETOK {                     // Boolean constants
> >      $$.C = ConstantInt::get(Type::Int1Ty, false);
> > -    $$.S = Unsigned;
> > +    $$.S.makeUnsigned();
> >    }
> >    | FPType FPVAL {                   // Float & Double constants
> >      if (!ConstantFP::isValueValidForType($1.T, $2))
> >        error("Floating point constant invalid for type");
> >      $$.C = ConstantFP::get($1.T, $2);
> > -    $$.S = Signless;
> > +    $$.S.makeSignless();
> >    }
> >    ;
> >
> > @@ -2213,8 +2459,8 @@
> >    : CastOps '(' ConstVal TO Types ')' {
> >      const Type* SrcTy = $3.C->getType();
> >      const Type* DstTy = $5.PAT->get();
> > -    Signedness SrcSign = $3.S;
> > -    Signedness DstSign = $5.S;
> > +    Signedness SrcSign($3.S);
> > +    Signedness DstSign($5.S);
> >      if (!SrcTy->isFirstClassType())
> >        error("cast constant expression from a non-primitive type: '" +
> >              SrcTy->getDescription() + "'");
> > @@ -2222,7 +2468,7 @@
> >        error("cast constant expression to a non-primitive type: '" +
> >              DstTy->getDescription() + "'");
> >      $$.C = cast<Constant>(getCast($1, $3.C, SrcSign, DstTy,  
> > DstSign));
> > -    $$.S = DstSign;
> > +    $$.S.copy(DstSign);
> >      delete $5.PAT;
> >    }
> >    | GETELEMENTPTR '(' ConstVal IndexList ')' {
> > @@ -2236,7 +2482,7 @@
> >
> >      delete $4;
> >      $$.C = ConstantExpr::getGetElementPtr($3.C, &CIndices[0],  
> > CIndices.size());
> > -    $$.S = Signless;
> > +    $$.S.copy(getElementSign($3, CIndices));
> >    }
> >    | SELECT '(' ConstVal ',' ConstVal ',' ConstVal ')' {
> >      if (!$3.C->getType()->isInteger() ||
> > @@ -2245,7 +2491,7 @@
> >      if ($5.C->getType() != $7.C->getType())
> >        error("Select operand types must match");
> >      $$.C = ConstantExpr::getSelect($3.C, $5.C, $7.C);
> > -    $$.S = Unsigned;
> > +    $$.S.copy($5.S);
> >    }
> >    | ArithmeticOps '(' ConstVal ',' ConstVal ')' {
> >      const Type *Ty = $3.C->getType();
> > @@ -2273,7 +2519,7 @@
> >               ConstantExpr::getCast(Instruction::PtrToInt, $5.C,  
> > IntPtrTy));
> >        $$.C = ConstantExpr::getCast(Instruction::IntToPtr, $$.C, Ty);
> >      }
> > -    $$.S = $3.S;
> > +    $$.S.copy($3.S);
> >    }
> >    | LogicalOps '(' ConstVal ',' ConstVal ')' {
> >      const Type* Ty = $3.C->getType();
> > @@ -2286,7 +2532,7 @@
> >      }
> >      Instruction::BinaryOps Opcode = getBinaryOp($1, Ty, $3.S);
> >      $$.C = ConstantExpr::get(Opcode, $3.C, $5.C);
> > -    $$.S = $3.S;
> > +    $$.S.copy($3.S);
> >    }
> >    | SetCondOps '(' ConstVal ',' ConstVal ')' {
> >      const Type* Ty = $3.C->getType();
> > @@ -2295,19 +2541,19 @@
> >      unsigned short pred;
> >      Instruction::OtherOps Opcode = getCompareOp($1, pred, Ty, $3.S);
> >      $$.C = ConstantExpr::getCompare(Opcode, $3.C, $5.C);
> > -    $$.S = Unsigned;
> > +    $$.S.makeUnsigned();
> >    }
> >    | ICMP IPredicates '(' ConstVal ',' ConstVal ')' {
> >      if ($4.C->getType() != $6.C->getType())
> >        error("icmp operand types must match");
> >      $$.C = ConstantExpr::getCompare($2, $4.C, $6.C);
> > -    $$.S = Unsigned;
> > +    $$.S.makeUnsigned();
> >    }
> >    | FCMP FPredicates '(' ConstVal ',' ConstVal ')' {
> >      if ($4.C->getType() != $6.C->getType())
> >        error("fcmp operand types must match");
> >      $$.C = ConstantExpr::getCompare($2, $4.C, $6.C);
> > -    $$.S = Unsigned;
> > +    $$.S.makeUnsigned();
> >    }
> >    | ShiftOps '(' ConstVal ',' ConstVal ')' {
> >      if (!$5.C->getType()->isInteger() ||
> > @@ -2318,25 +2564,25 @@
> >        error("Shift constant expression requires integer operand");
> >      Constant *ShiftAmt = ConstantExpr::getZExt($5.C, Ty);
> >      $$.C = ConstantExpr::get(getBinaryOp($1, Ty, $3.S), $3.C,  
> > ShiftAmt);
> > -    $$.S = $3.S;
> > +    $$.S.copy($3.S);
> >    }
> >    | EXTRACTELEMENT '(' ConstVal ',' ConstVal ')' {
> >      if (!ExtractElementInst::isValidOperands($3.C, $5.C))
> >        error("Invalid extractelement operands");
> >      $$.C = ConstantExpr::getExtractElement($3.C, $5.C);
> > -    $$.S = $3.S;
> > +    $$.S.copy($3.S.get(0));
> >    }
> >    | INSERTELEMENT '(' ConstVal ',' ConstVal ',' ConstVal ')' {
> >      if (!InsertElementInst::isValidOperands($3.C, $5.C, $7.C))
> >        error("Invalid insertelement operands");
> >      $$.C = ConstantExpr::getInsertElement($3.C, $5.C, $7.C);
> > -    $$.S = $3.S;
> > +    $$.S.copy($3.S);
> >    }
> >    | SHUFFLEVECTOR '(' ConstVal ',' ConstVal ',' ConstVal ')' {
> >      if (!ShuffleVectorInst::isValidOperands($3.C, $5.C, $7.C))
> >        error("Invalid shufflevector operands");
> >      $$.C = ConstantExpr::getShuffleVector($3.C, $5.C, $7.C);
> > -    $$.S = $3.S;
> > +    $$.S.copy($3.S);
> >    }
> >    ;
> >
> > @@ -2405,13 +2651,13 @@
> >      // If types are not resolved eagerly, then the two types will  
> > not be
> >      // determined to be the same type!
> >      //
> > -    const Type* Ty = $4.PAT->get();
> > -    ResolveTypeTo($2, Ty);
> > +    ResolveTypeTo($2, $4.PAT->get(), $4.S);
> >
> > -    if (!setTypeName(Ty, $2) && !$2) {
> > -      // If this is a named type that is not a redefinition, add  
> > it to the slot
> > -      // table.
> > -      CurModule.Types.push_back(Ty);
> > +    if (!setTypeName($4, $2) && !$2) {
> > +      // If this is a numbered type that is not a redefinition,  
> > add it to the
> > +      // slot table.
> > +      CurModule.Types.push_back($4.PAT->get());
> > +      CurModule.TypeSigns.push_back($4.S);
> >      }
> >      delete $4.PAT;
> >    }
> > @@ -2422,20 +2668,22 @@
> >    | ConstPool OptAssign OptLinkage GlobalType ConstVal {
> >      if ($5.C == 0)
> >        error("Global value initializer is not a constant");
> > -    CurGV = ParseGlobalVariable($2, $3, $4, $5.C->getType(), $5.C);
> > +    CurGV = ParseGlobalVariable($2, $3, $4, $5.C->getType(), $5.C,  
> > $5.S);
> >    } GlobalVarAttributes {
> >      CurGV = 0;
> >    }
> >    | ConstPool OptAssign EXTERNAL GlobalType Types {
> >      const Type *Ty = $5.PAT->get();
> > -    CurGV = ParseGlobalVariable($2, GlobalValue::ExternalLinkage,  
> > $4, Ty, 0);
> > +    CurGV = ParseGlobalVariable($2, GlobalValue::ExternalLinkage,  
> > $4, Ty, 0,
> > +                                $5.S);
> >      delete $5.PAT;
> >    } GlobalVarAttributes {
> >      CurGV = 0;
> >    }
> >    | ConstPool OptAssign DLLIMPORT GlobalType Types {
> >      const Type *Ty = $5.PAT->get();
> > -    CurGV = ParseGlobalVariable($2, GlobalValue::DLLImportLinkage,  
> > $4, Ty, 0);
> > +    CurGV = ParseGlobalVariable($2, GlobalValue::DLLImportLinkage,  
> > $4, Ty, 0,
> > +                                $5.S);
> >      delete $5.PAT;
> >    } GlobalVarAttributes {
> >      CurGV = 0;
> > @@ -2443,7 +2691,8 @@
> >    | ConstPool OptAssign EXTERN_WEAK GlobalType Types {
> >      const Type *Ty = $5.PAT->get();
> >      CurGV =
> > -      ParseGlobalVariable($2, GlobalValue::ExternalWeakLinkage,  
> > $4, Ty, 0);
> > +      ParseGlobalVariable($2, GlobalValue::ExternalWeakLinkage,  
> > $4, Ty, 0,
> > +                          $5.S);
> >      delete $5.PAT;
> >    } GlobalVarAttributes {
> >      CurGV = 0;
> > @@ -2553,14 +2802,14 @@
> >      $$ = $1;
> >      PATypeInfo VoidTI;
> >      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> > -    VoidTI.S = Signless;
> > +    VoidTI.S.makeSignless();
> >      $$->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
> >    }
> >    | DOTDOTDOT {
> >      $$ = new std::vector<std::pair<PATypeInfo,char*> >();
> >      PATypeInfo VoidTI;
> >      VoidTI.PAT = new PATypeHolder(Type::VoidTy);
> > -    VoidTI.S = Signless;
> > +    VoidTI.S.makeSignless();
> >      $$->push_back(std::pair<PATypeInfo, char*>(VoidTI, 0));
> >    }
> >    | /* empty */ { $$ = 0; }
> > @@ -2577,6 +2826,8 @@
> >      if (!RetTy->isFirstClassType() && RetTy != Type::VoidTy)
> >        error("LLVM functions cannot return aggregate types");
> >
> > +    Signedness FTySign;
> > +    FTySign.makeComposite($2.S);
> >      std::vector<const Type*> ParamTyList;
> >
> >      // In LLVM 2.0 the signatures of three varargs intrinsics  
> > changed to take
> > @@ -2592,6 +2843,7 @@
> >             I = $5->begin(), E = $5->end(); I != E; ++I) {
> >          const Type *Ty = I->first.PAT->get();
> >          ParamTyList.push_back(Ty);
> > +        FTySign.add(I->first.S);
> >        }
> >      }
> >
> > @@ -2618,6 +2870,7 @@
> >      } else {
> >        ID = ValID::create((int)CurModule.Values[PFT].size());
> >      }
> > +    ID.S.makeComposite(FTySign);
> >
> >      Function *Fn = 0;
> >      Module* M = CurModule.CurrentModule;
> > @@ -2644,14 +2897,16 @@
> >            std::string NewName(makeNameUnique(FunctionName));
> >            if (Conflict->hasInternalLinkage()) {
> >              Conflict->setName(NewName);
> > -            RenameMapKey Key = std::make_pair 
> > (FunctionName,Conflict->getType());
> > +            RenameMapKey Key =
> > +              makeRenameMapKey(FunctionName, Conflict->getType(),  
> > ID.S);
> >              CurModule.RenameMap[Key] = NewName;
> >              Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
> >              InsertValue(Fn, CurModule.Values);
> >            } else {
> >              Fn = new Function(FT, CurFun.Linkage, NewName, M);
> >              InsertValue(Fn, CurModule.Values);
> > -            RenameMapKey Key = std::make_pair(FunctionName,PFT);
> > +            RenameMapKey Key =
> > +              makeRenameMapKey(FunctionName, PFT, ID.S);
> >              CurModule.RenameMap[Key] = NewName;
> >            }
> >          } else {
> > @@ -2673,9 +2928,11 @@
> >          // type plane. After PR411 was fixed, this is no loner the  
> > case.
> >          // To resolve this we must rename one of the two.
> >          if (Conflict->hasInternalLinkage()) {
> > -          // We can safely renamed the Conflict.
> > +          // We can safely rename the Conflict.
> > +          RenameMapKey Key =
> > +            makeRenameMapKey(Conflict->getName(), Conflict->getType 
> > (),
> > +              CurModule.NamedValueSigns[Conflict->getName()]);
> >            Conflict->setName(makeNameUnique(Conflict->getName()));
> > -          RenameMapKey Key = std::make_pair(FunctionName,Conflict- 
> > >getType());
> >            CurModule.RenameMap[Key] = Conflict->getName();
> >            Fn = new Function(FT, CurFun.Linkage, FunctionName, M);
> >            InsertValue(Fn, CurModule.Values);
> > @@ -2684,7 +2941,7 @@
> >            std::string NewName = makeNameUnique(FunctionName);
> >            Fn = new Function(FT, CurFun.Linkage, NewName, M);
> >            InsertValue(Fn, CurModule.Values);
> > -          RenameMapKey Key = std::make_pair(FunctionName,PFT);
> > +          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT,  
> > ID.S);
> >            CurModule.RenameMap[Key] = NewName;
> >          } else {
> >            // We can't quietly rename either of these things, but  
> > we must
> > @@ -2695,7 +2952,7 @@
> >                    "' may cause linkage errors");
> >            Fn = new Function(FT, CurFun.Linkage, NewName, M);
> >            InsertValue(Fn, CurModule.Values);
> > -          RenameMapKey Key = std::make_pair(FunctionName,PFT);
> > +          RenameMapKey Key = makeRenameMapKey(FunctionName, PFT,  
> > ID.S);
> >            CurModule.RenameMap[Key] = NewName;
> >          }
> >        } else {
> > @@ -2734,7 +2991,8 @@
> >        std::vector<std::pair<PATypeInfo,char*> >::iterator E = $5- 
> > >end();
> >        for ( ; I != E && ArgIt != ArgEnd; ++I, ++ArgIt) {
> >          delete I->first.PAT;                      // Delete the  
> > typeholder...
> > -        setValueName(ArgIt, I->second);           // Insert arg  
> > into symtab...
> > +        ValueInfo VI; VI.V = ArgIt; VI.S.copy(I->first.S);
> > +        setValueName(VI, I->second);           // Insert arg into  
> > symtab...
> >          InsertValue(ArgIt);
> >        }
> >        delete $5;                     // We're now done with the  
> > argument list
> > @@ -2791,11 +3049,17 @@
> >
> >  ConstValueRef
> >      // A reference to a direct constant
> > -  : ESINT64VAL {    $$ = ValID::create($1); }
> > +  : ESINT64VAL { $$ = ValID::create($1); }
> >    | EUINT64VAL { $$ = ValID::create($1); }
> >    | FPVAL { $$ = ValID::create($1); }
> > -  | TRUETOK { $$ = ValID::create(ConstantInt::get(Type::Int1Ty,  
> > true)); }
> > -  | FALSETOK { $$ = ValID::create(ConstantInt::get(Type::Int1Ty,  
> > false)); }
> > +  | TRUETOK {
> > +    $$ = ValID::create(ConstantInt::get(Type::Int1Ty, true));
> > +    $$.S.makeUnsigned();
> > +  }
> > +  | FALSETOK {
> > +    $$ = ValID::create(ConstantInt::get(Type::Int1Ty, false));
> > +    $$.S.makeUnsigned();
> > +  }
> >    | NULL_TOK { $$ = ValID::createNull(); }
> >    | UNDEF { $$ = ValID::createUndef(); }
> >    | ZEROINITIALIZER { $$ = ValID::createZeroInit(); }
> > @@ -2803,8 +3067,8 @@
> >      const Type *ETy = (*$2)[0].C->getType();
> >      int NumElements = $2->size();
> >      VectorType* pt = VectorType::get(ETy, NumElements);
> > -    PATypeHolder* PTy = new PATypeHolder(
> > -      HandleUpRefs(VectorType::get(ETy, NumElements)));
> > +    $$.S.makeComposite((*$2)[0].S);
> > +    PATypeHolder* PTy = new PATypeHolder(HandleUpRefs(pt, $$.S));
> >
> >      // Verify all elements are correct type!
> >      std::vector<Constant*> Elems;
> > @@ -2822,6 +3086,7 @@
> >    }
> >    | ConstExpr {
> >      $$ = ValID::create($1.C);
> > +    $$.S.copy($1.S);
> >    }
> >    | ASM_TOK OptSideEffect STRINGCONSTANT ',' STRINGCONSTANT {
> >      char *End = UnEscapeLexed($3, true);
> > @@ -2834,12 +3099,11 @@
> >    }
> >    ;
> >
> > -// SymbolicValueRef - Reference to one of two ways of symbolically  
> > refering to
> > -// another value.
> > +// SymbolicValueRef - Reference to one of two ways of symbolically  
> > refering to // another value.
> >  //
> >  SymbolicValueRef
> > -  : INTVAL {  $$ = ValID::create($1); }
> > -  | Name   {  $$ = ValID::create($1); }
> > +  : INTVAL {  $$ = ValID::create($1); $$.S.makeSignless(); }
> > +  | Name   {  $$ = ValID::create($1); $$.S.makeSignless(); }
> >    ;
> >
> >  // ValueRef - A reference to a definition... either constant or  
> > symbolic
> > @@ -2854,8 +3118,9 @@
> >  ResolvedVal
> >    : Types ValueRef {
> >      const Type *Ty = $1.PAT->get();
> > -    $$.S = $1.S;
> > +    $2.S.copy($1.S);
> >      $$.V = getVal(Ty, $2);
> > +    $$.S.copy($1.S);
> >      delete $1.PAT;
> >    }
> >    ;
> > @@ -2874,9 +3139,10 @@
> >  //
> >  BasicBlock
> >    : InstructionList OptAssign BBTerminatorInst  {
> > -    setValueName($3, $2);
> > -    InsertValue($3);
> > -    $1->getInstList().push_back($3);
> > +    ValueInfo VI; VI.V = $3.TI; VI.S.copy($3.S);
> > +    setValueName(VI, $2);
> > +    InsertValue($3.TI);
> > +    $1->getInstList().push_back($3.TI);
> >      InsertValue($1);
> >      $$ = $1;
> >    }
> > @@ -2889,7 +3155,7 @@
> >      $$ = $1;
> >    }
> >    | /* empty */ {
> > -    $$ = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum++),  
> > true);
> > +    $$ = CurBB = getBBVal(ValID::create((int)CurFun.NextBBNum+ 
> > +),true);
> >      // Make sure to move the basic block to the correct location  
> > in the
> >      // function, instead of leaving it inserted wherever it was first
> >      // referenced.
> > @@ -2912,26 +3178,36 @@
> >
> >  BBTerminatorInst
> >    : RET ResolvedVal {              // Return with a result...
> > -    $$ = new ReturnInst($2.V);
> > +    $$.TI = new ReturnInst($2.V);
> > +    $$.S.makeSignless();
> >    }
> >    | RET VOID {                                       // Return  
> > with no result...
> > -    $$ = new ReturnInst();
> > +    $$.TI = new ReturnInst();
> > +    $$.S.makeSignless();
> >    }
> >    | BR LABEL ValueRef {                         // Unconditional  
> > Branch...
> >      BasicBlock* tmpBB = getBBVal($3);
> > -    $$ = new BranchInst(tmpBB);
> > +    $$.TI = new BranchInst(tmpBB);
> > +    $$.S.makeSignless();
> >    }                                                  //  
> > Conditional Branch...
> >    | BR BOOL ValueRef ',' LABEL ValueRef ',' LABEL ValueRef {
> > +    $6.S.makeSignless();
> > +    $9.S.makeSignless();
> >      BasicBlock* tmpBBA = getBBVal($6);
> >      BasicBlock* tmpBBB = getBBVal($9);
> > +    $3.S.makeUnsigned();
> >      Value* tmpVal = getVal(Type::Int1Ty, $3);
> > -    $$ = new BranchInst(tmpBBA, tmpBBB, tmpVal);
> > +    $$.TI = new BranchInst(tmpBBA, tmpBBB, tmpVal);
> > +    $$.S.makeSignless();
> >    }
> >    | SWITCH IntType ValueRef ',' LABEL ValueRef '[' JumpTable ']' {
> > +    $3.S.copy($2.S);
> >      Value* tmpVal = getVal($2.T, $3);
> > +    $6.S.makeSignless();
> >      BasicBlock* tmpBB = getBBVal($6);
> >      SwitchInst *S = new SwitchInst(tmpVal, tmpBB, $8->size());
> > -    $$ = S;
> > +    $$.TI = S;
> > +    $$.S.makeSignless();
> >      std::vector<std::pair<Constant*,BasicBlock*> >::iterator I =  
> > $8->begin(),
> >        E = $8->end();
> >      for (; I != E; ++I) {
> > @@ -2943,24 +3219,31 @@
> >      delete $8;
> >    }
> >    | SWITCH IntType ValueRef ',' LABEL ValueRef '[' ']' {
> > +    $3.S.copy($2.S);
> >      Value* tmpVal = getVal($2.T, $3);
> > +    $6.S.makeSignless();
> >      BasicBlock* tmpBB = getBBVal($6);
> >      SwitchInst *S = new SwitchInst(tmpVal, tmpBB, 0);
> > -    $$ = S;
> > +    $$.TI = S;
> > +    $$.S.makeSignless();
> >    }
> >    | INVOKE OptCallingConv TypesV ValueRef '(' ValueRefListE ')'
> >      TO LABEL ValueRef Unwind LABEL ValueRef {
> >      const PointerType *PFTy;
> >      const FunctionType *Ty;
> > +    Signedness FTySign;
> >
> >      if (!(PFTy = dyn_cast<PointerType>($3.PAT->get())) ||
> >          !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
> >        // Pull out the types of all of the arguments...
> >        std::vector<const Type*> ParamTypes;
> > +      FTySign.makeComposite($3.S);
> >        if ($6) {
> >          for (std::vector<ValueInfo>::iterator I = $6->begin(), E =  
> > $6->end();
> > -             I != E; ++I)
> > +             I != E; ++I) {
> >            ParamTypes.push_back((*I).V->getType());
> > +          FTySign.add(I->S);
> > +        }
> >        }
> >        FunctionType::ParamAttrsList ParamAttrs;
> >        if ($2 == OldCallingConv::CSRet) {
> > @@ -2971,14 +3254,19 @@
> >        if (isVarArg) ParamTypes.pop_back();
> >        Ty = FunctionType::get($3.PAT->get(), ParamTypes, isVarArg,  
> > ParamAttrs);
> >        PFTy = PointerType::get(Ty);
> > +      $$.S.copy($3.S);
> > +    } else {
> > +      FTySign = $3.S;
> > +      $$.S.copy($3.S.get(0)); // 0th element of FuncTy sign is  
> > result ty
> >      }
> > +    $4.S.makeComposite(FTySign);
> >      Value *V = getVal(PFTy, $4);   // Get the function we're  
> > calling...
> >      BasicBlock *Normal = getBBVal($10);
> >      BasicBlock *Except = getBBVal($13);
> >
> >      // Create the call node...
> >      if (!$6) {                                   // Has no arguments?
> > -      $$ = new InvokeInst(V, Normal, Except, 0, 0);
> > +      $$.TI = new InvokeInst(V, Normal, Except, 0, 0);
> >      } else {                                     // Has arguments?
> >        // Loop through FunctionType's arguments and ensure they are  
> > specified
> >        // correctly!
> > @@ -2998,38 +3286,44 @@
> >        if (I != E || (ArgI != ArgE && !Ty->isVarArg()))
> >          error("Invalid number of parameters detected");
> >
> > -      $$ = new InvokeInst(V, Normal, Except, &Args[0], Args.size());
> > +      $$.TI = new InvokeInst(V, Normal, Except, &Args[0], Args.size 
> > ());
> >      }
> > -    cast<InvokeInst>($$)->setCallingConv(upgradeCallingConv($2));
> > +    cast<InvokeInst>($$.TI)->setCallingConv(upgradeCallingConv($2));
> >      delete $3.PAT;
> >      delete $6;
> >    }
> >    | Unwind {
> > -    $$ = new UnwindInst();
> > +    $$.TI = new UnwindInst();
> > +    $$.S.makeSignless();
> >    }
> >    | UNREACHABLE {
> > -    $$ = new UnreachableInst();
> > +    $$.TI = new UnreachableInst();
> > +    $$.S.makeSignless();
> >    }
> >    ;
> >
> >  JumpTable
> >    : JumpTable IntType ConstValueRef ',' LABEL ValueRef {
> >      $$ = $1;
> > +    $3.S.copy($2.S);
> >      Constant *V = cast<Constant>(getExistingValue($2.T, $3));
> >
> >      if (V == 0)
> >        error("May only switch on a constant pool value");
> >
> > +    $6.S.makeSignless();
> >      BasicBlock* tmpBB = getBBVal($6);
> >      $$->push_back(std::make_pair(V, tmpBB));
> >    }
> >    | IntType ConstValueRef ',' LABEL ValueRef {
> >      $$ = new std::vector<std::pair<Constant*, BasicBlock*> >();
> > +    $2.S.copy($1.S);
> >      Constant *V = cast<Constant>(getExistingValue($1.T, $2));
> >
> >      if (V == 0)
> >        error("May only switch on a constant pool value");
> >
> > +    $5.S.makeSignless();
> >      BasicBlock* tmpBB = getBBVal($5);
> >      $$->push_back(std::make_pair(V, tmpBB));
> >    }
> > @@ -3057,9 +3351,10 @@
> >            omit = true;
> >      if (omit) {
> >        $$.I = 0;
> > -      $$.S = Signless;
> > +      $$.S.makeSignless();
> >      } else {
> > -      setValueName($2.I, $1);
> > +      ValueInfo VI; VI.V = $2.I; VI.S.copy($2.S);
> > +      setValueName(VI, $1);
> >        InsertValue($2.I);
> >        $$ = $2;
> >      }
> > @@ -3067,15 +3362,19 @@
> >
> >  PHIList : Types '[' ValueRef ',' ValueRef ']' {    // Used for PHI  
> > nodes
> >      $$.P = new std::list<std::pair<Value*, BasicBlock*> >();
> > -    $$.S = $1.S;
> > +    $$.S.copy($1.S);
> > +    $3.S.copy($1.S);
> >      Value* tmpVal = getVal($1.PAT->get(), $3);
> > +    $5.S.makeSignless();
> >      BasicBlock* tmpBB = getBBVal($5);
> >      $$.P->push_back(std::make_pair(tmpVal, tmpBB));
> >      delete $1.PAT;
> >    }
> >    | PHIList ',' '[' ValueRef ',' ValueRef ']' {
> >      $$ = $1;
> > +    $4.S.copy($1.S);
> >      Value* tmpVal = getVal($1.P->front().first->getType(), $4);
> > +    $6.S.makeSignless();
> >      BasicBlock* tmpBB = getBBVal($6);
> >      $1.P->push_back(std::make_pair(tmpVal, tmpBB));
> >    }
> > @@ -3107,6 +3406,8 @@
> >
> >  InstVal
> >    : ArithmeticOps Types ValueRef ',' ValueRef {
> > +    $3.S.copy($2.S);
> > +    $5.S.copy($2.S);
> >      const Type* Ty = $2.PAT->get();
> >      if (!Ty->isInteger() && !Ty->isFloatingPoint() && ! 
> > isa<VectorType>(Ty))
> >        error("Arithmetic operator requires integer, FP, or packed  
> > operands");
> > @@ -3120,10 +3421,12 @@
> >      $$.I = BinaryOperator::create(Opcode, val1, val2);
> >      if ($$.I == 0)
> >        error("binary operator returned null");
> > -    $$.S = $2.S;
> > +    $$.S.copy($2.S);
> >      delete $2.PAT;
> >    }
> >    | LogicalOps Types ValueRef ',' ValueRef {
> > +    $3.S.copy($2.S);
> > +    $5.S.copy($2.S);
> >      const Type *Ty = $2.PAT->get();
> >      if (!Ty->isInteger()) {
> >        if (!isa<VectorType>(Ty) ||
> > @@ -3136,10 +3439,12 @@
> >      $$.I = BinaryOperator::create(Opcode, tmpVal1, tmpVal2);
> >      if ($$.I == 0)
> >        error("binary operator returned null");
> > -    $$.S = $2.S;
> > +    $$.S.copy($2.S);
> >      delete $2.PAT;
> >    }
> >    | SetCondOps Types ValueRef ',' ValueRef {
> > +    $3.S.copy($2.S);
> > +    $5.S.copy($2.S);
> >      const Type* Ty = $2.PAT->get();
> >      if(isa<VectorType>(Ty))
> >        error("VectorTypes currently not supported in setcc  
> > instructions");
> > @@ -3150,10 +3455,12 @@
> >      $$.I = CmpInst::create(Opcode, pred, tmpVal1, tmpVal2);
> >      if ($$.I == 0)
> >        error("binary operator returned null");
> > -    $$.S = Unsigned;
> > +    $$.S.makeUnsigned();
> >      delete $2.PAT;
> >    }
> >    | ICMP IPredicates Types ValueRef ',' ValueRef {
> > +    $4.S.copy($3.S);
> > +    $6.S.copy($3.S);
> >      const Type *Ty = $3.PAT->get();
> >      if (isa<VectorType>(Ty))
> >        error("VectorTypes currently not supported in icmp  
> > instructions");
> > @@ -3162,10 +3469,12 @@
> >      Value* tmpVal1 = getVal(Ty, $4);
> >      Value* tmpVal2 = getVal(Ty, $6);
> >      $$.I = new ICmpInst($2, tmpVal1, tmpVal2);
> > -    $$.S = Unsigned;
> > +    $$.S.makeUnsigned();
> >      delete $3.PAT;
> >    }
> >    | FCMP FPredicates Types ValueRef ',' ValueRef {
> > +    $4.S.copy($3.S);
> > +    $6.S.copy($3.S);
> >      const Type *Ty = $3.PAT->get();
> >      if (isa<VectorType>(Ty))
> >        error("VectorTypes currently not supported in fcmp  
> > instructions");
> > @@ -3174,7 +3483,7 @@
> >      Value* tmpVal1 = getVal(Ty, $4);
> >      Value* tmpVal2 = getVal(Ty, $6);
> >      $$.I = new FCmpInst($2, tmpVal1, tmpVal2);
> > -    $$.S = Unsigned;
> > +    $$.S.makeUnsigned();
> >      delete $3.PAT;
> >    }
> >    | NOT ResolvedVal {
> > @@ -3186,7 +3495,7 @@
> >      $$.I = BinaryOperator::create(Instruction::Xor, $2.V, Ones);
> >      if ($$.I == 0)
> >        error("Could not create a xor instruction");
> > -    $$.S = $2.S;
> > +    $$.S.copy($2.S);
> >    }
> >    | ShiftOps ResolvedVal ',' ResolvedVal {
> >      if (!$4.V->getType()->isInteger() ||
> > @@ -3204,7 +3513,7 @@
> >      else
> >        ShiftAmt = $4.V;
> >      $$.I = BinaryOperator::create(getBinaryOp($1, Ty, $2.S), $2.V,  
> > ShiftAmt);
> > -    $$.S = $2.S;
> > +    $$.S.copy($2.S);
> >    }
> >    | CastOps ResolvedVal TO Types {
> >      const Type *DstTy = $4.PAT->get();
> > @@ -3212,7 +3521,7 @@
> >        error("cast instruction to a non-primitive type: '" +
> >              DstTy->getDescription() + "'");
> >      $$.I = cast<Instruction>(getCast($1, $2.V, $2.S, DstTy, $4.S,  
> > true));
> > -    $$.S = $4.S;
> > +    $$.S.copy($4.S);
> >      delete $4.PAT;
> >    }
> >    | SELECT ResolvedVal ',' ResolvedVal ',' ResolvedVal {
> > @@ -3222,13 +3531,13 @@
> >      if ($4.V->getType() != $6.V->getType())
> >        error("select value types should match");
> >      $$.I = new SelectInst($2.V, $4.V, $6.V);
> > -    $$.S = $2.S;
> > +    $$.S.copy($4.S);
> >    }
> >    | VAARG ResolvedVal ',' Types {
> >      const Type *Ty = $4.PAT->get();
> >      NewVarArgs = true;
> >      $$.I = new VAArgInst($2.V, Ty);
> > -    $$.S = $4.S;
> > +    $$.S.copy($4.S);
> >      delete $4.PAT;
> >    }
> >    | VAARG_old ResolvedVal ',' Types {
> > @@ -3249,7 +3558,7 @@
> >      CurBB->getInstList().push_back(bar);
> >      CurBB->getInstList().push_back(new StoreInst(bar, foo));
> >      $$.I = new VAArgInst(foo, DstTy);
> > -    $$.S = $4.S;
> > +    $$.S.copy($4.S);
> >      delete $4.PAT;
> >    }
> >    | VANEXT_old ResolvedVal ',' Types {
> > @@ -3273,26 +3582,26 @@
> >      Instruction* tmp = new VAArgInst(foo, DstTy);
> >      CurBB->getInstList().push_back(tmp);
> >      $$.I = new LoadInst(foo);
> > -    $$.S = $4.S;
> > +    $$.S.copy($4.S);
> >      delete $4.PAT;
> >    }
> >    | EXTRACTELEMENT ResolvedVal ',' ResolvedVal {
> >      if (!ExtractElementInst::isValidOperands($2.V, $4.V))
> >        error("Invalid extractelement operands");
> >      $$.I = new ExtractElementInst($2.V, $4.V);
> > -    $$.S = $2.S;
> > +    $$.S.copy($2.S.get(0));
> >    }
> >    | INSERTELEMENT ResolvedVal ',' ResolvedVal ',' ResolvedVal {
> >      if (!InsertElementInst::isValidOperands($2.V, $4.V, $6.V))
> >        error("Invalid insertelement operands");
> >      $$.I = new InsertElementInst($2.V, $4.V, $6.V);
> > -    $$.S = $2.S;
> > +    $$.S.copy($2.S);
> >    }
> >    | SHUFFLEVECTOR ResolvedVal ',' ResolvedVal ',' ResolvedVal {
> >      if (!ShuffleVectorInst::isValidOperands($2.V, $4.V, $6.V))
> >        error("Invalid shufflevector operands");
> >      $$.I = new ShuffleVectorInst($2.V, $4.V, $6.V);
> > -    $$.S = $2.S;
> > +    $$.S.copy($2.S);
> >    }
> >    | PHI_TOK PHIList {
> >      const Type *Ty = $2.P->front().first->getType();
> > @@ -3307,22 +3616,25 @@
> >        $2.P->pop_front();
> >      }
> >      $$.I = PHI;
> > -    $$.S = $2.S;
> > +    $$.S.copy($2.S);
> >      delete $2.P;  // Free the list...
> >    }
> >    | OptTailCall OptCallingConv TypesV ValueRef '(' ValueRefListE  
> > ')'  {
> > -
> >      // Handle the short call syntax
> >      const PointerType *PFTy;
> >      const FunctionType *FTy;
> > +    Signedness FTySign;
> >      if (!(PFTy = dyn_cast<PointerType>($3.PAT->get())) ||
> >          !(FTy = dyn_cast<FunctionType>(PFTy->getElementType()))) {
> >        // Pull out the types of all of the arguments...
> >        std::vector<const Type*> ParamTypes;
> > +      FTySign.makeComposite($3.S);
> >        if ($6) {
> >          for (std::vector<ValueInfo>::iterator I = $6->begin(), E =  
> > $6->end();
> > -             I != E; ++I)
> > +             I != E; ++I) {
> >            ParamTypes.push_back((*I).V->getType());
> > +          FTySign.add(I->S);
> > +        }
> >        }
> >
> >        FunctionType::ParamAttrsList ParamAttrs;
> > @@ -3339,7 +3651,12 @@
> >
> >        FTy = FunctionType::get(RetTy, ParamTypes, isVarArg,  
> > ParamAttrs);
> >        PFTy = PointerType::get(FTy);
> > +      $$.S.copy($3.S);
> > +    } else {
> > +      FTySign = $3.S;
> > +      $$.S.copy($3.S.get(0)); // 0th element of FuncTy signedness  
> > is result sign
> >      }
> > +    $4.S.makeComposite(FTySign);
> >
> >      // First upgrade any intrinsic calls.
> >      std::vector<Value*> Args;
> > @@ -3351,7 +3668,6 @@
> >      // If we got an upgraded intrinsic
> >      if (Inst) {
> >        $$.I = Inst;
> > -      $$.S = Signless;
> >      } else {
> >        // Get the function we're calling
> >        Value *V = getVal(PFTy, $4);
> > @@ -3383,7 +3699,6 @@
> >        CI->setTailCall($1);
> >        CI->setCallingConv(upgradeCallingConv($2));
> >        $$.I = CI;
> > -      $$.S = $3.S;
> >      }
> >      delete $3.PAT;
> >      delete $6;
> > @@ -3408,25 +3723,27 @@
> >  MemoryInst
> >    : MALLOC Types OptCAlign {
> >      const Type *Ty = $2.PAT->get();
> > -    $$.S = $2.S;
> > +    $$.S.makeComposite($2.S);
> >      $$.I = new MallocInst(Ty, 0, $3);
> >      delete $2.PAT;
> >    }
> >    | MALLOC Types ',' UINT ValueRef OptCAlign {
> >      const Type *Ty = $2.PAT->get();
> > -    $$.S = $2.S;
> > +    $5.S.makeUnsigned();
> > +    $$.S.makeComposite($2.S);
> >      $$.I = new MallocInst(Ty, getVal($4.T, $5), $6);
> >      delete $2.PAT;
> >    }
> >    | ALLOCA Types OptCAlign {
> >      const Type *Ty = $2.PAT->get();
> > -    $$.S = $2.S;
> > +    $$.S.makeComposite($2.S);
> >      $$.I = new AllocaInst(Ty, 0, $3);
> >      delete $2.PAT;
> >    }
> >    | ALLOCA Types ',' UINT ValueRef OptCAlign {
> >      const Type *Ty = $2.PAT->get();
> > -    $$.S = $2.S;
> > +    $5.S.makeUnsigned();
> > +    $$.S.makeComposite($4.S);
> >      $$.I = new AllocaInst(Ty, getVal($4.T, $5), $6);
> >      delete $2.PAT;
> >    }
> > @@ -3435,11 +3752,11 @@
> >      if (!isa<PointerType>(PTy))
> >        error("Trying to free nonpointer type '" + PTy- 
> > >getDescription() + "'");
> >      $$.I = new FreeInst($2.V);
> > -    $$.S = Signless;
> > +    $$.S.makeSignless();
> >    }
> >    | OptVolatile LOAD Types ValueRef {
> >      const Type* Ty = $3.PAT->get();
> > -    $$.S = $3.S;
> > +    $4.S.copy($3.S);
> >      if (!isa<PointerType>(Ty))
> >        error("Can't load from nonpointer type: " + Ty- 
> > >getDescription());
> >      if (!cast<PointerType>(Ty)->getElementType()->isFirstClassType())
> > @@ -3447,9 +3764,11 @@
> >                       Ty->getDescription());
> >      Value* tmpVal = getVal(Ty, $4);
> >      $$.I = new LoadInst(tmpVal, "", $1);
> > +    $$.S.copy($3.S.get(0));
> >      delete $3.PAT;
> >    }
> >    | OptVolatile STORE ResolvedVal ',' Types ValueRef {
> > +    $6.S.copy($5.S);
> >      const PointerType *PTy = dyn_cast<PointerType>($5.PAT->get());
> >      if (!PTy)
> >        error("Can't store to a nonpointer type: " +
> > @@ -3471,10 +3790,11 @@
> >        }
> >      }
> >      $$.I = new StoreInst(StoreVal, tmpVal, $1);
> > -    $$.S = Signless;
> > +    $$.S.makeSignless();
> >      delete $5.PAT;
> >    }
> >    | GETELEMENTPTR Types ValueRef IndexList {
> > +    $3.S.copy($2.S);
> >      const Type* Ty = $2.PAT->get();
> >      if (!isa<PointerType>(Ty))
> >        error("getelementptr insn requires pointer operand");
> > @@ -3484,7 +3804,8 @@
> >
> >      Value* tmpVal = getVal(Ty, $3);
> >      $$.I = new GetElementPtrInst(tmpVal, &VIndices[0],  
> > VIndices.size());
> > -    $$.S = Signless;
> > +    ValueInfo VI; VI.V = tmpVal; VI.S.copy($2.S);
> > +    $$.S.copy(getElementSign(VI, VIndices));
> >      delete $2.PAT;
> >      delete $4;
> >    };
> >
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at cs.uiuc.edu
> > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> 



From djg at cray.com  Thu Mar 22 11:39:28 2007
From: djg at cray.com (Dan Gohman)
Date: Thu, 22 Mar 2007 11:39:28 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp Instructions.cpp
Message-ID: <200703221639.l2MGdS5n008777@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.264 -> 1.265
Instructions.cpp updated: 1.80 -> 1.81
---
Log message:

Change uses of Function::front to Function::getEntryBlock for readability.


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

 AsmWriter.cpp    |    2 +-
 Instructions.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.264 llvm/lib/VMCore/AsmWriter.cpp:1.265
--- llvm/lib/VMCore/AsmWriter.cpp:1.264	Mon Mar 19 13:32:53 2007
+++ llvm/lib/VMCore/AsmWriter.cpp	Thu Mar 22 11:38:57 2007
@@ -1036,7 +1036,7 @@
   if (BB->getParent() == 0)
     Out << "\t\t; Error: Block without parent!";
   else {
-    if (BB != &BB->getParent()->front()) {  // Not the entry block?
+    if (BB != &BB->getParent()->getEntryBlock()) {  // Not the entry block?
       // Output predecessors for the block...
       Out << "\t\t;";
       pred_const_iterator PI = pred_begin(BB), PE = pred_end(BB);


Index: llvm/lib/VMCore/Instructions.cpp
diff -u llvm/lib/VMCore/Instructions.cpp:1.80 llvm/lib/VMCore/Instructions.cpp:1.81
--- llvm/lib/VMCore/Instructions.cpp:1.80	Thu Mar  1 14:27:41 2007
+++ llvm/lib/VMCore/Instructions.cpp	Thu Mar 22 11:38:57 2007
@@ -170,7 +170,7 @@
   if (HasUndefInput && !AllowNonDominatingInstruction)
     if (Instruction *IV = dyn_cast<Instruction>(InVal))
       // If it's in the entry block, it dominates everything.
-      if (IV->getParent() != &IV->getParent()->getParent()->front() ||
+      if (IV->getParent() != &IV->getParent()->getParent()->getEntryBlock() ||
           isa<InvokeInst>(IV))
         return 0;   // Cannot guarantee that InVal dominates this PHINode.
 





From djg at cray.com  Thu Mar 22 11:39:31 2007
From: djg at cray.com (Dan Gohman)
Date: Thu, 22 Mar 2007 11:39:31 -0500
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/CloneFunction.cpp
	CodeExtractor.cpp InlineFunction.cpp SimplifyCFG.cpp
Message-ID: <200703221639.l2MGdV8I008790@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Utils:

CloneFunction.cpp updated: 1.43 -> 1.44
CodeExtractor.cpp updated: 1.50 -> 1.51
InlineFunction.cpp updated: 1.54 -> 1.55
SimplifyCFG.cpp updated: 1.118 -> 1.119
---
Log message:

Change uses of Function::front to Function::getEntryBlock for readability.


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

 CloneFunction.cpp  |    2 +-
 CodeExtractor.cpp  |    2 +-
 InlineFunction.cpp |    7 ++++---
 SimplifyCFG.cpp    |    3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)


Index: llvm/lib/Transforms/Utils/CloneFunction.cpp
diff -u llvm/lib/Transforms/Utils/CloneFunction.cpp:1.43 llvm/lib/Transforms/Utils/CloneFunction.cpp:1.44
--- llvm/lib/Transforms/Utils/CloneFunction.cpp:1.43	Thu Mar  1 21:11:20 2007
+++ llvm/lib/Transforms/Utils/CloneFunction.cpp	Thu Mar 22 11:38:57 2007
@@ -59,7 +59,7 @@
     CodeInfo->ContainsUnwinds        |= isa<UnwindInst>(BB->getTerminator());
     CodeInfo->ContainsDynamicAllocas |= hasDynamicAllocas;
     CodeInfo->ContainsDynamicAllocas |= hasStaticAllocas && 
-                                        BB != &BB->getParent()->front();
+                                        BB != &BB->getParent()->getEntryBlock();
   }
   return NewBB;
 }


Index: llvm/lib/Transforms/Utils/CodeExtractor.cpp
diff -u llvm/lib/Transforms/Utils/CodeExtractor.cpp:1.50 llvm/lib/Transforms/Utils/CodeExtractor.cpp:1.51
--- llvm/lib/Transforms/Utils/CodeExtractor.cpp:1.50	Mon Feb 12 20:10:56 2007
+++ llvm/lib/Transforms/Utils/CodeExtractor.cpp	Thu Mar 22 11:38:57 2007
@@ -104,7 +104,7 @@
   bool HasPredsFromRegion = false;
   unsigned NumPredsOutsideRegion = 0;
 
-  if (Header != &Header->getParent()->front()) {
+  if (Header != &Header->getParent()->getEntryBlock()) {
     PHINode *PN = dyn_cast<PHINode>(Header->begin());
     if (!PN) return;  // No PHI nodes.
 


Index: llvm/lib/Transforms/Utils/InlineFunction.cpp
diff -u llvm/lib/Transforms/Utils/InlineFunction.cpp:1.54 llvm/lib/Transforms/Utils/InlineFunction.cpp:1.55
--- llvm/lib/Transforms/Utils/InlineFunction.cpp:1.54	Tue Feb 20 14:52:03 2007
+++ llvm/lib/Transforms/Utils/InlineFunction.cpp	Thu Mar 22 11:38:57 2007
@@ -265,9 +265,10 @@
           // Transfer all of the allocas over in a block.  Using splice means
           // that the instructions aren't removed from the symbol table, then
           // reinserted.
-          Caller->front().getInstList().splice(InsertPoint,
-                                               FirstNewBlock->getInstList(),
-                                               AI, I);
+          Caller->getEntryBlock().getInstList().splice(
+              InsertPoint,
+              FirstNewBlock->getInstList(),
+              AI, I);
         }
       }
   }


Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.118 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.119
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.118	Fri Mar  2 17:01:14 2007
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Thu Mar 22 11:38:57 2007
@@ -1185,7 +1185,8 @@
 
   assert(BB && BB->getParent() && "Block not embedded in function!");
   assert(BB->getTerminator() && "Degenerate basic block encountered!");
-  assert(&BB->getParent()->front() != BB && "Can't Simplify entry block!");
+  assert(&BB->getParent()->getEntryBlock() != BB &&
+         "Can't Simplify entry block!");
 
   // Remove basic blocks that have no predecessors... which are unreachable.
   if (pred_begin(BB) == pred_end(BB) ||





From djg at cray.com  Thu Mar 22 11:39:32 2007
From: djg at cray.com (Dan Gohman)
Date: Thu, 22 Mar 2007 11:39:32 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp LICM.cpp
	ScalarReplAggregates.cpp TailRecursionElimination.cpp
Message-ID: <200703221639.l2MGdWYd008801@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.671 -> 1.672
LICM.cpp updated: 1.88 -> 1.89
ScalarReplAggregates.cpp updated: 1.80 -> 1.81
TailRecursionElimination.cpp updated: 1.29 -> 1.30
---
Log message:

Change uses of Function::front to Function::getEntryBlock for readability.


---
Diffs of the changes:  (+5 -4)

 InstructionCombining.cpp     |    3 ++-
 LICM.cpp                     |    2 +-
 ScalarReplAggregates.cpp     |    2 +-
 TailRecursionElimination.cpp |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.671 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.672
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.671	Wed Mar 21 18:19:50 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Thu Mar 22 11:38:57 2007
@@ -9946,7 +9946,8 @@
   if (isa<PHINode>(I) || I->mayWriteToMemory()) return false;
 
   // Do not sink alloca instructions out of the entry block.
-  if (isa<AllocaInst>(I) && I->getParent() == &DestBlock->getParent()->front())
+  if (isa<AllocaInst>(I) && I->getParent() ==
+        &DestBlock->getParent()->getEntryBlock())
     return false;
 
   // We can only sink load instructions if there is nothing between the load and


Index: llvm/lib/Transforms/Scalar/LICM.cpp
diff -u llvm/lib/Transforms/Scalar/LICM.cpp:1.88 llvm/lib/Transforms/Scalar/LICM.cpp:1.89
--- llvm/lib/Transforms/Scalar/LICM.cpp:1.88	Tue Mar  6 22:41:30 2007
+++ llvm/lib/Transforms/Scalar/LICM.cpp	Thu Mar 22 11:38:57 2007
@@ -471,7 +471,7 @@
 
     if (I.getType() != Type::VoidTy)
       AI = new AllocaInst(I.getType(), 0, I.getName(),
-                          I.getParent()->getParent()->front().begin());
+                          I.getParent()->getParent()->getEntryBlock().begin());
 
     // Secondly, insert load instructions for each use of the instruction
     // outside of the loop.


Index: llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp
diff -u llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.80 llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.81
--- llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp:1.80	Mon Mar 19 13:25:57 2007
+++ llvm/lib/Transforms/Scalar/ScalarReplAggregates.cpp	Thu Mar 22 11:38:57 2007
@@ -891,7 +891,7 @@
   ++NumConverted;
   
   BasicBlock *EntryBlock = AI->getParent();
-  assert(EntryBlock == &EntryBlock->getParent()->front() &&
+  assert(EntryBlock == &EntryBlock->getParent()->getEntryBlock() &&
          "Not in the entry block!");
   EntryBlock->getInstList().remove(AI);  // Take the alloca out of the program.
   


Index: llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp
diff -u llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.29 llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.30
--- llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp:1.29	Sat Feb 10 19:23:03 2007
+++ llvm/lib/Transforms/Scalar/TailRecursionElimination.cpp	Thu Mar 22 11:38:57 2007
@@ -108,7 +108,7 @@
       // If this alloca is in the body of the function, or if it is a variable
       // sized allocation, we cannot tail call eliminate calls marked 'tail'
       // with this mechanism.
-      if (BB != &BB->getParent()->front() ||
+      if (BB != &BB->getParent()->getEntryBlock() ||
           !isa<ConstantInt>(AI->getArraySize()))
         CannotTCETailMarkedCall = true;
     }





From djg at cray.com  Thu Mar 22 11:39:33 2007
From: djg at cray.com (Dan Gohman)
Date: Thu, 22 Mar 2007 11:39:33 -0500
Subject: [llvm-commits] CVS: llvm/lib/Analysis/ProfileInfo.cpp
	ProfileInfoLoader.cpp
Message-ID: <200703221639.l2MGdXjr008808@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Analysis:

ProfileInfo.cpp updated: 1.10 -> 1.11
ProfileInfoLoader.cpp updated: 1.11 -> 1.12
---
Log message:

Change uses of Function::front to Function::getEntryBlock for readability.


---
Diffs of the changes:  (+3 -2)

 ProfileInfo.cpp       |    2 +-
 ProfileInfoLoader.cpp |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


Index: llvm/lib/Analysis/ProfileInfo.cpp
diff -u llvm/lib/Analysis/ProfileInfo.cpp:1.10 llvm/lib/Analysis/ProfileInfo.cpp:1.11
--- llvm/lib/Analysis/ProfileInfo.cpp:1.10	Mon Feb  5 17:42:17 2007
+++ llvm/lib/Analysis/ProfileInfo.cpp	Thu Mar 22 11:38:57 2007
@@ -33,7 +33,7 @@
   // Are there zero predecessors of this block?
   if (PI == PE) {
     // If this is the entry block, look for the Null -> Entry edge.
-    if (BB == &BB->getParent()->front())
+    if (BB == &BB->getParent()->getEntryBlock())
       return getEdgeWeight(0, BB);
     else
       return 0;   // Otherwise, this is a dead block.


Index: llvm/lib/Analysis/ProfileInfoLoader.cpp
diff -u llvm/lib/Analysis/ProfileInfoLoader.cpp:1.11 llvm/lib/Analysis/ProfileInfoLoader.cpp:1.12
--- llvm/lib/Analysis/ProfileInfoLoader.cpp:1.11	Tue Jan 30 14:08:36 2007
+++ llvm/lib/Analysis/ProfileInfoLoader.cpp	Thu Mar 22 11:38:57 2007
@@ -152,7 +152,8 @@
       getBlockCounts(BlockCounts);
 
       for (unsigned i = 0, e = BlockCounts.size(); i != e; ++i)
-        if (&BlockCounts[i].first->getParent()->front() == BlockCounts[i].first)
+        if (&BlockCounts[i].first->getParent()->getEntryBlock() ==
+            BlockCounts[i].first)
           Counts.push_back(std::make_pair(BlockCounts[i].first->getParent(),
                                           BlockCounts[i].second));
     } else {





From djg at cray.com  Thu Mar 22 11:39:34 2007
From: djg at cray.com (Dan Gohman)
Date: Thu, 22 Mar 2007 11:39:34 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
Message-ID: <200703221639.l2MGdY6O008813@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

SelectionDAGISel.cpp updated: 1.390 -> 1.391
---
Log message:

Change uses of Function::front to Function::getEntryBlock for readability.


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

 SelectionDAGISel.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.390 llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.391
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp:1.390	Tue Mar 20 14:32:11 2007
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp	Thu Mar 22 11:38:57 2007
@@ -4328,7 +4328,7 @@
   std::vector<SDOperand> UnorderedChains;
 
   // Lower any arguments needed in this block if this is the entry block.
-  if (LLVMBB == &LLVMBB->getParent()->front())
+  if (LLVMBB == &LLVMBB->getParent()->getEntryBlock())
     LowerArguments(LLVMBB, SDL, UnorderedChains);
 
   BB = FuncInfo.MBBMap[LLVMBB];





From dpatel at apple.com  Thu Mar 22 13:31:31 2007
From: dpatel at apple.com (dpatel at apple.com)
Date: Thu, 22 Mar 2007 11:31:31 -0700 (PDT)
Subject: [llvm-commits] [125246] Do not map 80 bit and 96 bit float point
	types to
Message-ID: <20070322183131.3CCF4ADE147A@src>

Revision: 125246
Author:   dpatel
Date:     2007-03-22 11:31:30 -0700 (Thu, 22 Mar 2007)

Log Message:
-----------
Do not map 80 bit and 96 bit float point types to
64 bit LLVM type.

Patch by Duncan Sands.

Modified Paths:
--------------
    apple-local/branches/llvm/gcc/llvm-types.cpp

Modified: apple-local/branches/llvm/gcc/llvm-types.cpp
===================================================================
--- apple-local/branches/llvm/gcc/llvm-types.cpp	2007-03-22 17:31:43 UTC (rev 125245)
+++ apple-local/branches/llvm/gcc/llvm-types.cpp	2007-03-22 18:31:30 UTC (rev 125246)
@@ -471,8 +471,6 @@
       debug_tree(type);
       abort();        
     case 32: return SET_TYPE_LLVM(type, Type::FloatTy);
-    case 80:     // Map long doubles to doubles.
-    case 96:     // Map long doubles to doubles.
     case 64: return SET_TYPE_LLVM(type, Type::DoubleTy);
     case 128:
       // 128-bit long doubles map onto { double, double }.




From bwendlin at apple.com  Thu Mar 22 13:41:21 2007
From: bwendlin at apple.com (bwendlin at apple.com)
Date: Thu, 22 Mar 2007 11:41:21 -0700 (PDT)
Subject: [llvm-commits] [125247] Add build vector shuffles for MMX
	instructions.
Message-ID: <20070322184121.8F3FEADE4997@src>

Revision: 125247
Author:   bwendlin
Date:     2007-03-22 11:41:21 -0700 (Thu, 22 Mar 2007)

Log Message:
-----------
Add build vector shuffles for MMX instructions.

Modified Paths:
--------------
    apple-local/branches/llvm/gcc/config/i386/llvm-i386.cpp

Modified: apple-local/branches/llvm/gcc/config/i386/llvm-i386.cpp
===================================================================
--- apple-local/branches/llvm/gcc/config/i386/llvm-i386.cpp	2007-03-22 18:31:30 UTC (rev 125246)
+++ apple-local/branches/llvm/gcc/config/i386/llvm-i386.cpp	2007-03-22 18:41:21 UTC (rev 125247)
@@ -326,6 +326,26 @@
     }
     
     return true;
+  case IX86_BUILTIN_PUNPCKHBW:
+    Result = BuildVectorShuffle(Ops[0], Ops[1], 4, 12, 5, 13,
+                                                6, 14, 7, 15);
+    return true;
+  case IX86_BUILTIN_PUNPCKHWD:
+    Result = BuildVectorShuffle(Ops[0], Ops[1], 2, 6, 3, 7);
+    return true;
+  case IX86_BUILTIN_PUNPCKHDQ:
+    Result = BuildVectorShuffle(Ops[0], Ops[1], 1, 3);
+    return true;
+  case IX86_BUILTIN_PUNPCKLBW:
+    Result = BuildVectorShuffle(Ops[0], Ops[1], 0,  8, 1,  9,
+                                                2, 10, 3, 11);
+    return true;
+  case IX86_BUILTIN_PUNPCKLWD:
+    Result = BuildVectorShuffle(Ops[0], Ops[1], 0, 4, 1, 5);
+    return true;
+  case IX86_BUILTIN_PUNPCKLDQ:
+    Result = BuildVectorShuffle(Ops[0], Ops[1], 0, 2);
+    return true;
   case IX86_BUILTIN_PUNPCKHBW128:
     Result = BuildVectorShuffle(Ops[0], Ops[1],  8, 24,  9, 25,
                                                 10, 26, 11, 27,




From isanbard at gmail.com  Thu Mar 22 13:43:15 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Thu, 22 Mar 2007 13:43:15 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/README-MMX.txt
	README-SSE.txt X86ISelLowering.cpp X86InstrMMX.td
Message-ID: <200703221843.l2MIhFGE002757@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

README-MMX.txt added (r1.1)
README-SSE.txt updated: 1.15 -> 1.16
X86ISelLowering.cpp updated: 1.374 -> 1.375
X86InstrMMX.td updated: 1.21 -> 1.22
---
Log message:

Support added for shifts and unpacking MMX instructions.


---
Diffs of the changes:  (+211 -2)

 README-MMX.txt      |   59 ++++++++++++++++++++++++++++
 README-SSE.txt      |   40 +++++++++++++++++++
 X86ISelLowering.cpp |    6 ++
 X86InstrMMX.td      |  108 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 211 insertions(+), 2 deletions(-)


Index: llvm/lib/Target/X86/README-MMX.txt
diff -c /dev/null llvm/lib/Target/X86/README-MMX.txt:1.1
*** /dev/null	Thu Mar 22 13:42:55 2007
--- llvm/lib/Target/X86/README-MMX.txt	Thu Mar 22 13:42:45 2007
***************
*** 0 ****
--- 1,59 ----
+ //===---------------------------------------------------------------------===//
+ // Random ideas for the X86 backend: MMX-specific stuff.
+ //===---------------------------------------------------------------------===//
+ 
+ //===---------------------------------------------------------------------===//
+ 
+ We should compile 
+ 
+ #include <mmintrin.h>
+ 
+ extern __m64 C;
+ 
+ void baz(__v2si *A, __v2si *B)
+ {
+   *A = __builtin_ia32_psllq(*B, C);
+   _mm_empty();
+ }
+ 
+ to:
+ 
+ .globl _baz
+ _baz:
+ 	call	L3
+ "L00000000001$pb":
+ L3:
+ 	popl	%ecx
+ 	subl	$12, %esp
+ 	movl	20(%esp), %eax
+ 	movq	(%eax), %mm0
+ 	movl	L_C$non_lazy_ptr-"L00000000001$pb"(%ecx), %eax
+ 	movq	(%eax), %mm1
+ 	movl	16(%esp), %eax
+ 	psllq	%mm1, %mm0
+ 	movq	%mm0, (%eax)
+ 	emms
+ 	addl	$12, %esp
+ 	ret
+ 
+ not:
+ 
+ _baz:
+ 	subl $12, %esp
+ 	call "L1$pb"
+ "L1$pb":
+ 	popl %eax
+ 	movl L_C$non_lazy_ptr-"L1$pb"(%eax), %eax
+ 	movl (%eax), %ecx
+ 	movl %ecx, (%esp)
+ 	movl 4(%eax), %eax
+ 	movl %eax, 4(%esp)
+ 	movl 20(%esp), %eax
+ 	movq (%eax), %mm0
+ 	movq (%esp), %mm1
+ 	psllq %mm1, %mm0
+ 	movl 16(%esp), %eax
+ 	movq %mm0, (%eax)
+ 	emms
+ 	addl $12, %esp
+ 	ret


Index: llvm/lib/Target/X86/README-SSE.txt
diff -u llvm/lib/Target/X86/README-SSE.txt:1.15 llvm/lib/Target/X86/README-SSE.txt:1.16
--- llvm/lib/Target/X86/README-SSE.txt:1.15	Tue Feb 27 11:21:09 2007
+++ llvm/lib/Target/X86/README-SSE.txt	Thu Mar 22 13:42:45 2007
@@ -571,4 +571,44 @@
         movaps %xmm0, (%eax)
         ret
 
+//===---------------------------------------------------------------------===//
 
+We should compile this:
+
+#include <xmmintrin.h>
+
+void foo(__m128i *A, __m128i *B) {
+  *A = _mm_sll_epi16 (*A, *B);
+}
+
+to: 
+
+_foo:
+	subl	$12, %esp
+	movl	16(%esp), %edx
+	movl	20(%esp), %eax
+	movdqa	(%edx), %xmm1
+	movdqa	(%eax), %xmm0
+	psllw	%xmm0, %xmm1
+	movdqa	%xmm1, (%edx)
+	addl	$12, %esp
+	ret
+
+not:
+
+_foo:
+	movl 8(%esp), %eax
+	movdqa (%eax), %xmm0
+	#IMPLICIT_DEF %eax
+	pinsrw $2, %eax, %xmm0
+	xorl %ecx, %ecx
+	pinsrw $3, %ecx, %xmm0
+	pinsrw $4, %eax, %xmm0
+	pinsrw $5, %ecx, %xmm0
+	pinsrw $6, %eax, %xmm0
+	pinsrw $7, %ecx, %xmm0
+	movl 4(%esp), %eax
+	movdqa (%eax), %xmm1
+	psllw %xmm0, %xmm1
+	movdqa %xmm1, (%eax)
+	ret


Index: llvm/lib/Target/X86/X86ISelLowering.cpp
diff -u llvm/lib/Target/X86/X86ISelLowering.cpp:1.374 llvm/lib/Target/X86/X86ISelLowering.cpp:1.375
--- llvm/lib/Target/X86/X86ISelLowering.cpp:1.374	Wed Mar 21 16:51:52 2007
+++ llvm/lib/Target/X86/X86ISelLowering.cpp	Thu Mar 22 13:42:45 2007
@@ -355,6 +355,10 @@
     setOperationAction(ISD::BUILD_VECTOR,       MVT::v8i8,  Expand);
     setOperationAction(ISD::BUILD_VECTOR,       MVT::v4i16, Expand);
     setOperationAction(ISD::BUILD_VECTOR,       MVT::v2i32, Expand);
+
+    setOperationAction(ISD::VECTOR_SHUFFLE,     MVT::v8i8,  Custom);
+    setOperationAction(ISD::VECTOR_SHUFFLE,     MVT::v4i16, Custom);
+    setOperationAction(ISD::VECTOR_SHUFFLE,     MVT::v2i32, Custom);
   }
 
   if (Subtarget->hasSSE1()) {
@@ -2312,7 +2316,7 @@
   return DAG.getNode(ISD::BIT_CONVERT, MVT::v16i8, V);
 }
 
-/// LowerBuildVectorv16i8 - Custom lower build_vector of v8i16.
+/// LowerBuildVectorv8i16 - Custom lower build_vector of v8i16.
 ///
 static SDOperand LowerBuildVectorv8i16(SDOperand Op, unsigned NonZeros,
                                        unsigned NumNonZero, unsigned NumZero,


Index: llvm/lib/Target/X86/X86InstrMMX.td
diff -u llvm/lib/Target/X86/X86InstrMMX.td:1.21 llvm/lib/Target/X86/X86InstrMMX.td:1.22
--- llvm/lib/Target/X86/X86InstrMMX.td:1.21	Fri Mar 16 04:44:46 2007
+++ llvm/lib/Target/X86/X86InstrMMX.td	Thu Mar 22 13:42:45 2007
@@ -44,6 +44,10 @@
 
 def loadv2i32 : PatFrag<(ops node:$ptr), (v2i32 (load node:$ptr))>;
 
+def bc_v8i8  : PatFrag<(ops node:$in), (v8i8  (bitconvert node:$in))>;
+def bc_v4i16 : PatFrag<(ops node:$in), (v4i16 (bitconvert node:$in))>;
+def bc_v2i32 : PatFrag<(ops node:$in), (v2i32 (bitconvert node:$in))>;
+
 //===----------------------------------------------------------------------===//
 // MMX Multiclasses
 //===----------------------------------------------------------------------===//
@@ -94,13 +98,28 @@
                   [(set VR64:$dst,
                     (OpNode VR64:$src1,(loadv2i32 addr:$src2)))]>;
   }
+
+  multiclass MMXI_binop_rmi_int<bits<8> opc, bits<8> opc2, Format ImmForm,
+                                string OpcodeStr, Intrinsic IntId> {
+    def rr : MMXI<opc, MRMSrcReg, (ops VR64:$dst, VR64:$src1, VR64:$src2),
+                  !strconcat(OpcodeStr, " {$src2, $dst|$dst, $src2}"),
+                  [(set VR64:$dst, (IntId VR64:$src1, VR64:$src2))]>;
+    def rm : MMXI<opc, MRMSrcMem, (ops VR64:$dst, VR64:$src1, i64mem:$src2),
+                  !strconcat(OpcodeStr, " {$src2, $dst|$dst, $src2}"),
+                  [(set VR64:$dst, (IntId VR64:$src1,
+                                    (bitconvert (loadv2i32 addr:$src2))))]>;
+    def ri : MMXIi8<opc2, ImmForm, (ops VR64:$dst, VR64:$src1, i32i8imm:$src2),
+                    !strconcat(OpcodeStr, " {$src2, $dst|$dst, $src2}"),
+                    [(set VR64:$dst, (IntId VR64:$src1,
+                                      (scalar_to_vector (i32 imm:$src2))))]>;
+  }
 }
 
 //===----------------------------------------------------------------------===//
 // MMX EMMS Instruction
 //===----------------------------------------------------------------------===//
 
-def EMMS : MMXI<0x77, RawFrm, (ops), "emms", [(int_x86_mmx_emms)]>;
+def MMX_EMMS : MMXI<0x77, RawFrm, (ops), "emms", [(int_x86_mmx_emms)]>;
 
 //===----------------------------------------------------------------------===//
 // MMX Scalar Instructions
@@ -132,6 +151,53 @@
 defm MMX_PMULHW  : MMXI_binop_rm_int<0xE5, "pmulhw" , int_x86_mmx_pmulh_w , 1>;
 defm MMX_PMADDWD : MMXI_binop_rm_int<0xF5, "pmaddwd", int_x86_mmx_pmadd_wd, 1>;
 
+
+def MMX_UNPCKH_shuffle_mask : PatLeaf<(build_vector), [{
+  return X86::isUNPCKHMask(N);
+}]>;
+
+let isTwoAddress = 1 in {
+def MMX_PUNPCKHBWrr : MMXI<0x68, MRMSrcReg, 
+                           (ops VR64:$dst, VR64:$src1, VR64:$src2),
+                           "punpckhbw {$src2, $dst|$dst, $src2}",
+                           [(set VR64:$dst,
+                             (v8i8 (vector_shuffle VR64:$src1, VR64:$src2,
+                                    MMX_UNPCKH_shuffle_mask)))]>;
+def MMX_PUNPCKHBWrm : MMXI<0x68, MRMSrcMem, 
+                           (ops VR64:$dst, VR64:$src1, i64mem:$src2),
+                           "punpckhbw {$src2, $dst|$dst, $src2}",
+                           [(set VR64:$dst,
+                             (v8i8 (vector_shuffle VR64:$src1,
+                                    (bc_v8i8 (loadv2i32 addr:$src2)),
+                                    MMX_UNPCKH_shuffle_mask)))]>;
+def MMX_PUNPCKHWDrr : MMXI<0x69, MRMSrcReg, 
+                           (ops VR64:$dst, VR64:$src1, VR64:$src2),
+                           "punpckhwd {$src2, $dst|$dst, $src2}",
+                           [(set VR64:$dst,
+                             (v4i16 (vector_shuffle VR64:$src1, VR64:$src2,
+                                     MMX_UNPCKH_shuffle_mask)))]>;
+def MMX_PUNPCKHWDrm : MMXI<0x69, MRMSrcMem, 
+                           (ops VR64:$dst, VR64:$src1, i64mem:$src2),
+                           "punpckhwd {$src2, $dst|$dst, $src2}",
+                           [(set VR64:$dst,
+                             (v4i16 (vector_shuffle VR64:$src1,
+                                     (bc_v4i16 (loadv2i32 addr:$src2)),
+                                     MMX_UNPCKH_shuffle_mask)))]>;
+def MMX_PUNPCKHDQrr : MMXI<0x6A, MRMSrcReg, 
+                           (ops VR64:$dst, VR64:$src1, VR64:$src2),
+                           "punpckhdq {$src2, $dst|$dst, $src2}",
+                           [(set VR64:$dst,
+                             (v2i32 (vector_shuffle VR64:$src1, VR64:$src2,
+                                     MMX_UNPCKH_shuffle_mask)))]>;
+def MMX_PUNPCKHDQrm : MMXI<0x6A, MRMSrcMem,
+                           (ops VR64:$dst, VR64:$src1, i64mem:$src2),
+                           "punpckhdq {$src2, $dst|$dst, $src2}",
+                           [(set VR64:$dst,
+                             (v2i32 (vector_shuffle VR64:$src1,
+                                     (loadv2i32 addr:$src2),
+                                     MMX_UNPCKH_shuffle_mask)))]>;
+}
+
 // Logical Instructions
 defm MMX_PAND : MMXI_binop_rm_v2i32<0xDB, "pand", and, 1>;
 defm MMX_POR  : MMXI_binop_rm_v2i32<0xEB, "por" , or,  1>;
@@ -150,6 +216,26 @@
                                                   (load addr:$src2))))]>;
 }
 
+// Shift Instructions
+defm MMX_PSRLW : MMXI_binop_rmi_int<0xD1, 0x71, MRM2r, "psrlw",
+                                    int_x86_mmx_psrl_w>;
+defm MMX_PSRLD : MMXI_binop_rmi_int<0xD2, 0x72, MRM2r, "psrld",
+                                    int_x86_mmx_psrl_d>;
+defm MMX_PSRLQ : MMXI_binop_rmi_int<0xD3, 0x73, MRM2r, "psrlq",
+                                    int_x86_mmx_psrl_q>;
+
+defm MMX_PSLLW : MMXI_binop_rmi_int<0xF1, 0x71, MRM6r, "psllw",
+                                    int_x86_mmx_psll_w>;
+defm MMX_PSLLD : MMXI_binop_rmi_int<0xF2, 0x72, MRM6r, "pslld",
+                                    int_x86_mmx_psll_d>;
+defm MMX_PSLLQ : MMXI_binop_rmi_int<0xF3, 0x73, MRM6r, "psllq",
+                                    int_x86_mmx_psll_q>;
+
+defm MMX_PSRAW : MMXI_binop_rmi_int<0xE1, 0x71, MRM4r, "psraw",
+                                    int_x86_mmx_psra_w>;
+defm MMX_PSRAD : MMXI_binop_rmi_int<0xE2, 0x72, MRM4r, "psrad",
+                                    int_x86_mmx_psra_d>;
+
 // Move Instructions
 def MOVD64rr : MMXI<0x6E, MRMSrcReg, (ops VR64:$dst, GR32:$src),
                     "movd {$src, $dst|$dst, $src}", []>;
@@ -225,3 +311,23 @@
 def : Pat<(v4i16 (bitconvert (v8i8  VR64:$src))), (v4i16 VR64:$src)>;
 def : Pat<(v2i32 (bitconvert (v4i16 VR64:$src))), (v2i32 VR64:$src)>;
 def : Pat<(v2i32 (bitconvert (v8i8  VR64:$src))), (v2i32 VR64:$src)>;
+
+// Splat v2i32
+let AddedComplexity = 10 in {
+  def : Pat<(vector_shuffle (v2i32 VR64:$src), (undef),
+             MMX_UNPCKH_shuffle_mask:$sm),
+            (MMX_PUNPCKHDQrr VR64:$src, VR64:$src)>;
+}
+
+// FIXME: Temporary workaround because 2-wide shuffle is broken.
+def : Pat<(int_x86_mmx_punpckh_dq VR64:$src1, VR64:$src2),
+          (v2i32 (MMX_PUNPCKHDQrr VR64:$src1, VR64:$src2))>;
+def : Pat<(int_x86_mmx_punpckh_dq VR64:$src1, (load addr:$src2)),
+          (v2i32 (MMX_PUNPCKHDQrm VR64:$src1, addr:$src2))>;
+
+def MMX_X86s2vec : SDNode<"X86ISD::S2VEC",  SDTypeProfile<1, 1, []>, []>;
+
+// Scalar to v4i16 / v8i8. The source may be a GR32, but only the lower 8 or
+// 16-bits matter.
+def : Pat<(v4i16 (MMX_X86s2vec GR32:$src)), (MOVD64rr GR32:$src)>;
+def : Pat<(v8i8 (MMX_X86s2vec GR32:$src)), (MOVD64rr GR32:$src)>;





From isanbard at gmail.com  Thu Mar 22 13:43:15 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Thu, 22 Mar 2007 13:43:15 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/IntrinsicsX86.td
Message-ID: <200703221843.l2MIhF5B002765@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

IntrinsicsX86.td updated: 1.35 -> 1.36
---
Log message:

Support added for shifts and unpacking MMX instructions.


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

 IntrinsicsX86.td |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+)


Index: llvm/include/llvm/IntrinsicsX86.td
diff -u llvm/include/llvm/IntrinsicsX86.td:1.35 llvm/include/llvm/IntrinsicsX86.td:1.36
--- llvm/include/llvm/IntrinsicsX86.td:1.35	Thu Mar 15 16:24:36 2007
+++ llvm/include/llvm/IntrinsicsX86.td	Thu Mar 22 13:42:45 2007
@@ -585,3 +585,41 @@
               Intrinsic<[llvm_v2i32_ty, llvm_v4i16_ty,
                          llvm_v4i16_ty], [IntrNoMem]>;
 }
+
+// Integer shift ops.
+let TargetPrefix = "x86" in {  // All intrinsics start with "llvm.x86.".
+  // Shift left logical
+  def int_x86_mmx_psll_w : GCCBuiltin<"__builtin_ia32_psllw">,
+              Intrinsic<[llvm_v8i8_ty, llvm_v8i8_ty,
+                         llvm_v2i32_ty], [IntrNoMem]>;
+  def int_x86_mmx_psll_d : GCCBuiltin<"__builtin_ia32_pslld">,
+              Intrinsic<[llvm_v4i16_ty, llvm_v4i16_ty,
+                         llvm_v2i32_ty], [IntrNoMem]>;
+  def int_x86_mmx_psll_q : GCCBuiltin<"__builtin_ia32_psllq">,
+              Intrinsic<[llvm_v2i32_ty, llvm_v2i32_ty,
+                         llvm_v2i32_ty], [IntrNoMem]>;
+
+  def int_x86_mmx_psrl_w : GCCBuiltin<"__builtin_ia32_psrlw">,
+              Intrinsic<[llvm_v4i16_ty, llvm_v4i16_ty,
+                         llvm_v2i32_ty], [IntrNoMem]>;
+  def int_x86_mmx_psrl_d : GCCBuiltin<"__builtin_ia32_psrld">,
+              Intrinsic<[llvm_v2i32_ty, llvm_v2i32_ty,
+                         llvm_v2i32_ty], [IntrNoMem]>;
+  def int_x86_mmx_psrl_q : GCCBuiltin<"__builtin_ia32_psrlq">,
+              Intrinsic<[llvm_v2i32_ty,   llvm_v2i32_ty,
+                         llvm_v2i32_ty], [IntrNoMem]>;
+
+  def int_x86_mmx_psra_w : GCCBuiltin<"__builtin_ia32_psraw">,
+              Intrinsic<[llvm_v8i8_ty, llvm_v8i8_ty,
+                         llvm_v2i32_ty], [IntrNoMem]>;
+  def int_x86_mmx_psra_d : GCCBuiltin<"__builtin_ia32_psrad">,
+              Intrinsic<[llvm_v4i16_ty, llvm_v4i16_ty,
+                         llvm_v2i32_ty], [IntrNoMem]>;
+}
+
+// Vector pack/unpack ops.
+let TargetPrefix = "x86" in {  // All intrinsics start with "llvm.x86.".
+  def int_x86_mmx_punpckh_dq : GCCBuiltin<"__builtin_ia32_punpckhdq">,
+              Intrinsic<[llvm_v2i32_ty, llvm_v2i32_ty,
+                         llvm_v2i32_ty], [IntrNoMem]>;
+}





From jeffc at jolt-lang.org  Thu Mar 22 14:12:25 2007
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Thu, 22 Mar 2007 14:12:25 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/MathExtras.h
Message-ID: <200703221912.l2MJCPhw006971@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/Support:

MathExtras.h updated: 1.43 -> 1.44
---
Log message:

Be more explicit concerning argument sizes.
Use VC++ byteswap intrinsics.


---
Diffs of the changes:  (+41 -31)

 MathExtras.h |   72 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 41 insertions(+), 31 deletions(-)


Index: llvm/include/llvm/Support/MathExtras.h
diff -u llvm/include/llvm/Support/MathExtras.h:1.43 llvm/include/llvm/Support/MathExtras.h:1.44
--- llvm/include/llvm/Support/MathExtras.h:1.43	Sun Mar  4 18:00:41 2007
+++ llvm/include/llvm/Support/MathExtras.h	Thu Mar 22 14:11:57 2007
@@ -23,39 +23,39 @@
 // ambiguity.
 
 /// Hi_32 - This function returns the high 32 bits of a 64 bit value.
-inline unsigned Hi_32(uint64_t Value) {
-  return static_cast<unsigned>(Value >> 32);
+inline uint32_t Hi_32(uint64_t Value) {
+  return static_cast<uint32_t>(Value >> 32);
 }
 
 /// Lo_32 - This function returns the low 32 bits of a 64 bit value.
-inline unsigned Lo_32(uint64_t Value) {
-  return static_cast<unsigned>(Value);
+inline uint32_t Lo_32(uint64_t Value) {
+  return static_cast<uint32_t>(Value);
 }
 
 /// is?Type - these functions produce optimal testing for integer data types.
 inline bool isInt8  (int64_t Value) { 
-  return static_cast<signed char>(Value) == Value; 
+  return static_cast<int8_t>(Value) == Value; 
 }
 inline bool isUInt8 (int64_t Value) { 
-  return static_cast<unsigned char>(Value) == Value; 
+  return static_cast<uint8_t>(Value) == Value; 
 }
 inline bool isInt16 (int64_t Value) { 
-  return static_cast<signed short>(Value) == Value; 
+  return static_cast<int16_t>(Value) == Value; 
 }
 inline bool isUInt16(int64_t Value) { 
-  return static_cast<unsigned short>(Value) == Value; 
+  return static_cast<uint16_t>(Value) == Value; 
 }
 inline bool isInt32 (int64_t Value) { 
-  return static_cast<signed int>(Value) == Value; 
+  return static_cast<int32_t>(Value) == Value; 
 }
 inline bool isUInt32(int64_t Value) { 
-  return static_cast<unsigned int>(Value) == Value; 
+  return static_cast<uint32_t>(Value) == Value; 
 }
 
 /// isMask_32 - This function returns true if the argument is a sequence of ones
 /// starting at the least significant bit with the remainder zero (32 bit
 /// version).   Ex. isMask_32(0x0000FFFFU) == true.
-inline const bool isMask_32(unsigned Value) {
+inline const bool isMask_32(uint32_t Value) {
   return Value && ((Value + 1) & Value) == 0;
 }
 
@@ -69,7 +69,7 @@
 /// isShiftedMask_32 - This function returns true if the argument contains a  
 /// sequence of ones with the remainder zero (32 bit version.)
 /// Ex. isShiftedMask_32(0x0000FF00U) == true.
-inline const bool isShiftedMask_32(unsigned Value) {
+inline const bool isShiftedMask_32(uint32_t Value) {
   return isMask_32((Value - 1) | Value);
 }
 
@@ -81,7 +81,7 @@
 
 /// isPowerOf2_32 - This function returns true if the argument is a power of 
 /// two > 0. Ex. isPowerOf2_32(0x00100000U) == true (32 bit edition.)
-inline bool isPowerOf2_32(unsigned Value) {
+inline bool isPowerOf2_32(uint32_t Value) {
   return Value && !(Value & (Value - 1));
 }
 
@@ -93,22 +93,30 @@
 
 /// ByteSwap_16 - This function returns a byte-swapped representation of the
 /// 16-bit argument, Value.
-inline unsigned short ByteSwap_16(unsigned short Value) {
-  unsigned short Hi = Value << 8;
-  unsigned short Lo = Value >> 8;
+inline uint16_t ByteSwap_16(uint16_t Value) {
+#if defined(_MSC_VER) && !defined(_DEBUG)
+  // The DLL version of the runtime lacks these functions (bug!?), but in a
+  // release build they're replaced with BSWAP instructions anyway.
+  return _byteswap_ushort(Value);
+#else
+  uint16_t Hi = Value << 8;
+  uint16_t Lo = Value >> 8;
   return Hi | Lo;
+#endif
 }
 
 /// ByteSwap_32 - This function returns a byte-swapped representation of the
 /// 32-bit argument, Value.
-inline unsigned ByteSwap_32(unsigned Value) {
+inline uint32_t ByteSwap_32(uint32_t Value) {
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 	return __builtin_bswap32(Value);
+#elif defined(_MSC_VER) && !defined(_DEBUG)
+  return _byteswap_ulong(Value);
 #else
-  unsigned Byte0 = Value & 0x000000FF;
-  unsigned Byte1 = Value & 0x0000FF00;
-  unsigned Byte2 = Value & 0x00FF0000;
-  unsigned Byte3 = Value & 0xFF000000;
+  uint32_t Byte0 = Value & 0x000000FF;
+  uint32_t Byte1 = Value & 0x0000FF00;
+  uint32_t Byte2 = Value & 0x00FF0000;
+  uint32_t Byte3 = Value & 0xFF000000;
   return (Byte0 << 24) | (Byte1 << 8) | (Byte2 >> 8) | (Byte3 >> 24);
 #endif
 }
@@ -118,9 +126,11 @@
 inline uint64_t ByteSwap_64(uint64_t Value) {
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
 	return __builtin_bswap64(Value);
+#elif defined(_MSC_VER) && !defined(_DEBUG)
+  return _byteswap_uint64(Value);
 #else
-  uint64_t Hi = ByteSwap_32(unsigned(Value));
-  uint64_t Lo = ByteSwap_32(unsigned(Value >> 32));
+  uint64_t Hi = ByteSwap_32(uint32_t(Value));
+  uint32_t Lo = ByteSwap_32(uint32_t(Value >> 32));
   return (Hi << 32) | Lo;
 #endif
 }
@@ -129,7 +139,7 @@
 /// counting the number of zeros from the most significant bit to the first one
 /// bit.  Ex. CountLeadingZeros_32(0x00F000FF) == 8.
 /// Returns 32 if the word is zero.
-inline unsigned CountLeadingZeros_32(unsigned Value) {
+inline unsigned CountLeadingZeros_32(uint32_t Value) {
   unsigned Count; // result
 #if __GNUC__ >= 4
   // PowerPC is defined for __builtin_clz(0)
@@ -142,7 +152,7 @@
   Count = 0;
   // bisecton method for count leading zeros
   for (unsigned Shift = 32 >> 1; Shift; Shift >>= 1) {
-    unsigned Tmp = Value >> Shift;
+    uint32_t Tmp = Value >> Shift;
     if (Tmp) {
       Value = Tmp;
     } else {
@@ -170,7 +180,7 @@
     if (!Value) return 64;
     Count = 0;
     // bisecton method for count leading zeros
-    for (uint64_t Shift = 64 >> 1; Shift; Shift >>= 1) {
+    for (unsigned Shift = 64 >> 1; Shift; Shift >>= 1) {
       uint64_t Tmp = Value >> Shift;
       if (Tmp) {
         Value = Tmp;
@@ -180,7 +190,7 @@
     }
   } else {
     // get hi portion
-    unsigned Hi = Hi_32(Value);
+    uint32_t Hi = Hi_32(Value);
 
     // if some bits in hi portion
     if (Hi) {
@@ -188,7 +198,7 @@
         Count = CountLeadingZeros_32(Hi);
     } else {
         // get lo portion
-        unsigned Lo = Lo_32(Value);
+        uint32_t Lo = Lo_32(Value);
         // same as 32 bit value
         Count = CountLeadingZeros_32(Lo)+32;
     }
@@ -201,7 +211,7 @@
 /// counting the number of zeros from the least significant bit to the first one
 /// bit.  Ex. CountTrailingZeros_32(0xFF00FF00) == 8.
 /// Returns 32 if the word is zero.
-inline unsigned CountTrailingZeros_32(unsigned Value) {
+inline unsigned CountTrailingZeros_32(uint32_t Value) {
 #if __GNUC__ >= 4
   return Value ? __builtin_ctz(Value) : 32;
 #else
@@ -262,7 +272,7 @@
 /// Log2_32 - This function returns the floor log base 2 of the specified value, 
 /// -1 if the value is zero. (32 bit edition.)
 /// Ex. Log2_32(32) == 5, Log2_32(1) == 0, Log2_32(0) == -1, Log2_32(6) == 2
-inline unsigned Log2_32(unsigned Value) {
+inline unsigned Log2_32(uint32_t Value) {
   return 31 - CountLeadingZeros_32(Value);
 }
 
@@ -275,7 +285,7 @@
 /// Log2_32_Ceil - This function returns the ceil log base 2 of the specified
 /// value, 32 if the value is zero. (32 bit edition).
 /// Ex. Log2_32_Ceil(32) == 5, Log2_32_Ceil(1) == 0, Log2_32_Ceil(6) == 3
-inline unsigned Log2_32_Ceil(unsigned Value) {
+inline unsigned Log2_32_Ceil(uint32_t Value) {
   return 32-CountLeadingZeros_32(Value-1);
 }
 





From jeffc at jolt-lang.org  Thu Mar 22 14:13:54 2007
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Thu, 22 Mar 2007 14:13:54 -0500
Subject: [llvm-commits] CVS: llvm/win32/.cvsignore README.txt
Message-ID: <200703221913.l2MJDsOk007007@zion.cs.uiuc.edu>



Changes in directory llvm/win32:

.cvsignore updated: 1.1 -> 1.2
README.txt (r1.1) removed
---
Log message:

Cleanup obsolete stuff.

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

 .cvsignore |    2 --
 1 files changed, 2 deletions(-)


Index: llvm/win32/.cvsignore
diff -u llvm/win32/.cvsignore:1.1 llvm/win32/.cvsignore:1.2
--- llvm/win32/.cvsignore:1.1	Sat Jan 15 21:18:23 2005
+++ llvm/win32/.cvsignore	Thu Mar 22 14:13:28 2007
@@ -3,5 +3,3 @@
 llvm
 llvm.ncb
 llvm.suo
-share
-tools





From rspencer at reidspencer.com  Thu Mar 22 14:28:41 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Thu, 22 Mar 2007 12:28:41 -0700
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/MathExtras.h
In-Reply-To: <200703221912.l2MJCPhw006971@zion.cs.uiuc.edu>
References: <200703221912.l2MJCPhw006971@zion.cs.uiuc.edu>
Message-ID: <1174591721.13912.505.camel@bashful.x10sys.com>

Jeff,

On Thu, 2007-03-22 at 14:12 -0500, Jeff Cohen wrote:
> 
> Changes in directory llvm/include/llvm/Support:
> 
> MathExtras.h updated: 1.43 -> 1.44
> ---
> Log message:
> 
> Be more explicit concerning argument sizes.
> Use VC++ byteswap intrinsics.

... snip ...

> @@ -93,22 +93,30 @@
>  
>  /// ByteSwap_16 - This function returns a byte-swapped representation of the
>  /// 16-bit argument, Value.
> -inline unsigned short ByteSwap_16(unsigned short Value) {
> -  unsigned short Hi = Value << 8;
> -  unsigned short Lo = Value >> 8;
> +inline uint16_t ByteSwap_16(uint16_t Value) {
> +#if defined(_MSC_VER) && !defined(_DEBUG)
> +  // The DLL version of the runtime lacks these functions (bug!?), but in a
> +  // release build they're replaced with BSWAP instructions anyway.
> +  return _byteswap_ushort(Value);
> +#else
> +  uint16_t Hi = Value << 8;
> +  uint16_t Lo = Value >> 8;
>    return Hi | Lo;
> +#endif
>  }

Pedantically, such an ifdef is not allowed to occur in this header file.
It can only occur in lib/System. LLVM is supposed to be platform/machine
agnostic everywhere except lib/System. Is there a real advantage to
using _byteswap_ushort? Seems to me that the function call overhead
would negate any speed advantage. Is this thing inline? I would prefer
that we just leave the code as is. If you really feel its necessary to
do this for release versions, please create an inline function in
lib/System that works for all platforms.

>  
>  /// ByteSwap_32 - This function returns a byte-swapped representation of the
>  /// 32-bit argument, Value.
> -inline unsigned ByteSwap_32(unsigned Value) {
> +inline uint32_t ByteSwap_32(uint32_t Value) {
The type change is fine, but ..
>  #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
>  	return __builtin_bswap32(Value);
> +#elif defined(_MSC_VER) && !defined(_DEBUG)
> +  return _byteswap_ulong(Value);
I really don't like this unless you put this in lib/System.
>  #else
> -  unsigned Byte0 = Value & 0x000000FF;
> -  unsigned Byte1 = Value & 0x0000FF00;
> -  unsigned Byte2 = Value & 0x00FF0000;
> -  unsigned Byte3 = Value & 0xFF000000;
> +  uint32_t Byte0 = Value & 0x000000FF;
> +  uint32_t Byte1 = Value & 0x0000FF00;
> +  uint32_t Byte2 = Value & 0x00FF0000;
> +  uint32_t Byte3 = Value & 0xFF000000;
>    return (Byte0 << 24) | (Byte1 << 8) | (Byte2 >> 8) | (Byte3 >> 24);
>  #endif
>  }
> @@ -118,9 +126,11 @@
>  inline uint64_t ByteSwap_64(uint64_t Value) {
>  #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
>  	return __builtin_bswap64(Value);
> +#elif defined(_MSC_VER) && !defined(_DEBUG)
> +  return _byteswap_uint64(Value);

Same deal.

>  #else
> -  uint64_t Hi = ByteSwap_32(unsigned(Value));
> -  uint64_t Lo = ByteSwap_32(unsigned(Value >> 32));
> +  uint64_t Hi = ByteSwap_32(uint32_t(Value));
> +  uint32_t Lo = ByteSwap_32(uint32_t(Value >> 32));
>    return (Hi << 32) | Lo;
>  #endif
>  }
> @@ -129,7 +139,7 @@
>  /// counting the number of zeros from the most significant bit to the first one
>  /// bit.  Ex. CountLeadingZeros_32(0x00F000FF) == 8.
>  /// Returns 32 if the word is zero.
> -inline unsigned CountLeadingZeros_32(unsigned Value) {
> +inline unsigned CountLeadingZeros_32(uint32_t Value) {
>    unsigned Count; // result
>  #if __GNUC__ >= 4
>    // PowerPC is defined for __builtin_clz(0)
> @@ -142,7 +152,7 @@
>    Count = 0;
>    // bisecton method for count leading zeros
>    for (unsigned Shift = 32 >> 1; Shift; Shift >>= 1) {

Why not uint32_t for Shift?

> -    unsigned Tmp = Value >> Shift;
> +    uint32_t Tmp = Value >> Shift;
>      if (Tmp) {
>        Value = Tmp;
>      } else {
> @@ -170,7 +180,7 @@
>      if (!Value) return 64;
>      Count = 0;
>      // bisecton method for count leading zeros
> -    for (uint64_t Shift = 64 >> 1; Shift; Shift >>= 1) {
> +    for (unsigned Shift = 64 >> 1; Shift; Shift >>= 1) {

Why not uint32_t? For conformity with the rest of your changes?

>        uint64_t Tmp = Value >> Shift;
>        if (Tmp) {
>          Value = Tmp;
> @@ -180,7 +190,7 @@
>      }
>    } else {
>      // get hi portion
> -    unsigned Hi = Hi_32(Value);
> +    uint32_t Hi = Hi_32(Value);
>  
>      // if some bits in hi portion
>      if (Hi) {
> @@ -188,7 +198,7 @@
>          Count = CountLeadingZeros_32(Hi);
>      } else {
>          // get lo portion
> -        unsigned Lo = Lo_32(Value);
> +        uint32_t Lo = Lo_32(Value);
>          // same as 32 bit value
>          Count = CountLeadingZeros_32(Lo)+32;
>      }
> @@ -201,7 +211,7 @@
>  /// counting the number of zeros from the least significant bit to the first one
>  /// bit.  Ex. CountTrailingZeros_32(0xFF00FF00) == 8.
>  /// Returns 32 if the word is zero.
> -inline unsigned CountTrailingZeros_32(unsigned Value) {
> +inline unsigned CountTrailingZeros_32(uint32_t Value) {
>  #if __GNUC__ >= 4
>    return Value ? __builtin_ctz(Value) : 32;
>  #else
> @@ -262,7 +272,7 @@
>  /// Log2_32 - This function returns the floor log base 2 of the specified value, 
>  /// -1 if the value is zero. (32 bit edition.)
>  /// Ex. Log2_32(32) == 5, Log2_32(1) == 0, Log2_32(0) == -1, Log2_32(6) == 2
> -inline unsigned Log2_32(unsigned Value) {
> +inline unsigned Log2_32(uint32_t Value) {
>    return 31 - CountLeadingZeros_32(Value);
>  }
>  
> @@ -275,7 +285,7 @@
>  /// Log2_32_Ceil - This function returns the ceil log base 2 of the specified
>  /// value, 32 if the value is zero. (32 bit edition).
>  /// Ex. Log2_32_Ceil(32) == 5, Log2_32_Ceil(1) == 0, Log2_32_Ceil(6) == 3
> -inline unsigned Log2_32_Ceil(unsigned Value) {
> +inline unsigned Log2_32_Ceil(uint32_t Value) {
>    return 32-CountLeadingZeros_32(Value-1);
>  }

Reid.



From jeffc at jolt-lang.org  Thu Mar 22 14:35:47 2007
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Thu, 22 Mar 2007 12:35:47 -0700
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/MathExtras.h
In-Reply-To: <1174591721.13912.505.camel@bashful.x10sys.com>
References: <200703221912.l2MJCPhw006971@zion.cs.uiuc.edu>
	<1174591721.13912.505.camel@bashful.x10sys.com>
Message-ID: <4602DA93.5090909@jolt-lang.org>

How is it any worse than checking for GCC?

It's treated as an intrinsic when optimizations are enable.  It directly 
generates a bswap instruction.  Same as the conditional code for GCC.

Reid Spencer wrote:
> Jeff,
>
> On Thu, 2007-03-22 at 14:12 -0500, Jeff Cohen wrote:
>   
>> Changes in directory llvm/include/llvm/Support:
>>
>> MathExtras.h updated: 1.43 -> 1.44
>> ---
>> Log message:
>>
>> Be more explicit concerning argument sizes.
>> Use VC++ byteswap intrinsics.
>>     
>
> ... snip ...
>
>   
>> @@ -93,22 +93,30 @@
>>  
>>  /// ByteSwap_16 - This function returns a byte-swapped representation of the
>>  /// 16-bit argument, Value.
>> -inline unsigned short ByteSwap_16(unsigned short Value) {
>> -  unsigned short Hi = Value << 8;
>> -  unsigned short Lo = Value >> 8;
>> +inline uint16_t ByteSwap_16(uint16_t Value) {
>> +#if defined(_MSC_VER) && !defined(_DEBUG)
>> +  // The DLL version of the runtime lacks these functions (bug!?), but in a
>> +  // release build they're replaced with BSWAP instructions anyway.
>> +  return _byteswap_ushort(Value);
>> +#else
>> +  uint16_t Hi = Value << 8;
>> +  uint16_t Lo = Value >> 8;
>>    return Hi | Lo;
>> +#endif
>>  }
>>     
>
> Pedantically, such an ifdef is not allowed to occur in this header file.
> It can only occur in lib/System. LLVM is supposed to be platform/machine
> agnostic everywhere except lib/System. Is there a real advantage to
> using _byteswap_ushort? Seems to me that the function call overhead
> would negate any speed advantage. Is this thing inline? I would prefer
> that we just leave the code as is. If you really feel its necessary to
> do this for release versions, please create an inline function in
> lib/System that works for all platforms.
>
>   
>>  
>>  /// ByteSwap_32 - This function returns a byte-swapped representation of the
>>  /// 32-bit argument, Value.
>> -inline unsigned ByteSwap_32(unsigned Value) {
>> +inline uint32_t ByteSwap_32(uint32_t Value) {
>>     
> The type change is fine, but ..
>   
>>  #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
>>  	return __builtin_bswap32(Value);
>> +#elif defined(_MSC_VER) && !defined(_DEBUG)
>> +  return _byteswap_ulong(Value);
>>     
> I really don't like this unless you put this in lib/System.
>   
>>  #else
>> -  unsigned Byte0 = Value & 0x000000FF;
>> -  unsigned Byte1 = Value & 0x0000FF00;
>> -  unsigned Byte2 = Value & 0x00FF0000;
>> -  unsigned Byte3 = Value & 0xFF000000;
>> +  uint32_t Byte0 = Value & 0x000000FF;
>> +  uint32_t Byte1 = Value & 0x0000FF00;
>> +  uint32_t Byte2 = Value & 0x00FF0000;
>> +  uint32_t Byte3 = Value & 0xFF000000;
>>    return (Byte0 << 24) | (Byte1 << 8) | (Byte2 >> 8) | (Byte3 >> 24);
>>  #endif
>>  }
>> @@ -118,9 +126,11 @@
>>  inline uint64_t ByteSwap_64(uint64_t Value) {
>>  #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
>>  	return __builtin_bswap64(Value);
>> +#elif defined(_MSC_VER) && !defined(_DEBUG)
>> +  return _byteswap_uint64(Value);
>>     
>
> Same deal.
>
>   
>>  #else
>> -  uint64_t Hi = ByteSwap_32(unsigned(Value));
>> -  uint64_t Lo = ByteSwap_32(unsigned(Value >> 32));
>> +  uint64_t Hi = ByteSwap_32(uint32_t(Value));
>> +  uint32_t Lo = ByteSwap_32(uint32_t(Value >> 32));
>>    return (Hi << 32) | Lo;
>>  #endif
>>  }
>> @@ -129,7 +139,7 @@
>>  /// counting the number of zeros from the most significant bit to the first one
>>  /// bit.  Ex. CountLeadingZeros_32(0x00F000FF) == 8.
>>  /// Returns 32 if the word is zero.
>> -inline unsigned CountLeadingZeros_32(unsigned Value) {
>> +inline unsigned CountLeadingZeros_32(uint32_t Value) {
>>    unsigned Count; // result
>>  #if __GNUC__ >= 4
>>    // PowerPC is defined for __builtin_clz(0)
>> @@ -142,7 +152,7 @@
>>    Count = 0;
>>    // bisecton method for count leading zeros
>>    for (unsigned Shift = 32 >> 1; Shift; Shift >>= 1) {
>>     
>
> Why not uint32_t for Shift?
>
>   
>> -    unsigned Tmp = Value >> Shift;
>> +    uint32_t Tmp = Value >> Shift;
>>      if (Tmp) {
>>        Value = Tmp;
>>      } else {
>> @@ -170,7 +180,7 @@
>>      if (!Value) return 64;
>>      Count = 0;
>>      // bisecton method for count leading zeros
>> -    for (uint64_t Shift = 64 >> 1; Shift; Shift >>= 1) {
>> +    for (unsigned Shift = 64 >> 1; Shift; Shift >>= 1) {
>>     
>
> Why not uint32_t? For conformity with the rest of your changes?
>
>   
>>        uint64_t Tmp = Value >> Shift;
>>        if (Tmp) {
>>          Value = Tmp;
>> @@ -180,7 +190,7 @@
>>      }
>>    } else {
>>      // get hi portion
>> -    unsigned Hi = Hi_32(Value);
>> +    uint32_t Hi = Hi_32(Value);
>>  
>>      // if some bits in hi portion
>>      if (Hi) {
>> @@ -188,7 +198,7 @@
>>          Count = CountLeadingZeros_32(Hi);
>>      } else {
>>          // get lo portion
>> -        unsigned Lo = Lo_32(Value);
>> +        uint32_t Lo = Lo_32(Value);
>>          // same as 32 bit value
>>          Count = CountLeadingZeros_32(Lo)+32;
>>      }
>> @@ -201,7 +211,7 @@
>>  /// counting the number of zeros from the least significant bit to the first one
>>  /// bit.  Ex. CountTrailingZeros_32(0xFF00FF00) == 8.
>>  /// Returns 32 if the word is zero.
>> -inline unsigned CountTrailingZeros_32(unsigned Value) {
>> +inline unsigned CountTrailingZeros_32(uint32_t Value) {
>>  #if __GNUC__ >= 4
>>    return Value ? __builtin_ctz(Value) : 32;
>>  #else
>> @@ -262,7 +272,7 @@
>>  /// Log2_32 - This function returns the floor log base 2 of the specified value, 
>>  /// -1 if the value is zero. (32 bit edition.)
>>  /// Ex. Log2_32(32) == 5, Log2_32(1) == 0, Log2_32(0) == -1, Log2_32(6) == 2
>> -inline unsigned Log2_32(unsigned Value) {
>> +inline unsigned Log2_32(uint32_t Value) {
>>    return 31 - CountLeadingZeros_32(Value);
>>  }
>>  
>> @@ -275,7 +285,7 @@
>>  /// Log2_32_Ceil - This function returns the ceil log base 2 of the specified
>>  /// value, 32 if the value is zero. (32 bit edition).
>>  /// Ex. Log2_32_Ceil(32) == 5, Log2_32_Ceil(1) == 0, Log2_32_Ceil(6) == 3
>> -inline unsigned Log2_32_Ceil(unsigned Value) {
>> +inline unsigned Log2_32_Ceil(uint32_t Value) {
>>    return 32-CountLeadingZeros_32(Value-1);
>>  }
>>     
>
> Reid.
>
>
>
>
>   



From jeffc at jolt-lang.org  Thu Mar 22 14:45:01 2007
From: jeffc at jolt-lang.org (Jeff Cohen)
Date: Thu, 22 Mar 2007 12:45:01 -0700
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/MathExtras.h
In-Reply-To: <1174591721.13912.505.camel@bashful.x10sys.com>
References: <200703221912.l2MJCPhw006971@zion.cs.uiuc.edu>
	<1174591721.13912.505.camel@bashful.x10sys.com>
Message-ID: <4602DCBD.8000407@jolt-lang.org>

Reid Spencer wrote:
>
>> -    for (uint64_t Shift = 64 >> 1; Shift; Shift >>= 1) {
>> +    for (unsigned Shift = 64 >> 1; Shift; Shift >>= 1) {
>>     
>
> Why not uint32_t? For conformity with the rest of your changes?

The size of a shift amount is unrelated to the size of the function's 
argument, so there's no reason not to use the "natural" integer size.



From rspencer at reidspencer.com  Thu Mar 22 15:18:06 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Thu, 22 Mar 2007 13:18:06 -0700
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/MathExtras.h
In-Reply-To: <4602DA93.5090909@jolt-lang.org>
References: <200703221912.l2MJCPhw006971@zion.cs.uiuc.edu>
	<1174591721.13912.505.camel@bashful.x10sys.com>
	<4602DA93.5090909@jolt-lang.org>
Message-ID: <1174594686.13912.519.camel@bashful.x10sys.com>

On Thu, 2007-03-22 at 12:35 -0700, Jeff Cohen wrote:
> How is it any worse than checking for GCC?

I don't like that either :)

> 
> It's treated as an intrinsic when optimizations are enable.  It directly 
> generates a bswap instruction.  Same as the conditional code for GCC.

Okay, sounds like its worth providing this.

> 
> Reid Spencer wrote:
> > Jeff,
> >
> > On Thu, 2007-03-22 at 14:12 -0500, Jeff Cohen wrote:
> >   
> >> Changes in directory llvm/include/llvm/Support:
> >>
> >> MathExtras.h updated: 1.43 -> 1.44
> >> ---
> >> Log message:
> >>
> >> Be more explicit concerning argument sizes.
> >> Use VC++ byteswap intrinsics.
> >>     
> >
> > ... snip ...
> >
> >   
> >> @@ -93,22 +93,30 @@
> >>  
> >>  /// ByteSwap_16 - This function returns a byte-swapped representation of the
> >>  /// 16-bit argument, Value.
> >> -inline unsigned short ByteSwap_16(unsigned short Value) {
> >> -  unsigned short Hi = Value << 8;
> >> -  unsigned short Lo = Value >> 8;
> >> +inline uint16_t ByteSwap_16(uint16_t Value) {
> >> +#if defined(_MSC_VER) && !defined(_DEBUG)
> >> +  // The DLL version of the runtime lacks these functions (bug!?), but in a
> >> +  // release build they're replaced with BSWAP instructions anyway.
> >> +  return _byteswap_ushort(Value);
> >> +#else
> >> +  uint16_t Hi = Value << 8;
> >> +  uint16_t Lo = Value >> 8;
> >>    return Hi | Lo;
> >> +#endif
> >>  }
> >>     
> >
> > Pedantically, such an ifdef is not allowed to occur in this header file.
> > It can only occur in lib/System. LLVM is supposed to be platform/machine
> > agnostic everywhere except lib/System. Is there a real advantage to
> > using _byteswap_ushort? Seems to me that the function call overhead
> > would negate any speed advantage. Is this thing inline? I would prefer
> > that we just leave the code as is. If you really feel its necessary to
> > do this for release versions, please create an inline function in
> > lib/System that works for all platforms.
> >
> >   
> >>  
> >>  /// ByteSwap_32 - This function returns a byte-swapped representation of the
> >>  /// 32-bit argument, Value.
> >> -inline unsigned ByteSwap_32(unsigned Value) {
> >> +inline uint32_t ByteSwap_32(uint32_t Value) {
> >>     
> > The type change is fine, but ..
> >   
> >>  #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
> >>  	return __builtin_bswap32(Value);
> >> +#elif defined(_MSC_VER) && !defined(_DEBUG)
> >> +  return _byteswap_ulong(Value);
> >>     
> > I really don't like this unless you put this in lib/System.
> >   
> >>  #else
> >> -  unsigned Byte0 = Value & 0x000000FF;
> >> -  unsigned Byte1 = Value & 0x0000FF00;
> >> -  unsigned Byte2 = Value & 0x00FF0000;
> >> -  unsigned Byte3 = Value & 0xFF000000;
> >> +  uint32_t Byte0 = Value & 0x000000FF;
> >> +  uint32_t Byte1 = Value & 0x0000FF00;
> >> +  uint32_t Byte2 = Value & 0x00FF0000;
> >> +  uint32_t Byte3 = Value & 0xFF000000;
> >>    return (Byte0 << 24) | (Byte1 << 8) | (Byte2 >> 8) | (Byte3 >> 24);
> >>  #endif
> >>  }
> >> @@ -118,9 +126,11 @@
> >>  inline uint64_t ByteSwap_64(uint64_t Value) {
> >>  #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
> >>  	return __builtin_bswap64(Value);
> >> +#elif defined(_MSC_VER) && !defined(_DEBUG)
> >> +  return _byteswap_uint64(Value);
> >>     
> >
> > Same deal.
> >
> >   
> >>  #else
> >> -  uint64_t Hi = ByteSwap_32(unsigned(Value));
> >> -  uint64_t Lo = ByteSwap_32(unsigned(Value >> 32));
> >> +  uint64_t Hi = ByteSwap_32(uint32_t(Value));
> >> +  uint32_t Lo = ByteSwap_32(uint32_t(Value >> 32));
> >>    return (Hi << 32) | Lo;
> >>  #endif
> >>  }
> >> @@ -129,7 +139,7 @@
> >>  /// counting the number of zeros from the most significant bit to the first one
> >>  /// bit.  Ex. CountLeadingZeros_32(0x00F000FF) == 8.
> >>  /// Returns 32 if the word is zero.
> >> -inline unsigned CountLeadingZeros_32(unsigned Value) {
> >> +inline unsigned CountLeadingZeros_32(uint32_t Value) {
> >>    unsigned Count; // result
> >>  #if __GNUC__ >= 4
> >>    // PowerPC is defined for __builtin_clz(0)
> >> @@ -142,7 +152,7 @@
> >>    Count = 0;
> >>    // bisecton method for count leading zeros
> >>    for (unsigned Shift = 32 >> 1; Shift; Shift >>= 1) {
> >>     
> >
> > Why not uint32_t for Shift?
> >
> >   
> >> -    unsigned Tmp = Value >> Shift;
> >> +    uint32_t Tmp = Value >> Shift;
> >>      if (Tmp) {
> >>        Value = Tmp;
> >>      } else {
> >> @@ -170,7 +180,7 @@
> >>      if (!Value) return 64;
> >>      Count = 0;
> >>      // bisecton method for count leading zeros
> >> -    for (uint64_t Shift = 64 >> 1; Shift; Shift >>= 1) {
> >> +    for (unsigned Shift = 64 >> 1; Shift; Shift >>= 1) {
> >>     
> >
> > Why not uint32_t? For conformity with the rest of your changes?
> >
> >   
> >>        uint64_t Tmp = Value >> Shift;
> >>        if (Tmp) {
> >>          Value = Tmp;
> >> @@ -180,7 +190,7 @@
> >>      }
> >>    } else {
> >>      // get hi portion
> >> -    unsigned Hi = Hi_32(Value);
> >> +    uint32_t Hi = Hi_32(Value);
> >>  
> >>      // if some bits in hi portion
> >>      if (Hi) {
> >> @@ -188,7 +198,7 @@
> >>          Count = CountLeadingZeros_32(Hi);
> >>      } else {
> >>          // get lo portion
> >> -        unsigned Lo = Lo_32(Value);
> >> +        uint32_t Lo = Lo_32(Value);
> >>          // same as 32 bit value
> >>          Count = CountLeadingZeros_32(Lo)+32;
> >>      }
> >> @@ -201,7 +211,7 @@
> >>  /// counting the number of zeros from the least significant bit to the first one
> >>  /// bit.  Ex. CountTrailingZeros_32(0xFF00FF00) == 8.
> >>  /// Returns 32 if the word is zero.
> >> -inline unsigned CountTrailingZeros_32(unsigned Value) {
> >> +inline unsigned CountTrailingZeros_32(uint32_t Value) {
> >>  #if __GNUC__ >= 4
> >>    return Value ? __builtin_ctz(Value) : 32;
> >>  #else
> >> @@ -262,7 +272,7 @@
> >>  /// Log2_32 - This function returns the floor log base 2 of the specified value, 
> >>  /// -1 if the value is zero. (32 bit edition.)
> >>  /// Ex. Log2_32(32) == 5, Log2_32(1) == 0, Log2_32(0) == -1, Log2_32(6) == 2
> >> -inline unsigned Log2_32(unsigned Value) {
> >> +inline unsigned Log2_32(uint32_t Value) {
> >>    return 31 - CountLeadingZeros_32(Value);
> >>  }
> >>  
> >> @@ -275,7 +285,7 @@
> >>  /// Log2_32_Ceil - This function returns the ceil log base 2 of the specified
> >>  /// value, 32 if the value is zero. (32 bit edition).
> >>  /// Ex. Log2_32_Ceil(32) == 5, Log2_32_Ceil(1) == 0, Log2_32_Ceil(6) == 3
> >> -inline unsigned Log2_32_Ceil(unsigned Value) {
> >> +inline unsigned Log2_32_Ceil(uint32_t Value) {
> >>    return 32-CountLeadingZeros_32(Value-1);
> >>  }
> >>     
> >
> > Reid.
> >
> >
> >
> >
> >   
> 



From isanbard at gmail.com  Thu Mar 22 15:29:51 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Thu, 22 Mar 2007 15:29:51 -0500
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86InstrMMX.td
Message-ID: <200703222029.l2MKTpo8011001@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Target/X86:

X86InstrMMX.td updated: 1.22 -> 1.23
---
Log message:

We generate a shufflevector instruction, so we don't need the builtin
intrinsic.


---
Diffs of the changes:  (+13 -6)

 X86InstrMMX.td |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)


Index: llvm/lib/Target/X86/X86InstrMMX.td
diff -u llvm/lib/Target/X86/X86InstrMMX.td:1.22 llvm/lib/Target/X86/X86InstrMMX.td:1.23
--- llvm/lib/Target/X86/X86InstrMMX.td:1.22	Thu Mar 22 13:42:45 2007
+++ llvm/lib/Target/X86/X86InstrMMX.td	Thu Mar 22 15:29:26 2007
@@ -152,6 +152,16 @@
 defm MMX_PMADDWD : MMXI_binop_rm_int<0xF5, "pmaddwd", int_x86_mmx_pmadd_wd, 1>;
 
 
+// MMX_SHUFFLE_get_shuf_imm xform function: convert vector_shuffle mask to
+// MMX_PSHUF*, MMX_SHUFP* etc. imm.
+def MMX_SHUFFLE_get_shuf_imm : SDNodeXForm<build_vector, [{
+  return getI8Imm(X86::getShuffleSHUFImmediate(N));
+}]>;
+
+def MMX_splat_mask : PatLeaf<(build_vector), [{
+  return X86::isSplatMask(N);
+}], MMX_SHUFFLE_get_shuf_imm>;
+
 def MMX_UNPCKH_shuffle_mask : PatLeaf<(build_vector), [{
   return X86::isUNPCKHMask(N);
 }]>;
@@ -315,16 +325,13 @@
 // Splat v2i32
 let AddedComplexity = 10 in {
   def : Pat<(vector_shuffle (v2i32 VR64:$src), (undef),
+             MMX_splat_mask:$sm),
+            (MMX_PUNPCKHDQrr VR64:$src, VR64:$src)>;
+  def : Pat<(vector_shuffle (v2i32 VR64:$src), (undef),
              MMX_UNPCKH_shuffle_mask:$sm),
             (MMX_PUNPCKHDQrr VR64:$src, VR64:$src)>;
 }
 
-// FIXME: Temporary workaround because 2-wide shuffle is broken.
-def : Pat<(int_x86_mmx_punpckh_dq VR64:$src1, VR64:$src2),
-          (v2i32 (MMX_PUNPCKHDQrr VR64:$src1, VR64:$src2))>;
-def : Pat<(int_x86_mmx_punpckh_dq VR64:$src1, (load addr:$src2)),
-          (v2i32 (MMX_PUNPCKHDQrm VR64:$src1, addr:$src2))>;
-
 def MMX_X86s2vec : SDNode<"X86ISD::S2VEC",  SDTypeProfile<1, 1, []>, []>;
 
 // Scalar to v4i16 / v8i8. The source may be a GR32, but only the lower 8 or





From isanbard at gmail.com  Thu Mar 22 15:29:51 2007
From: isanbard at gmail.com (Bill Wendling)
Date: Thu, 22 Mar 2007 15:29:51 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/IntrinsicsX86.td
Message-ID: <200703222029.l2MKTpY8011000@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

IntrinsicsX86.td updated: 1.36 -> 1.37
---
Log message:

We generate a shufflevector instruction, so we don't need the builtin
intrinsic.


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

 IntrinsicsX86.td |    7 -------
 1 files changed, 7 deletions(-)


Index: llvm/include/llvm/IntrinsicsX86.td
diff -u llvm/include/llvm/IntrinsicsX86.td:1.36 llvm/include/llvm/IntrinsicsX86.td:1.37
--- llvm/include/llvm/IntrinsicsX86.td:1.36	Thu Mar 22 13:42:45 2007
+++ llvm/include/llvm/IntrinsicsX86.td	Thu Mar 22 15:29:26 2007
@@ -616,10 +616,3 @@
               Intrinsic<[llvm_v4i16_ty, llvm_v4i16_ty,
                          llvm_v2i32_ty], [IntrNoMem]>;
 }
-
-// Vector pack/unpack ops.
-let TargetPrefix = "x86" in {  // All intrinsics start with "llvm.x86.".
-  def int_x86_mmx_punpckh_dq : GCCBuiltin<"__builtin_ia32_punpckhdq">,
-              Intrinsic<[llvm_v2i32_ty, llvm_v2i32_ty,
-                         llvm_v2i32_ty], [IntrNoMem]>;
-}





From reid at x10sys.com  Thu Mar 22 15:36:23 2007
From: reid at x10sys.com (Reid Spencer)
Date: Thu, 22 Mar 2007 15:36:23 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703222036.l2MKaNuY011113@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.672 -> 1.673
---
Log message:

For PR1205: http://llvm.org/PR1205 :
* Re-enable the APInt version of MaskedValueIsZero.
* APIntify the Comput{Un}SignedMinMaxValuesFromKnownBits functions
* APIntify visitICmpInst.


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

 InstructionCombining.cpp |  126 +++++++++++++++++++++++------------------------
 1 files changed, 63 insertions(+), 63 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.672 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.673
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.672	Thu Mar 22 11:38:57 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Thu Mar 22 15:36:03 2007
@@ -992,7 +992,6 @@
   return (KnownZero & Mask) == Mask;
 }
 
-#if 0
 /// MaskedValueIsZero - Return true if 'V & Mask' is known to be zero.  We use
 /// this predicate to simplify operations downstream.  Mask is known to be zero
 /// for bits that V cannot have.
@@ -1002,7 +1001,6 @@
   assert((KnownZero & KnownOne) == 0 && "Bits known to be one AND zero?"); 
   return (KnownZero & Mask) == Mask;
 }
-#endif
 
 /// ShrinkDemandedConstant - Check to see if the specified operand of the 
 /// specified instruction is a constant integer.  If so, check to see if there
@@ -1052,28 +1050,28 @@
 // could have the specified known zero and known one bits, returning them in
 // min/max.
 static void ComputeSignedMinMaxValuesFromKnownBits(const Type *Ty,
-                                                   uint64_t KnownZero,
-                                                   uint64_t KnownOne,
-                                                   int64_t &Min, int64_t &Max) {
-  uint64_t TypeBits = cast<IntegerType>(Ty)->getBitMask();
-  uint64_t UnknownBits = ~(KnownZero|KnownOne) & TypeBits;
+                                                   const APInt& KnownZero,
+                                                   const APInt& KnownOne,
+                                                   APInt& Min, APInt& Max) {
+  uint32_t BitWidth = cast<IntegerType>(Ty)->getBitWidth();
+  assert(KnownZero.getBitWidth() == BitWidth && 
+         KnownOne.getBitWidth() == BitWidth &&
+         Min.getBitWidth() == BitWidth && Max.getBitWidth() == BitWidth &&
+         "Ty, KnownZero, KnownOne and Min, Max must have equal bitwidth.");
+  APInt TypeBits(APInt::getAllOnesValue(BitWidth));
+  APInt UnknownBits = ~(KnownZero|KnownOne) & TypeBits;
 
-  uint64_t SignBit = 1ULL << (Ty->getPrimitiveSizeInBits()-1);
+  APInt SignBit(APInt::getSignBit(BitWidth));
   
   // The minimum value is when all unknown bits are zeros, EXCEPT for the sign
   // bit if it is unknown.
   Min = KnownOne;
   Max = KnownOne|UnknownBits;
   
-  if (SignBit & UnknownBits) { // Sign bit is unknown
+  if ((SignBit & UnknownBits) != 0) { // Sign bit is unknown
     Min |= SignBit;
     Max &= ~SignBit;
   }
-  
-  // Sign extend the min/max values.
-  int ShAmt = 64-Ty->getPrimitiveSizeInBits();
-  Min = (Min << ShAmt) >> ShAmt;
-  Max = (Max << ShAmt) >> ShAmt;
 }
 
 // ComputeUnsignedMinMaxValuesFromKnownBits - Given an unsigned integer type and
@@ -1081,12 +1079,17 @@
 // could have the specified known zero and known one bits, returning them in
 // min/max.
 static void ComputeUnsignedMinMaxValuesFromKnownBits(const Type *Ty,
-                                                     uint64_t KnownZero,
-                                                     uint64_t KnownOne,
-                                                     uint64_t &Min,
-                                                     uint64_t &Max) {
-  uint64_t TypeBits = cast<IntegerType>(Ty)->getBitMask();
-  uint64_t UnknownBits = ~(KnownZero|KnownOne) & TypeBits;
+                                                     const APInt& KnownZero,
+                                                     const APInt& KnownOne,
+                                                     APInt& Min,
+                                                     APInt& Max) {
+  uint32_t BitWidth = cast<IntegerType>(Ty)->getBitWidth();
+  assert(KnownZero.getBitWidth() == BitWidth && 
+         KnownOne.getBitWidth() == BitWidth &&
+         Min.getBitWidth() == BitWidth && Max.getBitWidth() &&
+         "Ty, KnownZero, KnownOne and Min, Max must have equal bitwidth.");
+  APInt TypeBits(APInt::getAllOnesValue(BitWidth));
+  APInt UnknownBits = ~(KnownZero|KnownOne) & TypeBits;
   
   // The minimum value is when the unknown bits are all zeros.
   Min = KnownOne;
@@ -1094,7 +1097,6 @@
   Max = KnownOne|UnknownBits;
 }
 
-
 /// SimplifyDemandedBits - Look at V.  At this point, we know that only the
 /// DemandedMask bits of the result of V are ever used downstream.  If we can
 /// use this information to simplify V, do so and return true.  Otherwise,
@@ -5377,59 +5379,57 @@
     
     // See if we can fold the comparison based on bits known to be zero or one
     // in the input.
-    uint64_t KnownZero, KnownOne;
-    if (SimplifyDemandedBits(Op0, cast<IntegerType>(Ty)->getBitMask(),
+    uint32_t BitWidth = cast<IntegerType>(Ty)->getBitWidth();
+    APInt KnownZero(BitWidth, 0), KnownOne(BitWidth, 0);
+    if (SimplifyDemandedBits(Op0, APInt::getAllOnesValue(BitWidth),
                              KnownZero, KnownOne, 0))
       return &I;
         
     // Given the known and unknown bits, compute a range that the LHS could be
     // in.
-    if (KnownOne | KnownZero) {
+    if ((KnownOne | KnownZero) != 0) {
       // Compute the Min, Max and RHS values based on the known bits. For the
       // EQ and NE we use unsigned values.
-      uint64_t UMin = 0, UMax = 0, URHSVal = 0;
-      int64_t SMin = 0, SMax = 0, SRHSVal = 0;
+      APInt Min(BitWidth, 0), Max(BitWidth, 0), RHSVal(CI->getValue());
       if (ICmpInst::isSignedPredicate(I.getPredicate())) {
-        SRHSVal = CI->getSExtValue();
-        ComputeSignedMinMaxValuesFromKnownBits(Ty, KnownZero, KnownOne, SMin, 
-                                               SMax);
+        ComputeSignedMinMaxValuesFromKnownBits(Ty, KnownZero, KnownOne, Min, 
+                                               Max);
       } else {
-        URHSVal = CI->getZExtValue();
-        ComputeUnsignedMinMaxValuesFromKnownBits(Ty, KnownZero, KnownOne, UMin, 
-                                                 UMax);
+        ComputeUnsignedMinMaxValuesFromKnownBits(Ty, KnownZero, KnownOne, Min, 
+                                                 Max);
       }
       switch (I.getPredicate()) {  // LE/GE have been folded already.
       default: assert(0 && "Unknown icmp opcode!");
       case ICmpInst::ICMP_EQ:
-        if (UMax < URHSVal || UMin > URHSVal)
+        if (Max.ult(RHSVal) || Min.ugt(RHSVal))
           return ReplaceInstUsesWith(I, ConstantInt::getFalse());
         break;
       case ICmpInst::ICMP_NE:
-        if (UMax < URHSVal || UMin > URHSVal)
+        if (Max.ult(RHSVal) || Min.ugt(RHSVal))
           return ReplaceInstUsesWith(I, ConstantInt::getTrue());
         break;
       case ICmpInst::ICMP_ULT:
-        if (UMax < URHSVal)
+        if (Max.ult(RHSVal))
           return ReplaceInstUsesWith(I, ConstantInt::getTrue());
-        if (UMin > URHSVal)
+        if (Min.ugt(RHSVal))
           return ReplaceInstUsesWith(I, ConstantInt::getFalse());
         break;
       case ICmpInst::ICMP_UGT:
-        if (UMin > URHSVal)
+        if (Min.ugt(RHSVal))
           return ReplaceInstUsesWith(I, ConstantInt::getTrue());
-        if (UMax < URHSVal)
+        if (Max.ult(RHSVal))
           return ReplaceInstUsesWith(I, ConstantInt::getFalse());
         break;
       case ICmpInst::ICMP_SLT:
-        if (SMax < SRHSVal)
+        if (Max.slt(RHSVal))
           return ReplaceInstUsesWith(I, ConstantInt::getTrue());
-        if (SMin > SRHSVal)
+        if (Min.sgt(RHSVal))
           return ReplaceInstUsesWith(I, ConstantInt::getFalse());
         break;
       case ICmpInst::ICMP_SGT: 
-        if (SMin > SRHSVal)
+        if (Min.sgt(RHSVal))
           return ReplaceInstUsesWith(I, ConstantInt::getTrue());
-        if (SMax < SRHSVal)
+        if (Max.slt(RHSVal))
           return ReplaceInstUsesWith(I, ConstantInt::getFalse());
         break;
       }
@@ -5454,15 +5454,15 @@
             // Extending a relational comparison when we're checking the sign
             // bit would not work.
             if (Cast->hasOneUse() && isa<TruncInst>(Cast) &&
-                (I.isEquality() ||
-                 (AndCST->getZExtValue() == (uint64_t)AndCST->getSExtValue()) &&
-                 (CI->getZExtValue() == (uint64_t)CI->getSExtValue()))) {
+                (I.isEquality() || AndCST->getValue().isPositive() && 
+                 CI->getValue().isPositive())) {
               ConstantInt *NewCST;
               ConstantInt *NewCI;
-              NewCST = ConstantInt::get(Cast->getOperand(0)->getType(),
-                                         AndCST->getZExtValue());
-              NewCI = ConstantInt::get(Cast->getOperand(0)->getType(),
-                                        CI->getZExtValue());
+              APInt NewCSTVal(AndCST->getValue()), NewCIVal(CI->getValue());
+              uint32_t BitWidth = cast<IntegerType>(
+                Cast->getOperand(0)->getType())->getBitWidth();
+              NewCST = ConstantInt::get(NewCSTVal.zext(BitWidth));
+              NewCI = ConstantInt::get(NewCIVal.zext(BitWidth));
               Instruction *NewAnd = 
                 BinaryOperator::createAnd(Cast->getOperand(0), NewCST, 
                                           LHSI->getName());
@@ -5634,10 +5634,8 @@
               unsigned ShAmtVal = (unsigned)ShAmt->getZExtValue();
 
               // Otherwise strength reduce the shift into an and.
-              uint64_t Val = ~0ULL;          // All ones.
-              Val <<= ShAmtVal;              // Shift over to the right spot.
-              Val &= ~0ULL >> (64-TypeBits);
-              Constant *Mask = ConstantInt::get(CI->getType(), Val);
+              APInt Val(APInt::getAllOnesValue(TypeBits).shl(ShAmtVal));
+              Constant *Mask = ConstantInt::get(Val);
 
               Instruction *AndI =
                 BinaryOperator::createAnd(LHSI->getOperand(0),
@@ -5795,10 +5793,10 @@
         switch (BO->getOpcode()) {
         case Instruction::SRem:
           // If we have a signed (X % (2^c)) == 0, turn it into an unsigned one.
-          if (CI->isNullValue() && isa<ConstantInt>(BO->getOperand(1)) &&
+          if (CI->isZero() && isa<ConstantInt>(BO->getOperand(1)) &&
               BO->hasOneUse()) {
-            int64_t V = cast<ConstantInt>(BO->getOperand(1))->getSExtValue();
-            if (V > 1 && isPowerOf2_64(V)) {
+            APInt V(cast<ConstantInt>(BO->getOperand(1))->getValue());
+            if (V.sgt(APInt(V.getBitWidth(), 1)) && V.isPowerOf2()) {
               Value *NewRem = InsertNewInstBefore(BinaryOperator::createURem(
                   BO->getOperand(0), BO->getOperand(1), BO->getName()), I);
               return new ICmpInst(I.getPredicate(), NewRem, 
@@ -5839,7 +5837,7 @@
           // FALLTHROUGH
         case Instruction::Sub:
           // Replace (([sub|xor] A, B) != 0) with (A != B)
-          if (CI->isNullValue())
+          if (CI->isZero())
             return new ICmpInst(I.getPredicate(), BO->getOperand(0),
                                 BO->getOperand(1));
           break;
@@ -5933,14 +5931,14 @@
             default: break;
             case ICmpInst::ICMP_ULT: { // X u< 128 => X s> -1
               ConstantInt *CUI = cast<ConstantInt>(CI);
-              if (CUI->getZExtValue() == 1ULL << (SrcTySize-1))
+              if (CUI->getValue() == APInt::getSignBit(SrcTySize))
                 return new ICmpInst(ICmpInst::ICMP_SGT, CastOp, 
-                                    ConstantInt::get(SrcTy, -1ULL));
+                  ConstantInt::get(APInt::getAllOnesValue(SrcTySize)));
               break;
             }
             case ICmpInst::ICMP_UGT: { // X u> 127 => X s< 0
               ConstantInt *CUI = cast<ConstantInt>(CI);
-              if (CUI->getZExtValue() == (1ULL << (SrcTySize-1))-1)
+              if (CUI->getValue() == APInt::getSignedMaxValue(SrcTySize))
                 return new ICmpInst(ICmpInst::ICMP_SLT, CastOp, 
                                     Constant::getNullValue(SrcTy));
               break;
@@ -6208,7 +6206,7 @@
   Value *Result;
   if (isSignedCmp) {
     // We're performing a signed comparison.
-    if (cast<ConstantInt>(CI)->getSExtValue() < 0)
+    if (cast<ConstantInt>(CI)->getValue().isNegative())
       Result = ConstantInt::getFalse();          // X < (small) --> false
     else
       Result = ConstantInt::getTrue();           // X < (large) --> true
@@ -6798,10 +6796,12 @@
     // lshr iff we know that the bits we would otherwise be shifting in are
     // already zeros.
     if (ConstantInt *CI = dyn_cast<ConstantInt>(I->getOperand(1))) {
+      uint32_t BitWidth = OrigTy->getBitWidth();
       if (Ty->getBitWidth() < OrigTy->getBitWidth() &&
           MaskedValueIsZero(I->getOperand(0),
-                            OrigTy->getBitMask() & ~Ty->getBitMask()) &&
-          CI->getZExtValue() < Ty->getBitWidth()) {
+            APInt::getAllOnesValue(BitWidth) & 
+         APInt::getAllOnesValue(Ty->getBitWidth()).zextOrTrunc(BitWidth).flip())
+         && CI->getZExtValue() < Ty->getBitWidth()) {
         return CanEvaluateInDifferentType(I->getOperand(0), Ty, NumCastsRemoved);
       }
     }





From reid at x10sys.com  Thu Mar 22 15:57:22 2007
From: reid at x10sys.com (Reid Spencer)
Date: Thu, 22 Mar 2007 15:57:22 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703222057.l2MKvM93011443@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.673 -> 1.674
---
Log message:

For PR1205: http://llvm.org/PR1205 :
* APIntify commonIntCastTransforms
* APIntify visitTrunc
* APIntify visitZExt

Patch by Zhou Sheng.


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

 InstructionCombining.cpp |   33 +++++++++++++++++----------------
 1 files changed, 17 insertions(+), 16 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.673 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.674
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.673	Thu Mar 22 15:36:03 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Thu Mar 22 15:56:53 2007
@@ -6951,8 +6951,8 @@
 
   // See if we can simplify any instructions used by the LHS whose sole 
   // purpose is to compute bits we don't care about.
-  uint64_t KnownZero = 0, KnownOne = 0;
-  if (SimplifyDemandedBits(&CI, cast<IntegerType>(DestTy)->getBitMask(),
+  APInt KnownZero(DestBitSize, 0), KnownOne(DestBitSize, 0);
+  if (SimplifyDemandedBits(&CI, APInt::getAllOnesValue(DestBitSize),
                            KnownZero, KnownOne))
     return &CI;
 
@@ -7008,10 +7008,8 @@
       case Instruction::ZExt: {
         // We need to emit an AND to clear the high bits.
         assert(SrcBitSize < DestBitSize && "Not a zext?");
-        Constant *C = 
-          ConstantInt::get(Type::Int64Ty, (1ULL << SrcBitSize)-1);
-        if (DestBitSize < 64)
-          C = ConstantExpr::getTrunc(C, DestTy);
+        Constant *C = ConstantInt::get(APInt::getAllOnesValue(SrcBitSize));
+        C = ConstantExpr::getZExt(C, DestTy);
         return BinaryOperator::createAnd(Res, C);
       }
       case Instruction::SExt:
@@ -7113,7 +7111,7 @@
     // to an integer, then shift the bit to the appropriate place and then
     // cast to integer to avoid the comparison.
     if (ConstantInt *Op1C = dyn_cast<ConstantInt>(Op1)) {
-      uint64_t Op1CV = Op1C->getZExtValue();
+      APInt Op1CV(Op1C->getValue());
       // cast (X == 0) to int --> X^1      iff X has only the low bit set.
       // cast (X == 0) to int --> (X>>1)^1 iff X has only the 2nd bit set.
       // cast (X == 1) to int --> X        iff X has only the low bit set.
@@ -7122,10 +7120,11 @@
       // cast (X != 0) to int --> X>>1     iff X has only the 2nd bit set.
       // cast (X != 1) to int --> X^1      iff X has only the low bit set.
       // cast (X != 2) to int --> (X>>1)^1 iff X has only the 2nd bit set.
-      if (Op1CV == 0 || isPowerOf2_64(Op1CV)) {
+      if (Op1CV == 0 || Op1CV.isPowerOf2()) {
         // If Op1C some other power of two, convert:
-        uint64_t KnownZero, KnownOne;
-        uint64_t TypeMask = Op1C->getType()->getBitMask();
+        uint32_t BitWidth = Op1C->getType()->getBitWidth();
+        APInt KnownZero(BitWidth, 0), KnownOne(BitWidth, 0);
+        APInt TypeMask(APInt::getAllOnesValue(BitWidth));
         ComputeMaskedBits(Op0, TypeMask, KnownZero, KnownOne);
 
         // This only works for EQ and NE
@@ -7133,9 +7132,9 @@
         if (pred != ICmpInst::ICMP_NE && pred != ICmpInst::ICMP_EQ)
           break;
         
-        if (isPowerOf2_64(KnownZero^TypeMask)) { // Exactly 1 possible 1?
+        if ((KnownZero^TypeMask).isPowerOf2()) { // Exactly 1 possible 1?
           bool isNE = pred == ICmpInst::ICMP_NE;
-          if (Op1CV && (Op1CV != (KnownZero^TypeMask))) {
+          if (Op1CV != 0 && (Op1CV != (KnownZero^TypeMask))) {
             // (X&4) == 2 --> false
             // (X&4) != 2 --> true
             Constant *Res = ConstantInt::get(Type::Int1Ty, isNE);
@@ -7143,7 +7142,7 @@
             return ReplaceInstUsesWith(CI, Res);
           }
           
-          unsigned ShiftAmt = Log2_64(KnownZero^TypeMask);
+          unsigned ShiftAmt = (KnownZero^TypeMask).logBase2();
           Value *In = Op0;
           if (ShiftAmt) {
             // Perform a logical shr by shiftamt.
@@ -7179,6 +7178,7 @@
   Value *Src = CI.getOperand(0);
   const Type *Ty = CI.getType();
   unsigned DestBitWidth = Ty->getPrimitiveSizeInBits();
+  unsigned SrcBitWidth = cast<IntegerType>(Src->getType())->getBitWidth();
   
   if (Instruction *SrcI = dyn_cast<Instruction>(Src)) {
     switch (SrcI->getOpcode()) {
@@ -7190,7 +7190,8 @@
         unsigned ShAmt = ShAmtV->getZExtValue();
         
         // Get a mask for the bits shifting in.
-        uint64_t Mask = (~0ULL >> (64-ShAmt)) << DestBitWidth;
+        APInt Mask(APInt::getAllOnesValue(SrcBitWidth).lshr(
+                     SrcBitWidth-ShAmt).shl(DestBitWidth));
         Value* SrcIOp0 = SrcI->getOperand(0);
         if (SrcI->hasOneUse() && MaskedValueIsZero(SrcIOp0, Mask)) {
           if (ShAmt >= DestBitWidth)        // All zeros.
@@ -7249,8 +7250,8 @@
       // If we're actually extending zero bits and the trunc is a no-op
       if (MidSize < DstSize && SrcSize == DstSize) {
         // Replace both of the casts with an And of the type mask.
-        uint64_t AndValue = cast<IntegerType>(CSrc->getType())->getBitMask();
-        Constant *AndConst = ConstantInt::get(A->getType(), AndValue);
+        APInt AndValue(APInt::getAllOnesValue(MidSize).zext(SrcSize));
+        Constant *AndConst = ConstantInt::get(AndValue);
         Instruction *And = 
           BinaryOperator::createAnd(CSrc->getOperand(0), AndConst);
         // Unfortunately, if the type changed, we need to cast it back.





From baldrick at free.fr  Thu Mar 22 16:07:10 2007
From: baldrick at free.fr (Duncan Sands)
Date: Thu, 22 Mar 2007 16:07:10 -0500
Subject: [llvm-commits] CVS: llvm/utils/findoptdiff
Message-ID: <200703222107.l2ML7ABO011614@zion.cs.uiuc.edu>



Changes in directory llvm/utils:

findoptdiff updated: 1.2 -> 1.3
---
Log message:

The -funcresolve and -raise options no longer exist.


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

 findoptdiff |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/utils/findoptdiff
diff -u llvm/utils/findoptdiff:1.2 llvm/utils/findoptdiff:1.3
--- llvm/utils/findoptdiff:1.2	Sun Dec 17 18:37:37 2006
+++ llvm/utils/findoptdiff	Thu Mar 22 16:06:50 2007
@@ -70,7 +70,7 @@
 opt1="$llvm1/Debug/bin/opt"
 opt2="$llvm2/Debug/bin/opt"
 
-all_switches="-verify -lowersetjmp -funcresolve -raiseallocs -simplifycfg -mem2reg -globalopt -globaldce -ipconstprop -deadargelim -instcombine -simplifycfg -prune-eh -inline -simplify-libcalls -argpromotion -raise -tailduplicate -simplifycfg -scalarrepl -instcombine -predsimplify -condprop -tailcallelim -simplifycfg -reassociate -licm -loop-unswitch -instcombine -indvars -loop-unroll -instcombine -load-vn -gcse -sccp -instcombine -condprop -dse -dce -simplifycfg -deadtypeelim -constmerge -funcresolve -internalize -ipsccp -globalopt -constmerge -deadargelim -inline -prune-eh -globalopt -globaldce -argpromotion -instcombine -predsimplify -scalarrepl -globalsmodref-aa -licm -load-vn -gcse -dse -instcombine -simplifycfg -verify"
+all_switches="-verify -lowersetjmp -raiseallocs -simplifycfg -mem2reg -globalopt -globaldce -ipconstprop -deadargelim -instcombine -simplifycfg -prune-eh -inline -simplify-libcalls -argpromotion -tailduplicate -simplifycfg -scalarrepl -instcombine -predsimplify -condprop -tailcallelim -simplifycfg -reassociate -licm -loop-unswitch -instcombine -indvars -loop-unroll -instcombine -load-vn -gcse -sccp -instcombine -condprop -dse -dce -simplifycfg -deadtypeelim -constmerge -internalize -ipsccp -globalopt -constmerge -deadargelim -inline -prune-eh -globalopt -globaldce -argpromotion -instcombine -predsimplify -scalarrepl -globalsmodref-aa -licm -load-vn -gcse -dse -instcombine -simplifycfg -verify"
 
 #counter=0
 function tryit {





From reid at x10sys.com  Thu Mar 22 17:20:26 2007
From: reid at x10sys.com (Reid Spencer)
Date: Thu, 22 Mar 2007 17:20:26 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703222220.l2MMKQCN012923@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.674 -> 1.675
---
Log message:

For PR1205: http://llvm.org/PR1205 :
APInt support for logical operators in visitAnd, visitOr, and visitXor.

Patch by Zhou Sheng.


---
Diffs of the changes:  (+25 -21)

 InstructionCombining.cpp |   46 +++++++++++++++++++++++++---------------------
 1 files changed, 25 insertions(+), 21 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.674 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.675
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.674	Thu Mar 22 15:56:53 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Thu Mar 22 17:19:58 2007
@@ -3894,9 +3894,10 @@
 
   // See if we can simplify any instructions used by the instruction whose sole 
   // purpose is to compute bits we don't care about.
-  uint64_t KnownZero, KnownOne;
   if (!isa<VectorType>(I.getType())) {
-    if (SimplifyDemandedBits(&I, cast<IntegerType>(I.getType())->getBitMask(),
+    uint32_t BitWidth = cast<IntegerType>(I.getType())->getBitWidth();
+    APInt KnownZero(BitWidth, 0), KnownOne(BitWidth, 0);
+    if (SimplifyDemandedBits(&I, APInt::getAllOnesValue(BitWidth),
                              KnownZero, KnownOne))
     return &I;
   } else {
@@ -3907,9 +3908,9 @@
   }
   
   if (ConstantInt *AndRHS = dyn_cast<ConstantInt>(Op1)) {
-    uint64_t AndRHSMask = AndRHS->getZExtValue();
-    uint64_t TypeMask = cast<IntegerType>(Op0->getType())->getBitMask();
-    uint64_t NotAndRHS = AndRHSMask^TypeMask;
+    APInt AndRHSMask(AndRHS->getValue());
+    APInt TypeMask(cast<IntegerType>(Op0->getType())->getMask());
+    APInt NotAndRHS = AndRHSMask^TypeMask;
 
     // Optimize a variety of ((val OP C1) & C2) combinations...
     if (isa<BinaryOperator>(Op0)) {
@@ -4373,9 +4374,10 @@
 
   // See if we can simplify any instructions used by the instruction whose sole 
   // purpose is to compute bits we don't care about.
-  uint64_t KnownZero, KnownOne;
+  uint32_t BitWidth = cast<IntegerType>(I.getType())->getBitWidth();
+  APInt KnownZero(BitWidth, 0), KnownOne(BitWidth, 0);
   if (!isa<VectorType>(I.getType()) &&
-      SimplifyDemandedBits(&I, cast<IntegerType>(I.getType())->getBitMask(),
+      SimplifyDemandedBits(&I, APInt::getAllOnesValue(BitWidth),
                            KnownZero, KnownOne))
     return &I;
   
@@ -4430,7 +4432,7 @@
   
   // (X^C)|Y -> (X|Y)^C iff Y&C == 0
   if (Op0->hasOneUse() && match(Op0, m_Xor(m_Value(A), m_ConstantInt(C1))) &&
-      MaskedValueIsZero(Op1, C1->getZExtValue())) {
+      MaskedValueIsZero(Op1, C1->getValue())) {
     Instruction *NOr = BinaryOperator::createOr(A, Op1);
     InsertNewInstBefore(NOr, I);
     NOr->takeName(Op0);
@@ -4439,7 +4441,7 @@
 
   // Y|(X^C) -> (X|Y)^C iff Y&C == 0
   if (Op1->hasOneUse() && match(Op1, m_Xor(m_Value(A), m_ConstantInt(C1))) &&
-      MaskedValueIsZero(Op0, C1->getZExtValue())) {
+      MaskedValueIsZero(Op0, C1->getValue())) {
     Instruction *NOr = BinaryOperator::createOr(A, Op0);
     InsertNewInstBefore(NOr, I);
     NOr->takeName(Op0);
@@ -4459,21 +4461,21 @@
     // replace with V+N.
     if (C1 == ConstantExpr::getNot(C2)) {
       Value *V1 = 0, *V2 = 0;
-      if ((C2->getZExtValue() & (C2->getZExtValue()+1)) == 0 && // C2 == 0+1+
+      if ((C2->getValue() & (C2->getValue()+1)) == 0 && // C2 == 0+1+
           match(A, m_Add(m_Value(V1), m_Value(V2)))) {
         // Add commutes, try both ways.
-        if (V1 == B && MaskedValueIsZero(V2, C2->getZExtValue()))
+        if (V1 == B && MaskedValueIsZero(V2, C2->getValue()))
           return ReplaceInstUsesWith(I, A);
-        if (V2 == B && MaskedValueIsZero(V1, C2->getZExtValue()))
+        if (V2 == B && MaskedValueIsZero(V1, C2->getValue()))
           return ReplaceInstUsesWith(I, A);
       }
       // Or commutes, try both ways.
-      if ((C1->getZExtValue() & (C1->getZExtValue()+1)) == 0 &&
+      if ((C1->getValue() & (C1->getValue()+1)) == 0 &&
           match(B, m_Add(m_Value(V1), m_Value(V2)))) {
         // Add commutes, try both ways.
-        if (V1 == A && MaskedValueIsZero(V2, C1->getZExtValue()))
+        if (V1 == A && MaskedValueIsZero(V2, C1->getValue()))
           return ReplaceInstUsesWith(I, B);
-        if (V2 == A && MaskedValueIsZero(V1, C1->getZExtValue()))
+        if (V2 == A && MaskedValueIsZero(V1, C1->getValue()))
           return ReplaceInstUsesWith(I, B);
       }
     }
@@ -4704,11 +4706,13 @@
   
   // See if we can simplify any instructions used by the instruction whose sole 
   // purpose is to compute bits we don't care about.
-  uint64_t KnownZero, KnownOne;
-  if (!isa<VectorType>(I.getType()) &&
-      SimplifyDemandedBits(&I, cast<IntegerType>(I.getType())->getBitMask(),
-                           KnownZero, KnownOne))
-    return &I;
+  if (!isa<VectorType>(I.getType())) {
+    uint32_t BitWidth = cast<IntegerType>(I.getType())->getBitWidth();
+    APInt KnownZero(BitWidth, 0), KnownOne(BitWidth, 0);
+    if (SimplifyDemandedBits(&I, APInt::getAllOnesValue(BitWidth),
+                             KnownZero, KnownOne))
+      return &I;
+  }
 
   if (ConstantInt *RHS = dyn_cast<ConstantInt>(Op1)) {
     // xor (icmp A, B), true = not (icmp A, B) = !icmp A, B
@@ -4751,7 +4755,7 @@
           }
         } else if (Op0I->getOpcode() == Instruction::Or) {
           // (X|C1)^C2 -> X^(C1|C2) iff X&~C1 == 0
-          if (MaskedValueIsZero(Op0I->getOperand(0), Op0CI->getZExtValue())) {
+          if (MaskedValueIsZero(Op0I->getOperand(0), Op0CI->getValue())) {
             Constant *NewRHS = ConstantExpr::getOr(Op0CI, RHS);
             // Anything in both C1 and C2 is known to be zero, remove it from
             // NewRHS.





From dpatel at apple.com  Thu Mar 22 18:02:12 2007
From: dpatel at apple.com (dpatel at apple.com)
Date: Thu, 22 Mar 2007 16:02:12 -0700 (PDT)
Subject: [llvm-commits] [125252] Emit switch cases with a wide range as a
	conditional branch.
Message-ID: <20070322230212.EEF4AAEDBBBA@src>

Revision: 125252
Author:   dpatel
Date:     2007-03-22 16:02:12 -0700 (Thu, 22 Mar 2007)

Log Message:
-----------
Emit switch cases with a wide range as a conditional branch.
Patch by Duncan Sands.

Modified Paths:
--------------
    apple-local/branches/llvm/gcc/llvm-convert.cpp

Modified: apple-local/branches/llvm/gcc/llvm-convert.cpp
===================================================================
--- apple-local/branches/llvm/gcc/llvm-convert.cpp	2007-03-22 21:39:17 UTC (rev 125251)
+++ apple-local/branches/llvm/gcc/llvm-convert.cpp	2007-03-22 23:02:12 UTC (rev 125252)
@@ -1666,6 +1666,7 @@
   
   // Emit the condition.
   Value *SwitchExp = Emit(SWITCH_COND(exp), 0);
+  bool ExpIsSigned = !TYPE_UNSIGNED(TREE_TYPE(SWITCH_COND(exp)));
   
   // Emit the switch instruction.
   SwitchInst *SI = new SwitchInst(SwitchExp, CurBB,
@@ -1673,39 +1674,68 @@
   EmitBlock(new BasicBlock(""));
   SI->setSuccessor(0, CurBB);   // Default location starts out as fall-through
 
-  // Output the body of the switch.
-  if (SWITCH_BODY(exp))
-    Emit(SWITCH_BODY(exp), 0);
-  
+  assert(!SWITCH_BODY(exp) && "not a gimple switch?");
+
+  BasicBlock *DefaultDest = NULL;
   for (unsigned i = 0, e = TREE_VEC_LENGTH(Cases); i != e; ++i) {
     BasicBlock *Dest = getLabelDeclBlock(CASE_LABEL(TREE_VEC_ELT(Cases, i)));
-    if (CASE_LOW(TREE_VEC_ELT(Cases, i)) == 0) {
-      SI->setSuccessor(0, Dest);  // Change the default destination.
+
+    tree low = CASE_LOW(TREE_VEC_ELT(Cases, i));
+    if (!low) {
+      DefaultDest = Dest;
       continue;
     }
 
     // Convert the integer to the right type.
-    Value *Val = Emit(CASE_LOW(TREE_VEC_ELT(Cases, i)), 0);
-    Val = CastToSIntType(Val, SwitchExp->getType());
-    ConstantInt *ValC = cast<ConstantInt>(Val);
-    if (CASE_HIGH(TREE_VEC_ELT(Cases, i)) == 0) {
-      SI->addCase(ValC, Dest); // Single destination.
+    Value *Val = Emit(low, 0);
+    Val = CastToAnyType(Val, !TYPE_UNSIGNED(TREE_TYPE(low)),
+                        SwitchExp->getType(), ExpIsSigned);
+    ConstantInt *LowC = cast<ConstantInt>(Val);
+
+    tree high = CASE_HIGH(TREE_VEC_ELT(Cases, i));
+    if (!high) {
+      SI->addCase(LowC, Dest); // Single destination.
       continue;
     }
 
-    // Otherwise, we have a range, like 'case 1 ... 17'.  Add all of the
-    // necessary successors to the switch.
-    Val = Emit(CASE_HIGH(TREE_VEC_ELT(Cases, i)), 0);
-    // Make sure the case value is the same type as the switch expression (int)
-    Val = CastToSIntType(Val, SwitchExp->getType());
-    ConstantInt *HiC = cast<ConstantInt>(Val);
-    Constant *OneC = ConstantInt::get(ValC->getType(), 1);
-    while (1) {
-      SI->addCase(ValC, Dest);
-      if (ValC == HiC) break;  // Emitted the last one.
-      ValC = cast<ConstantInt>(ConstantExpr::getAdd(ValC, OneC));
+    // Otherwise, we have a range, like 'case 1 ... 17'.
+    Val = Emit(high, 0);
+    // Make sure the case value is the same type as the switch expression
+    Val = CastToAnyType(Val, !TYPE_UNSIGNED(TREE_TYPE(high)),
+                        SwitchExp->getType(), ExpIsSigned);
+    ConstantInt *HighC = cast<ConstantInt>(Val);
+
+    APInt Range = HighC->getValue() - LowC->getValue();
+    if (Range.ult(APInt(Range.getBitWidth(), 64))) {
+      // Add all of the necessary successors to the switch.
+      APInt CurrentValue = LowC->getValue();
+      while (1) {
+        SI->addCase(LowC, Dest);
+        if (LowC == HighC) break;  // Emitted the last one.
+        CurrentValue++;
+        LowC = ConstantInt::get(CurrentValue);
+      }
+    } else {
+      // The range is too big to add to the switch - emit an "if".
+      Value *Diff = BinaryOperator::create(Instruction::Sub, SwitchExp, LowC,
+                                           "tmp", CurBB);
+      Value *Cond = new ICmpInst(ICmpInst::ICMP_ULE, Diff,
+                                 ConstantInt::get(Range), "tmp", CurBB);
+      BasicBlock *False_Block = new BasicBlock("case_false");
+      new BranchInst(Dest, False_Block, Cond, CurBB);
+      EmitBlock(False_Block);
     }
   }
+
+  if (DefaultDest)
+    if (SI->getSuccessor(0) == CurBB)
+      SI->setSuccessor(0, DefaultDest);
+    else {
+      new BranchInst(DefaultDest, CurBB);
+      // Emit a "fallthrough" block, which is almost certainly dead.
+      EmitBlock(new BasicBlock(""));
+    }
+
   return 0;
 }
 




From evan.cheng at apple.com  Thu Mar 22 21:18:32 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Thu, 22 Mar 2007 21:18:32 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
Message-ID: <200703230218.l2N2IWeY015487@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

DAGCombiner.cpp updated: 1.277 -> 1.278
---
Log message:

A couple of bug fixes for reducing load width xform:
1. Address offset is in bytes.
2. Make sure truncate node uses are replaced with new load.

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

 DAGCombiner.cpp |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)


Index: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.277 llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.278
--- llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.277	Wed Mar 21 20:54:19 2007
+++ llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp	Thu Mar 22 21:16:52 2007
@@ -2017,8 +2017,11 @@
   // fold (sext (truncate (srl (load x), c))) -> (sext (smaller load (x+c/n)))
   if (N0.getOpcode() == ISD::TRUNCATE) {
     SDOperand NarrowLoad = ReduceLoadWidth(N0.Val);
-    if (NarrowLoad.Val)
-      N0 = NarrowLoad;
+    if (NarrowLoad.Val) {
+      if (NarrowLoad.Val != N0.Val)
+        CombineTo(N0.Val, NarrowLoad);
+      return DAG.getNode(ISD::SIGN_EXTEND, VT, NarrowLoad);
+    }
   }
 
   // See if the value being truncated is already sign extended.  If so, just
@@ -2109,8 +2112,11 @@
   // fold (zext (truncate (srl (load x), c))) -> (zext (small load (x+c/n)))
   if (N0.getOpcode() == ISD::TRUNCATE) {
     SDOperand NarrowLoad = ReduceLoadWidth(N0.Val);
-    if (NarrowLoad.Val)
-      N0 = NarrowLoad;
+    if (NarrowLoad.Val) {
+      if (NarrowLoad.Val != N0.Val)
+        CombineTo(N0.Val, NarrowLoad);
+      return DAG.getNode(ISD::ZERO_EXTEND, VT, NarrowLoad);
+    }
   }
 
   // fold (zext (truncate x)) -> (and x, mask)
@@ -2189,8 +2195,11 @@
   // fold (aext (truncate (srl (load x), c))) -> (aext (small load (x+c/n)))
   if (N0.getOpcode() == ISD::TRUNCATE) {
     SDOperand NarrowLoad = ReduceLoadWidth(N0.Val);
-    if (NarrowLoad.Val)
-      N0 = NarrowLoad;
+    if (NarrowLoad.Val) {
+      if (NarrowLoad.Val != N0.Val)
+        CombineTo(N0.Val, NarrowLoad);
+      return DAG.getNode(ISD::ANY_EXTEND, VT, NarrowLoad);
+    }
   }
 
   // fold (aext (truncate x))
@@ -2278,7 +2287,7 @@
         N0 = N0.getOperand(0);
         if (MVT::getSizeInBits(N0.getValueType()) <= EVTBits)
           return SDOperand();
-        ShAmt /= EVTBits;
+        ShAmt /= 8;
       }
     }
   }





From zhousheng00 at gmail.com  Thu Mar 22 21:41:52 2007
From: zhousheng00 at gmail.com (Zhou Sheng)
Date: Thu, 22 Mar 2007 21:41:52 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703230241.l2N2fq0Q015860@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.675 -> 1.676
---
Log message:

Simplify the code.


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

 InstructionCombining.cpp |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.675 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.676
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.675	Thu Mar 22 17:19:58 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Thu Mar 22 21:39:25 2007
@@ -6801,7 +6801,7 @@
     // already zeros.
     if (ConstantInt *CI = dyn_cast<ConstantInt>(I->getOperand(1))) {
       uint32_t BitWidth = OrigTy->getBitWidth();
-      if (Ty->getBitWidth() < OrigTy->getBitWidth() &&
+      if (Ty->getBitWidth() < BitWidth &&
           MaskedValueIsZero(I->getOperand(0),
             APInt::getAllOnesValue(BitWidth) & 
          APInt::getAllOnesValue(Ty->getBitWidth()).zextOrTrunc(BitWidth).flip())





From rspencer at reidspencer.com  Thu Mar 22 22:08:11 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Thu, 22 Mar 2007 20:08:11 -0700
Subject: [llvm-commits] [LLVMdev] a question about constant fold for fdiv
In-Reply-To: <Pine.LNX.4.62.0703221841530.3307@nondot.org>
References: <BAY142-F134F5DCE5ABDE3E15B8B41D26B0@phx.gbl>
	<1174605761.13912.605.camel@bashful.x10sys.com>
	<460311DF.5000901@jolt-lang.org> <46031278.4010605@jolt-lang.org>
	<460313C1.8000301@jolt-lang.org> <4603183C.7040804@jolt-lang.org>
	<Pine.LNX.4.62.0703221841530.3307@nondot.org>
Message-ID: <1174619291.13912.671.camel@bashful.x10sys.com>

Chris / Jeff,

No need to file a bug. Here's a patch that I think solves this. Could
you (preferably both) review this to make sure I've interpreted the IEEE
754 standard correctly?

Thanks,

Reid.

On Thu, 2007-03-22 at 18:42 -0800, Chris Lattner wrote:
> On Thu, 22 Mar 2007, Jeff Cohen wrote:
> > Jeff Cohen wrote:
> >>  The standard apparently doesn't explicitly handle 0/0, but the position of 
> >>  the IEEE appears to be that it should yield a NaN of the appropriate sign. 
> >>  See http://standards.ieee.org/reading/ieee/interp/754-1985.html
> >
> > OK, it does explicitly handle it.  My reading comprehension seems to be 
> > lacking right now :(
> >
> > http://754r.ucbtest.org/standards/754xml.html#invalid-exception
> >
> > The above lists all operations that yield a NaN.
> 
> Sounds like a bug, please file it or fix it :)  The code in question is 
> VMCore/ConstantFold.cpp:654.  It should produce the appropriately signed 
> NaN instead of Inf.
> 
> -Chris
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CFold.patch
Type: text/x-patch
Size: 3440 bytes
Desc: not available
Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20070322/b13a44fb/attachment.bin 

From zhousheng00 at gmail.com  Thu Mar 22 22:13:48 2007
From: zhousheng00 at gmail.com (Zhou Sheng)
Date: Thu, 22 Mar 2007 22:13:48 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703230313.l2N3DmGj017291@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.676 -> 1.677
---
Log message:

Make the "KnownZero ^ TypeMask" computation just once.


---
Diffs of the changes:  (+4 -3)

 InstructionCombining.cpp |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.676 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.677
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.676	Thu Mar 22 21:39:25 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Thu Mar 22 22:13:21 2007
@@ -7136,9 +7136,10 @@
         if (pred != ICmpInst::ICMP_NE && pred != ICmpInst::ICMP_EQ)
           break;
         
-        if ((KnownZero^TypeMask).isPowerOf2()) { // Exactly 1 possible 1?
+        APInt KnownZeroMask(KnownZero ^ TypeMask);
+        if (KnownZeroMask.isPowerOf2()) { // Exactly 1 possible 1?
           bool isNE = pred == ICmpInst::ICMP_NE;
-          if (Op1CV != 0 && (Op1CV != (KnownZero^TypeMask))) {
+          if (Op1CV != 0 && (Op1CV != KnownZeroMask)) {
             // (X&4) == 2 --> false
             // (X&4) != 2 --> true
             Constant *Res = ConstantInt::get(Type::Int1Ty, isNE);
@@ -7146,7 +7147,7 @@
             return ReplaceInstUsesWith(CI, Res);
           }
           
-          unsigned ShiftAmt = (KnownZero^TypeMask).logBase2();
+          unsigned ShiftAmt = KnownZeroMask.logBase2();
           Value *In = Op0;
           if (ShiftAmt) {
             // Perform a logical shr by shiftamt.





From reid at x10sys.com  Fri Mar 23 00:33:40 2007
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 23 Mar 2007 00:33:40 -0500
Subject: [llvm-commits] CVS: llvm/lib/VMCore/ConstantFold.cpp
Message-ID: <200703230533.l2N5Xeq1020172@zion.cs.uiuc.edu>



Changes in directory llvm/lib/VMCore:

ConstantFold.cpp updated: 1.147 -> 1.148
---
Log message:

Fix constant fold of div by zero and rem by zero to match IEEE 754
requirements. We must return NaN in some cases and correctly signed 
infinity in other cases. Passes CFP2006 (not that that says much).


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

 ConstantFold.cpp |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)


Index: llvm/lib/VMCore/ConstantFold.cpp
diff -u llvm/lib/VMCore/ConstantFold.cpp:1.147 llvm/lib/VMCore/ConstantFold.cpp:1.148
--- llvm/lib/VMCore/ConstantFold.cpp:1.147	Sat Mar  3 02:32:46 2007
+++ llvm/lib/VMCore/ConstantFold.cpp	Fri Mar 23 00:33:23 2007
@@ -651,17 +651,27 @@
       case Instruction::Mul:     
         return ConstantFP::get(CFP1->getType(), C1Val * C2Val);
       case Instruction::FDiv:
-        if (CFP2->isExactlyValue(0.0)) 
-          return ConstantFP::get(CFP1->getType(),
-                                 std::numeric_limits<double>::infinity());
-        if (CFP2->isExactlyValue(-0.0))
-          return ConstantFP::get(CFP1->getType(),
-                                 -std::numeric_limits<double>::infinity());
+        if (CFP2->isExactlyValue(0.0) || CFP2->isExactlyValue(-0.0))
+          if (CFP1->isExactlyValue(0.0) || CFP1->isExactlyValue(-0.0))
+            // IEEE 754, Section 7.1, #4
+            return ConstantFP::get(CFP1->getType(),
+                                   std::numeric_limits<double>::quiet_NaN());
+          else if (CFP2->isExactlyValue(-0.0) || C1Val < 0.0)
+            // IEEE 754, Section 7.2, negative infinity case
+            return ConstantFP::get(CFP1->getType(),
+                                   -std::numeric_limits<double>::infinity());
+          else
+            // IEEE 754, Section 7.2, positive infinity case
+            return ConstantFP::get(CFP1->getType(),
+                                   std::numeric_limits<double>::infinity());
         return ConstantFP::get(CFP1->getType(), C1Val / C2Val);
       case Instruction::FRem:
-        if (CFP2->isNullValue()) 
-          return 0;
+        if (CFP2->isExactlyValue(0.0) || CFP2->isExactlyValue(-0.0))
+          // IEEE 754, Section 7.1, #5
+          return ConstantFP::get(CFP1->getType(), 
+                                 std::numeric_limits<double>::quiet_NaN());
         return ConstantFP::get(CFP1->getType(), std::fmod(C1Val, C2Val));
+
       }
     }
   } else if (const ConstantVector *CP1 = dyn_cast<ConstantVector>(C1)) {





From reid at x10sys.com  Fri Mar 23 00:47:27 2007
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 23 Mar 2007 00:47:27 -0500
Subject: [llvm-commits] CVS:
	llvm-test/External/SPEC/CINT2006/462.libquantum/Makefile
Message-ID: <200703230547.l2N5lRmb020425@zion.cs.uiuc.edu>



Changes in directory llvm-test/External/SPEC/CINT2006/462.libquantum:

Makefile updated: 1.2 -> 1.3
---
Log message:

Get 462.libquantum compiling on Linux.


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

 Makefile |    4 ++++
 1 files changed, 4 insertions(+)


Index: llvm-test/External/SPEC/CINT2006/462.libquantum/Makefile
diff -u llvm-test/External/SPEC/CINT2006/462.libquantum/Makefile:1.2 llvm-test/External/SPEC/CINT2006/462.libquantum/Makefile:1.3
--- llvm-test/External/SPEC/CINT2006/462.libquantum/Makefile:1.2	Sat Sep 16 02:29:48 2006
+++ llvm-test/External/SPEC/CINT2006/462.libquantum/Makefile	Fri Mar 23 00:47:10 2007
@@ -19,6 +19,10 @@
   CPPFLAGS += -DSPEC_CPU_MACOSX
 endif
 
+ifeq ($(OS),Linux)
+  CPPFLAGS += -DSPEC_CPU_LINUX
+endif
+
 ifeq ($(RUN_TYPE),test)
   RUN_OPTIONS     := 33 5
   STDOUT_FILENAME := test.out





From baldrick at free.fr  Fri Mar 23 02:18:37 2007
From: baldrick at free.fr (Duncan Sands)
Date: Fri, 23 Mar 2007 02:18:37 -0500
Subject: [llvm-commits] CVS: llvm/test/AdaFrontend/switch.adb
Message-ID: <200703230718.l2N7IbKh022003@zion.cs.uiuc.edu>



Changes in directory llvm/test/AdaFrontend:

switch.adb added (r1.1)
---
Log message:

Test handling of switches with wide case ranges.


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

 switch.adb |   12 ++++++++++++
 1 files changed, 12 insertions(+)


Index: llvm/test/AdaFrontend/switch.adb
diff -c /dev/null llvm/test/AdaFrontend/switch.adb:1.1
*** /dev/null	Fri Mar 23 02:18:03 2007
--- llvm/test/AdaFrontend/switch.adb	Fri Mar 23 02:17:52 2007
***************
*** 0 ****
--- 1,12 ----
+ -- RUN: %llvmgcc -c %s -o /dev/null
+ function Switch (N : Integer) return Integer is
+ begin
+    case N is
+       when Integer'First .. -1 =>
+          return -1;
+       when 0 =>
+          return 0;
+       when others =>
+          return 1;
+    end case;
+ end;





From bwendlin at apple.com  Fri Mar 23 03:09:18 2007
From: bwendlin at apple.com (bwendlin at apple.com)
Date: Fri, 23 Mar 2007 01:09:18 -0700 (PDT)
Subject: [llvm-commits] [125255] Add support for initializing the vector.
Message-ID: <20070323080918.7D68DAFF3588@src>

Revision: 125255
Author:   bwendlin
Date:     2007-03-23 01:09:17 -0700 (Fri, 23 Mar 2007)

Log Message:
-----------
Add support for initializing the vector. One thing which can be done
is to convert a vector of constants into an constant value and then move
that into the destination. This is what GCC does.

Modified Paths:
--------------
    apple-local/branches/llvm/gcc/config/i386/llvm-i386.cpp

Modified: apple-local/branches/llvm/gcc/config/i386/llvm-i386.cpp
===================================================================
--- apple-local/branches/llvm/gcc/config/i386/llvm-i386.cpp	2007-03-23 00:13:51 UTC (rev 125254)
+++ apple-local/branches/llvm/gcc/config/i386/llvm-i386.cpp	2007-03-23 08:09:17 UTC (rev 125255)
@@ -447,6 +447,29 @@
   case IX86_BUILTIN_MOVSLDUP:
     Result = BuildVectorShuffle(Ops[0], Ops[0], 0, 0, 2, 2);
     return true;
+  case IX86_BUILTIN_VEC_INIT_V2SI:
+    for (unsigned i = 0; i < 2; ++i)
+      Ops[i] = CastInst::createIntegerCast(Ops[i], Type::Int32Ty, false, "tmp",
+                                           CurBB);
+
+    Result = BuildVector(Ops[1], Ops[0], NULL);
+    return true;
+  case IX86_BUILTIN_VEC_INIT_V4HI:
+    for (unsigned i = 0; i < 4; ++i)
+      Ops[i] = CastInst::createIntegerCast(Ops[i], Type::Int16Ty, false, "tmp",
+                                           CurBB);
+
+    Result = BuildVector(Ops[3], Ops[2], Ops[1], Ops[0], NULL);
+    return true;
+  case IX86_BUILTIN_VEC_INIT_V8QI: {
+    for (unsigned i = 0; i < 8; ++i)
+      Ops[i] = CastInst::createIntegerCast(Ops[i], Type::Int8Ty, false, "tmp",
+                                           CurBB);
+
+    Result = BuildVector(Ops[7], Ops[6], Ops[5], Ops[4],
+                         Ops[3], Ops[2], Ops[1], Ops[0], NULL);
+    return true;
+  }
   case IX86_BUILTIN_VEC_EXT_V2DF:
   case IX86_BUILTIN_VEC_EXT_V4SI:
   case IX86_BUILTIN_VEC_EXT_V4SF:




From llvm at cs.uiuc.edu  Fri Mar 23 10:10:33 2007
From: llvm at cs.uiuc.edu (LLVM)
Date: Fri, 23 Mar 2007 10:10:33 -0500
Subject: [llvm-commits] CVS: llvm/test/Transforms/InstCombine/APInt/
Message-ID: <200703231510.l2NFAX9A029887@zion.cs.uiuc.edu>



Changes in directory llvm/test/Transforms/InstCombine/APInt:

---
Log message:

Directory /var/cvs/llvm/llvm/test/Transforms/InstCombine/APInt added to the repository


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

 0 files changed





From clattner at apple.com  Fri Mar 23 11:22:18 2007
From: clattner at apple.com (Chris Lattner)
Date: Fri, 23 Mar 2007 09:22:18 -0700
Subject: [llvm-commits] CVS: llvm/test/Transforms/InstCombine/APInt/
In-Reply-To: <200703231510.l2NFAX9A029887@zion.cs.uiuc.edu>
References: <200703231510.l2NFAX9A029887@zion.cs.uiuc.edu>
Message-ID: <7CE48C43-FA1C-485F-A61F-4DBF28EC4EA1@apple.com>


On Mar 23, 2007, at 8:10 AM, LLVM wrote:

>
>
> Changes in directory llvm/test/Transforms/InstCombine/APInt:
>
> ---
> Log message:
>
> Directory /var/cvs/llvm/llvm/test/Transforms/InstCombine/APInt  
> added to the repository
>

Hrm?  Why a subdirectory?

-Chris


From rspencer at reidspencer.com  Fri Mar 23 11:32:25 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Fri, 23 Mar 2007 09:32:25 -0700
Subject: [llvm-commits] CVS: llvm/test/Transforms/InstCombine/APInt/
In-Reply-To: <7CE48C43-FA1C-485F-A61F-4DBF28EC4EA1@apple.com>
References: <200703231510.l2NFAX9A029887@zion.cs.uiuc.edu>
	<7CE48C43-FA1C-485F-A61F-4DBF28EC4EA1@apple.com>
Message-ID: <1174667545.6076.10.camel@bashful.x10sys.com>

On Fri, 2007-03-23 at 09:22 -0700, Chris Lattner wrote:
> On Mar 23, 2007, at 8:10 AM, LLVM wrote:
> 
> >
> >
> > Changes in directory llvm/test/Transforms/InstCombine/APInt:
> >
> > ---
> > Log message:
> >
> > Directory /var/cvs/llvm/llvm/test/Transforms/InstCombine/APInt  
> > added to the repository
> >
> 
> Hrm?  Why a subdirectory?

Three reasons:
1. Many of the tests are similar but just modified for APInt. So instead
of having
   sext-apint.ll and zext-apint.ll and or-apint.ll, etc., I just
factored the name
   out into a directory. Also reduces clutter in the
test/Transforms/InstCombine
   directory.
2. To allow "make check TESTSUITE=test/Transforms/InstCombine/APInt" to
just check
   the APInt versions of these tests.
3. There are 32 of these tests so far, figured it was enough for a
separate dir.

Reid.

> 
> -Chris
> _______________________________________________
> 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 Mar 23 11:57:36 2007
From: dpatel at apple.com (Devang Patel)
Date: Fri, 23 Mar 2007 09:57:36 -0700
Subject: [llvm-commits] CVS: llvm/test/Transforms/InstCombine/APInt/
In-Reply-To: <1174667545.6076.10.camel@bashful.x10sys.com>
References: <200703231510.l2NFAX9A029887@zion.cs.uiuc.edu>
	<7CE48C43-FA1C-485F-A61F-4DBF28EC4EA1@apple.com>
	<1174667545.6076.10.camel@bashful.x10sys.com>
Message-ID: <55B5920F-0BCA-45CB-A66E-02DE13B97FBA@apple.com>


On Mar 23, 2007, at 9:32 AM, Reid Spencer wrote:

> 2. To allow "make check TESTSUITE=test/Transforms/InstCombine/APInt"  
> to
> just check
>    the APInt versions of these tests.

How about
	cd test &&  make RUNTESTFLAGS="Transforms/InstCombine/dg.exp=*apint*"
?

-
Devang


From rspencer at reidspencer.com  Fri Mar 23 12:09:25 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Fri, 23 Mar 2007 10:09:25 -0700
Subject: [llvm-commits] CVS: llvm/test/Transforms/InstCombine/APInt/
In-Reply-To: <55B5920F-0BCA-45CB-A66E-02DE13B97FBA@apple.com>
References: <200703231510.l2NFAX9A029887@zion.cs.uiuc.edu>
	<7CE48C43-FA1C-485F-A61F-4DBF28EC4EA1@apple.com>
	<1174667545.6076.10.camel@bashful.x10sys.com>
	<55B5920F-0BCA-45CB-A66E-02DE13B97FBA@apple.com>
Message-ID: <1174669765.6076.33.camel@bashful.x10sys.com>

On Fri, 2007-03-23 at 09:57 -0700, Devang Patel wrote:
> On Mar 23, 2007, at 9:32 AM, Reid Spencer wrote:
> 
> > 2. To allow "make check TESTSUITE=test/Transforms/InstCombine/APInt"  
> > to
> > just check
> >    the APInt versions of these tests.
> 
> How about
> 	cd test &&  make RUNTESTFLAGS="Transforms/InstCombine/dg.exp=*apint*"
> ?

That doesn't seem to work. How is it supposed to help?

Note this:

ls -l Transforms/InstCombine/*zext*
-rw-rw-r-- 1 reid reid 339 Dec  1 20:23 Transforms/InstCombine/zext.ll

make RUNTESTFLAGS="Transforms/InstCombine/dg.exp=*zext*"
...
                ===  Summary ===

# of expected passes            141
# of expected failures          3

I don't want it to run 144 tests, just 1. 

Reid.

> 
> -
> Devang



From djg at cray.com  Fri Mar 23 13:44:36 2007
From: djg at cray.com (Dan Gohman)
Date: Fri, 23 Mar 2007 13:44:36 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/Argument.h BasicBlock.h
	Constants.h DerivedTypes.h Module.h PassAnalysisSupport.h
	PassManager.h PassManagers.h PassSupport.h Type.h
Message-ID: <200703231844.l2NIia9P024436@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm:

Argument.h updated: 1.13 -> 1.14
BasicBlock.h updated: 1.62 -> 1.63
Constants.h updated: 1.139 -> 1.140
DerivedTypes.h updated: 1.88 -> 1.89
Module.h updated: 1.84 -> 1.85
PassAnalysisSupport.h updated: 1.28 -> 1.29
PassManager.h updated: 1.38 -> 1.39
PassManagers.h updated: 1.14 -> 1.15
PassSupport.h updated: 1.36 -> 1.37
Type.h updated: 1.104 -> 1.105
---
Log message:

Add the 'explicit' keyword to several constructors that accept one
argument that don't appear intended as implicit-conversion operators.


---
Diffs of the changes:  (+25 -23)

 Argument.h            |    4 +++-
 BasicBlock.h          |    4 ++--
 Constants.h           |    6 +++---
 DerivedTypes.h        |    8 ++++----
 Module.h              |    2 +-
 PassAnalysisSupport.h |    2 +-
 PassManager.h         |    2 +-
 PassManagers.h        |    6 +++---
 PassSupport.h         |   10 +++++-----
 Type.h                |    4 ++--
 10 files changed, 25 insertions(+), 23 deletions(-)


Index: llvm/include/llvm/Argument.h
diff -u llvm/include/llvm/Argument.h:1.13 llvm/include/llvm/Argument.h:1.14
--- llvm/include/llvm/Argument.h:1.13	Sat Dec 16 23:15:12 2006
+++ llvm/include/llvm/Argument.h	Fri Mar 23 13:44:11 2007
@@ -41,7 +41,9 @@
   /// Argument ctor - If Function argument is specified, this argument is
   /// inserted at the end of the argument list for the function.
   ///
-  Argument(const Type *Ty, const std::string &Name = "", Function *F = 0);
+  explicit Argument(const Type *Ty,
+                    const std::string &Name = "",
+                    Function *F = 0);
 
   inline const Function *getParent() const { return Parent; }
   inline       Function *getParent()       { return Parent; }


Index: llvm/include/llvm/BasicBlock.h
diff -u llvm/include/llvm/BasicBlock.h:1.62 llvm/include/llvm/BasicBlock.h:1.63
--- llvm/include/llvm/BasicBlock.h:1.62	Sat Dec 16 23:15:12 2006
+++ llvm/include/llvm/BasicBlock.h	Fri Mar 23 13:44:11 2007
@@ -70,8 +70,8 @@
   /// is automatically inserted at either the end of the function (if
   /// InsertBefore is null), or before the specified basic block.
   ///
-  BasicBlock(const std::string &Name = "", Function *Parent = 0,
-             BasicBlock *InsertBefore = 0);
+  explicit BasicBlock(const std::string &Name = "", Function *Parent = 0,
+                      BasicBlock *InsertBefore = 0);
   ~BasicBlock();
 
   /// getParent - Return the enclosing method, or null if none


Index: llvm/include/llvm/Constants.h
diff -u llvm/include/llvm/Constants.h:1.139 llvm/include/llvm/Constants.h:1.140
--- llvm/include/llvm/Constants.h:1.139	Mon Mar 19 15:39:08 2007
+++ llvm/include/llvm/Constants.h	Fri Mar 23 13:44:11 2007
@@ -231,7 +231,7 @@
   friend struct ConstantCreator<ConstantAggregateZero, Type, char>;
   ConstantAggregateZero(const ConstantAggregateZero &);      // DO NOT IMPLEMENT
 protected:
-  ConstantAggregateZero(const Type *Ty)
+  explicit ConstantAggregateZero(const Type *Ty)
     : Constant(Ty, ConstantAggregateZeroVal, 0, 0) {}
 public:
   /// get() - static factory method for creating a null aggregate.  It is
@@ -420,7 +420,7 @@
   friend struct ConstantCreator<ConstantPointerNull, PointerType, char>;
   ConstantPointerNull(const ConstantPointerNull &);      // DO NOT IMPLEMENT
 protected:
-  ConstantPointerNull(const PointerType *T)
+  explicit ConstantPointerNull(const PointerType *T)
     : Constant(reinterpret_cast<const Type*>(T),
                Value::ConstantPointerNullVal, 0, 0) {}
 
@@ -669,7 +669,7 @@
   friend struct ConstantCreator<UndefValue, Type, char>;
   UndefValue(const UndefValue &);      // DO NOT IMPLEMENT
 protected:
-  UndefValue(const Type *T) : Constant(T, UndefValueVal, 0, 0) {}
+  explicit UndefValue(const Type *T) : Constant(T, UndefValueVal, 0, 0) {}
 public:
   /// get() - Static factory methods - Return an 'undef' object of the specified
   /// type.


Index: llvm/include/llvm/DerivedTypes.h
diff -u llvm/include/llvm/DerivedTypes.h:1.88 llvm/include/llvm/DerivedTypes.h:1.89
--- llvm/include/llvm/DerivedTypes.h:1.88	Wed Mar 21 19:32:02 2007
+++ llvm/include/llvm/DerivedTypes.h	Fri Mar 23 13:44:11 2007
@@ -36,7 +36,7 @@
   friend class Type;
 
 protected:
-  DerivedType(TypeID id) : Type(id) {}
+  explicit DerivedType(TypeID id) : Type(id) {}
 
   /// notifyUsesThatTypeBecameConcrete - Notify AbstractTypeUsers of this type
   /// that the current type has transitioned from being abstract to being
@@ -79,7 +79,7 @@
 /// @brief Integer representation type
 class IntegerType : public DerivedType {
 protected:
-  IntegerType(unsigned NumBits) : DerivedType(IntegerTyID) {
+  explicit IntegerType(unsigned NumBits) : DerivedType(IntegerTyID) {
     setSubclassData(NumBits);
   }
   friend class TypeMap<IntegerValType, IntegerType>;
@@ -230,7 +230,7 @@
 /// and VectorType
 class CompositeType : public DerivedType {
 protected:
-  inline CompositeType(TypeID id) : DerivedType(id) { }
+  inline explicit CompositeType(TypeID id) : DerivedType(id) { }
 public:
 
   /// getTypeAtIndex - Given an index value into the type, return the type of
@@ -404,7 +404,7 @@
   friend class TypeMap<PointerValType, PointerType>;
   PointerType(const PointerType &);                   // Do not implement
   const PointerType &operator=(const PointerType &);  // Do not implement
-  PointerType(const Type *ElType);
+  explicit PointerType(const Type *ElType);
 public:
   /// PointerType::get - This is the only way to construct a new pointer type.
   static PointerType *get(const Type *ElementType);


Index: llvm/include/llvm/Module.h
diff -u llvm/include/llvm/Module.h:1.84 llvm/include/llvm/Module.h:1.85
--- llvm/include/llvm/Module.h:1.84	Sun Feb 11 23:00:35 2007
+++ llvm/include/llvm/Module.h	Fri Mar 23 13:44:11 2007
@@ -104,7 +104,7 @@
 public:
   /// The Module constructor. Note that there is no default constructor. You
   /// must provide a name for the module upon construction.
-  Module(const std::string &ModuleID);
+  explicit Module(const std::string &ModuleID);
   /// The module destructor. This will dropAllReferences.
   ~Module();
 


Index: llvm/include/llvm/PassAnalysisSupport.h
diff -u llvm/include/llvm/PassAnalysisSupport.h:1.28 llvm/include/llvm/PassAnalysisSupport.h:1.29
--- llvm/include/llvm/PassAnalysisSupport.h:1.28	Fri Jan  5 16:47:07 2007
+++ llvm/include/llvm/PassAnalysisSupport.h	Fri Mar 23 13:44:11 2007
@@ -111,7 +111,7 @@
   AnalysisResolver();  // DO NOT IMPLEMENT
 
 public:
-  AnalysisResolver(PMDataManager &P) : PM(P) { }
+  explicit AnalysisResolver(PMDataManager &P) : PM(P) { }
   
   inline PMDataManager &getPMDataManager() { return PM; }
 


Index: llvm/include/llvm/PassManager.h
diff -u llvm/include/llvm/PassManager.h:1.38 llvm/include/llvm/PassManager.h:1.39
--- llvm/include/llvm/PassManager.h:1.38	Fri Jan  5 14:16:23 2007
+++ llvm/include/llvm/PassManager.h	Fri Mar 23 13:44:11 2007
@@ -59,7 +59,7 @@
 /// FunctionPassManager manages FunctionPasses and BasicBlockPassManagers.
 class FunctionPassManager {
 public:
-  FunctionPassManager(ModuleProvider *P);
+  explicit FunctionPassManager(ModuleProvider *P);
   FunctionPassManager();
   ~FunctionPassManager();
  


Index: llvm/include/llvm/PassManagers.h
diff -u llvm/include/llvm/PassManagers.h:1.14 llvm/include/llvm/PassManagers.h:1.15
--- llvm/include/llvm/PassManagers.h:1.14	Tue Mar  6 11:52:53 2007
+++ llvm/include/llvm/PassManagers.h	Fri Mar 23 13:44:11 2007
@@ -137,7 +137,7 @@
   /// then return NULL.
   Pass *findAnalysisPass(AnalysisID AID);
 
-  PMTopLevelManager(enum TopLevelManagerType t);
+  explicit PMTopLevelManager(enum TopLevelManagerType t);
   virtual ~PMTopLevelManager(); 
 
   /// Add immutable pass and initialize it.
@@ -198,7 +198,7 @@
 class PMDataManager {
 public:
 
-  PMDataManager(int Depth) : TPM(NULL), Depth(Depth) {
+  explicit PMDataManager(int Depth) : TPM(NULL), Depth(Depth) {
     initializeAnalysisInfo();
   }
 
@@ -321,7 +321,7 @@
 class FPPassManager : public ModulePass, public PMDataManager {
  
 public:
-  FPPassManager(int Depth) : PMDataManager(Depth) { }
+  explicit FPPassManager(int Depth) : PMDataManager(Depth) { }
   
   /// run - Execute all of the passes scheduled for execution.  Keep track of
   /// whether any of the passes modifies the module, and if so, return true.


Index: llvm/include/llvm/PassSupport.h
diff -u llvm/include/llvm/PassSupport.h:1.36 llvm/include/llvm/PassSupport.h:1.37
--- llvm/include/llvm/PassSupport.h:1.36	Fri Dec  1 17:46:50 2006
+++ llvm/include/llvm/PassSupport.h	Fri Mar 23 13:44:11 2007
@@ -193,20 +193,20 @@
   const PassInfo *ImplementationInfo;
   bool isDefaultImplementation;
 protected:
-  RegisterAGBase(const std::type_info &Interface,
-                 const std::type_info *Pass = 0,
-                 bool isDefault = false);
+  explicit RegisterAGBase(const std::type_info &Interface,
+                          const std::type_info *Pass = 0,
+                          bool isDefault = false);
   void setGroupName(const char *Name);
 };
 
 template<typename Interface, bool Default = false>
 struct RegisterAnalysisGroup : public RegisterAGBase {
-  RegisterAnalysisGroup(RegisterPassBase &RPB)
+  explicit RegisterAnalysisGroup(RegisterPassBase &RPB)
     : RegisterAGBase(typeid(Interface), &RPB.getPassInfo()->getTypeInfo(), 
                      Default) {
   }
 
-  RegisterAnalysisGroup(const char *Name)
+  explicit RegisterAnalysisGroup(const char *Name)
   : RegisterAGBase(typeid(Interface)) {
     setGroupName(Name);
   }


Index: llvm/include/llvm/Type.h
diff -u llvm/include/llvm/Type.h:1.104 llvm/include/llvm/Type.h:1.105
--- llvm/include/llvm/Type.h:1.104	Wed Feb 14 20:26:09 2007
+++ llvm/include/llvm/Type.h	Fri Mar 23 13:44:11 2007
@@ -103,8 +103,8 @@
   const Type *getForwardedTypeInternal() const;
 protected:
   Type(const char *Name, TypeID id);
-  Type(TypeID id) : ID(id), Abstract(false), SubclassData(0), RefCount(0), 
-                    ForwardType(0) {}
+  explicit Type(TypeID id) : ID(id), Abstract(false), SubclassData(0),
+                             RefCount(0), ForwardType(0) {}
   virtual ~Type() {
     assert(AbstractTypeUsers.empty());
   }





From djg at cray.com  Fri Mar 23 13:44:36 2007
From: djg at cray.com (Dan Gohman)
Date: Fri, 23 Mar 2007 13:44:36 -0500
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/MachineBasicBlock.h
	MachineConstantPool.h MachineInstrBuilder.h
	MachineJumpTableInfo.h MachineLocation.h SelectionDAGISel.h
	SelectionDAGNodes.h
Message-ID: <200703231844.l2NIialR024437@zion.cs.uiuc.edu>



Changes in directory llvm/include/llvm/CodeGen:

MachineBasicBlock.h updated: 1.61 -> 1.62
MachineConstantPool.h updated: 1.25 -> 1.26
MachineInstrBuilder.h updated: 1.43 -> 1.44
MachineJumpTableInfo.h updated: 1.11 -> 1.12
MachineLocation.h updated: 1.3 -> 1.4
SelectionDAGISel.h updated: 1.33 -> 1.34
SelectionDAGNodes.h updated: 1.181 -> 1.182
---
Log message:

Add the 'explicit' keyword to several constructors that accept one
argument that don't appear intended as implicit-conversion operators.


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

 MachineBasicBlock.h    |    7 ++++---
 MachineConstantPool.h  |    2 +-
 MachineInstrBuilder.h  |    2 +-
 MachineJumpTableInfo.h |    3 ++-
 MachineLocation.h      |    2 +-
 SelectionDAGISel.h     |    3 ++-
 SelectionDAGNodes.h    |   10 +++++-----
 7 files changed, 16 insertions(+), 13 deletions(-)


Index: llvm/include/llvm/CodeGen/MachineBasicBlock.h
diff -u llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.61 llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.62
--- llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.61	Wed Feb 28 20:00:40 2007
+++ llvm/include/llvm/CodeGen/MachineBasicBlock.h	Fri Mar 23 13:44:11 2007
@@ -79,9 +79,10 @@
   bool IsLandingPad;
 
 public:
-  MachineBasicBlock(const BasicBlock *bb = 0) : Prev(0), Next(0), BB(bb),
-                                                Number(-1), Parent(0),
-                                                IsLandingPad(false) {
+  explicit MachineBasicBlock(const BasicBlock *bb = 0) : Prev(0), Next(0),
+                                                         BB(bb), Number(-1),
+                                                         Parent(0),
+                                                         IsLandingPad(false) {
     Insts.parent = this;
   }
 


Index: llvm/include/llvm/CodeGen/MachineConstantPool.h
diff -u llvm/include/llvm/CodeGen/MachineConstantPool.h:1.25 llvm/include/llvm/CodeGen/MachineConstantPool.h:1.26
--- llvm/include/llvm/CodeGen/MachineConstantPool.h:1.25	Sat Dec 16 23:15:12 2006
+++ llvm/include/llvm/CodeGen/MachineConstantPool.h	Fri Mar 23 13:44:11 2007
@@ -35,7 +35,7 @@
   const Type *Ty;
 
 public:
-  MachineConstantPoolValue(const Type *ty) : Ty(ty) {}
+  explicit MachineConstantPoolValue(const Type *ty) : Ty(ty) {}
   virtual ~MachineConstantPoolValue() {};
 
   /// getType - get type of this MachineConstantPoolValue.


Index: llvm/include/llvm/CodeGen/MachineInstrBuilder.h
diff -u llvm/include/llvm/CodeGen/MachineInstrBuilder.h:1.43 llvm/include/llvm/CodeGen/MachineInstrBuilder.h:1.44
--- llvm/include/llvm/CodeGen/MachineInstrBuilder.h:1.43	Wed Feb 14 20:52:40 2007
+++ llvm/include/llvm/CodeGen/MachineInstrBuilder.h	Fri Mar 23 13:44:11 2007
@@ -27,7 +27,7 @@
 class MachineInstrBuilder {
   MachineInstr *MI;
 public:
-  MachineInstrBuilder(MachineInstr *mi) : MI(mi) {}
+  explicit MachineInstrBuilder(MachineInstr *mi) : MI(mi) {}
 
   /// Allow automatic conversion to the machine instruction we are working on.
   ///


Index: llvm/include/llvm/CodeGen/MachineJumpTableInfo.h
diff -u llvm/include/llvm/CodeGen/MachineJumpTableInfo.h:1.11 llvm/include/llvm/CodeGen/MachineJumpTableInfo.h:1.12
--- llvm/include/llvm/CodeGen/MachineJumpTableInfo.h:1.11	Sat Dec 16 23:15:12 2006
+++ llvm/include/llvm/CodeGen/MachineJumpTableInfo.h	Fri Mar 23 13:44:11 2007
@@ -34,7 +34,8 @@
   /// MBBs - The vector of basic blocks from which to create the jump table.
   std::vector<MachineBasicBlock*> MBBs;
   
-  MachineJumpTableEntry(const std::vector<MachineBasicBlock*> &M) : MBBs(M) {}
+  explicit MachineJumpTableEntry(const std::vector<MachineBasicBlock*> &M)
+  : MBBs(M) {}
 };
   
 class MachineJumpTableInfo {


Index: llvm/include/llvm/CodeGen/MachineLocation.h
diff -u llvm/include/llvm/CodeGen/MachineLocation.h:1.3 llvm/include/llvm/CodeGen/MachineLocation.h:1.4
--- llvm/include/llvm/CodeGen/MachineLocation.h:1.3	Wed Jan 24 12:45:12 2007
+++ llvm/include/llvm/CodeGen/MachineLocation.h	Fri Mar 23 13:44:11 2007
@@ -40,7 +40,7 @@
   , Register(0)
   , Offset(0)
   {}
-  MachineLocation(unsigned R)
+  explicit MachineLocation(unsigned R)
   : IsRegister(true)
   , Register(R)
   , Offset(0)


Index: llvm/include/llvm/CodeGen/SelectionDAGISel.h
diff -u llvm/include/llvm/CodeGen/SelectionDAGISel.h:1.33 llvm/include/llvm/CodeGen/SelectionDAGISel.h:1.34
--- llvm/include/llvm/CodeGen/SelectionDAGISel.h:1.33	Wed Mar  7 10:25:08 2007
+++ llvm/include/llvm/CodeGen/SelectionDAGISel.h	Fri Mar 23 13:44:11 2007
@@ -42,7 +42,8 @@
   std::vector<SDNode*> TopOrder;
   unsigned DAGSize;
 
-  SelectionDAGISel(TargetLowering &tli) : TLI(tli), DAGSize(0), JT(0,0,0,0) {}
+  explicit SelectionDAGISel(TargetLowering &tli)
+  : TLI(tli), DAGSize(0), JT(0,0,0,0) {}
   
   TargetLowering &getTargetLowering() { return TLI; }
 


Index: llvm/include/llvm/CodeGen/SelectionDAGNodes.h
diff -u llvm/include/llvm/CodeGen/SelectionDAGNodes.h:1.181 llvm/include/llvm/CodeGen/SelectionDAGNodes.h:1.182
--- llvm/include/llvm/CodeGen/SelectionDAGNodes.h:1.181	Wed Mar  7 10:25:08 2007
+++ llvm/include/llvm/CodeGen/SelectionDAGNodes.h	Fri Mar 23 13:44:11 2007
@@ -1075,7 +1075,7 @@
   virtual void ANCHOR();  // Out-of-line virtual method to give class a home.
   SDOperand Op;
 public:
-  HandleSDNode(SDOperand X)
+  explicit HandleSDNode(SDOperand X)
     : SDNode(ISD::HANDLENODE, getSDVTList(MVT::Other)), Op(X) {
     InitOperands(&Op, 1);
   }
@@ -1088,7 +1088,7 @@
   virtual void ANCHOR();  // Out-of-line virtual method to give class a home.
 protected:
   friend class SelectionDAG;
-  StringSDNode(const std::string &val)
+  explicit StringSDNode(const std::string &val)
     : SDNode(ISD::STRING, getSDVTList(MVT::Other)), Value(val) {
   }
 public:
@@ -1298,7 +1298,7 @@
   virtual void ANCHOR();  // Out-of-line virtual method to give class a home.
 protected:
   friend class SelectionDAG;
-  BasicBlockSDNode(MachineBasicBlock *mbb)
+  explicit BasicBlockSDNode(MachineBasicBlock *mbb)
     : SDNode(ISD::BasicBlock, getSDVTList(MVT::Other)), MBB(mbb) {
   }
 public:
@@ -1375,7 +1375,7 @@
   virtual void ANCHOR();  // Out-of-line virtual method to give class a home.
 protected:
   friend class SelectionDAG;
-  CondCodeSDNode(ISD::CondCode Cond)
+  explicit CondCodeSDNode(ISD::CondCode Cond)
     : SDNode(ISD::CONDCODE, getSDVTList(MVT::Other)), Condition(Cond) {
   }
 public:
@@ -1395,7 +1395,7 @@
   virtual void ANCHOR();  // Out-of-line virtual method to give class a home.
 protected:
   friend class SelectionDAG;
-  VTSDNode(MVT::ValueType VT)
+  explicit VTSDNode(MVT::ValueType VT)
     : SDNode(ISD::VALUETYPE, getSDVTList(MVT::Other)), ValueType(VT) {
   }
 public:





From reid at x10sys.com  Fri Mar 23 13:46:52 2007
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 23 Mar 2007 13:46:52 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703231846.l2NIkqU2025640@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.677 -> 1.678
---
Log message:

For PR1205: http://llvm.org/PR1205 :
APIntify several utility functions supporting logical operators and shift
operators. 

Patch by Zhou Sheng.


---
Diffs of the changes:  (+39 -37)

 InstructionCombining.cpp |   76 ++++++++++++++++++++++++-----------------------
 1 files changed, 39 insertions(+), 37 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.677 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.678
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.677	Thu Mar 22 22:13:21 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Fri Mar 23 13:46:34 2007
@@ -3666,17 +3666,14 @@
       // Adding a one to a single bit bit-field should be turned into an XOR
       // of the bit.  First thing to check is to see if this AND is with a
       // single bit constant.
-      uint64_t AndRHSV = cast<ConstantInt>(AndRHS)->getZExtValue();
-
-      // Clear bits that are not part of the constant.
-      AndRHSV &= AndRHS->getType()->getBitMask();
+      APInt AndRHSV(cast<ConstantInt>(AndRHS)->getValue());
 
       // If there is only one bit set...
       if (isOneBitSet(cast<ConstantInt>(AndRHS))) {
         // Ok, at this point, we know that we are masking the result of the
         // ADD down to exactly one bit.  If the constant we are adding has
         // no bits set below this bit, then we can eliminate the ADD.
-        uint64_t AddRHS = cast<ConstantInt>(OpRHS)->getZExtValue();
+        APInt AddRHS(cast<ConstantInt>(OpRHS)->getValue());
 
         // Check to see if any bits below the one bit set in AndRHSV are set.
         if ((AddRHS & (AndRHSV-1)) == 0) {
@@ -3849,7 +3846,7 @@
   case Instruction::And:
     if (ConstantExpr::getAnd(N, Mask) == Mask) {
       // If the AndRHS is a power of two minus one (0+1+), this is simple.
-      if ((Mask->getZExtValue() & Mask->getZExtValue()+1) == 0)
+      if ((Mask->getValue() & Mask->getValue()+1) == 0)
         break;
 
       // Otherwise, if Mask is 0+1+0+, and if B is known to have the low 0+
@@ -3857,8 +3854,9 @@
       // is all N is, ignore it.
       unsigned MB, ME;
       if (isRunOfOnes(Mask, MB, ME)) {  // begin/end bit of run, inclusive
-        uint64_t Mask = cast<IntegerType>(RHS->getType())->getBitMask();
-        Mask >>= 64-MB+1;
+        uint32_t BitWidth = cast<IntegerType>(RHS->getType())->getBitWidth();
+        APInt Mask(APInt::getAllOnesValue(BitWidth));
+        Mask = APIntOps::lshr(Mask, BitWidth-MB+1);
         if (MaskedValueIsZero(RHS, Mask))
           break;
       }
@@ -3867,7 +3865,7 @@
   case Instruction::Or:
   case Instruction::Xor:
     // If the AndRHS is a power of two minus one (0+1+), and N&Mask == 0
-    if ((Mask->getZExtValue() & Mask->getZExtValue()+1) == 0 &&
+    if ((Mask->getValue() & Mask->getValue()+1) == 0 &&
         ConstantExpr::getAnd(N, Mask)->isNullValue())
       break;
     return 0;
@@ -6292,8 +6290,8 @@
 
   // See if we can turn a signed shr into an unsigned shr.
   if (I.isArithmeticShift()) {
-    if (MaskedValueIsZero(Op0,
-                          1ULL << (I.getType()->getPrimitiveSizeInBits()-1))) {
+    if (MaskedValueIsZero(Op0, 
+          APInt::getSignBit(I.getType()->getPrimitiveSizeInBits()))) {
       return BinaryOperator::createLShr(Op0, Op1, I.getName());
     }
   }
@@ -6310,16 +6308,16 @@
 
   // See if we can simplify any instructions used by the instruction whose sole 
   // purpose is to compute bits we don't care about.
-  uint64_t KnownZero, KnownOne;
-  if (SimplifyDemandedBits(&I, cast<IntegerType>(I.getType())->getBitMask(),
+  uint32_t TypeBits = Op0->getType()->getPrimitiveSizeInBits();
+  APInt KnownZero(TypeBits, 0), KnownOne(TypeBits, 0);
+  if (SimplifyDemandedBits(&I, APInt::getAllOnesValue(TypeBits),
                            KnownZero, KnownOne))
     return &I;
   
   // shl uint X, 32 = 0 and shr ubyte Y, 9 = 0, ... just don't eliminate shr
   // of a signed value.
   //
-  unsigned TypeBits = Op0->getType()->getPrimitiveSizeInBits();
-  if (Op1->getZExtValue() >= TypeBits) {
+  if (Op1->getZExtValue() >= TypeBits) {  // shift amount always <= 32 bits
     if (I.getOpcode() != Instruction::AShr)
       return ReplaceInstUsesWith(I, Constant::getNullValue(Op0->getType()));
     else {
@@ -6462,8 +6460,8 @@
         // operation.
         //
         if (isValid && !isLeftShift && I.getOpcode() == Instruction::AShr) {
-          uint64_t Val = Op0C->getZExtValue();
-          isValid = ((Val & (1 << (TypeBits-1))) != 0) == highBitSet;
+          APInt Val(Op0C->getValue());
+          isValid = ((Val & APInt::getSignBit(TypeBits)) != 0) == highBitSet;
         }
         
         if (isValid) {
@@ -6488,6 +6486,7 @@
   
   if (ShiftOp && isa<ConstantInt>(ShiftOp->getOperand(1))) {
     ConstantInt *ShiftAmt1C = cast<ConstantInt>(ShiftOp->getOperand(1));
+    // shift amount always <= 32 bits
     unsigned ShiftAmt1 = (unsigned)ShiftAmt1C->getZExtValue();
     unsigned ShiftAmt2 = (unsigned)Op1->getZExtValue();
     assert(ShiftAmt2 != 0 && "Should have been simplified earlier");
@@ -6495,8 +6494,8 @@
     Value *X = ShiftOp->getOperand(0);
     
     unsigned AmtSum = ShiftAmt1+ShiftAmt2;   // Fold into one big shift.
-    if (AmtSum > I.getType()->getPrimitiveSizeInBits())
-      AmtSum = I.getType()->getPrimitiveSizeInBits();
+    if (AmtSum > TypeBits)
+      AmtSum = TypeBits;
     
     const IntegerType *Ty = cast<IntegerType>(I.getType());
     
@@ -6515,8 +6514,8 @@
         BinaryOperator::createAShr(X, ConstantInt::get(Ty, AmtSum));
       InsertNewInstBefore(Shift, I);
 
-      uint64_t Mask = Ty->getBitMask() >> ShiftAmt2;
-      return BinaryOperator::createAnd(Shift, ConstantInt::get(Ty, Mask));
+      APInt Mask(APInt::getAllOnesValue(TypeBits).lshr(ShiftAmt2));
+      return BinaryOperator::createAnd(Shift, ConstantInt::get(Mask));
     }
     
     // Okay, if we get here, one shift must be left, and the other shift must be
@@ -6524,13 +6523,13 @@
     if (ShiftAmt1 == ShiftAmt2) {
       // If we have ((X >>? C) << C), turn this into X & (-1 << C).
       if (I.getOpcode() == Instruction::Shl) {
-        uint64_t Mask = Ty->getBitMask() << ShiftAmt1;
-        return BinaryOperator::createAnd(X, ConstantInt::get(Ty, Mask));
+        APInt Mask(APInt::getAllOnesValue(TypeBits).shl(ShiftAmt1));
+        return BinaryOperator::createAnd(X, ConstantInt::get(Mask));
       }
       // If we have ((X << C) >>u C), turn this into X & (-1 >>u C).
       if (I.getOpcode() == Instruction::LShr) {
-        uint64_t Mask = Ty->getBitMask() >> ShiftAmt1;
-        return BinaryOperator::createAnd(X, ConstantInt::get(Ty, Mask));
+        APInt Mask(APInt::getAllOnesValue(TypeBits).lshr(ShiftAmt1));
+        return BinaryOperator::createAnd(X, ConstantInt::get(Mask));
       }
       // We can simplify ((X << C) >>s C) into a trunc + sext.
       // NOTE: we could do this for any C, but that would make 'unusual' integer
@@ -6538,9 +6537,12 @@
       // generators.
       const Type *SExtType = 0;
       switch (Ty->getBitWidth() - ShiftAmt1) {
-      case 8 : SExtType = Type::Int8Ty; break;
-      case 16: SExtType = Type::Int16Ty; break;
-      case 32: SExtType = Type::Int32Ty; break;
+      case 1  : SExtType = Type::Int1Ty; break;
+      case 8  : SExtType = Type::Int8Ty; break;
+      case 16 : SExtType = Type::Int16Ty; break;
+      case 32 : SExtType = Type::Int32Ty; break;
+      case 64 : SExtType = Type::Int64Ty; break;
+      case 128: SExtType = IntegerType::get(128); break;
       default: break;
       }
       if (SExtType) {
@@ -6560,8 +6562,8 @@
           BinaryOperator::createShl(X, ConstantInt::get(Ty, ShiftDiff));
         InsertNewInstBefore(Shift, I);
         
-        uint64_t Mask = Ty->getBitMask() << ShiftAmt2;
-        return BinaryOperator::createAnd(Shift, ConstantInt::get(Ty, Mask));
+        APInt Mask(APInt::getAllOnesValue(TypeBits).shl(ShiftAmt2));
+        return BinaryOperator::createAnd(Shift, ConstantInt::get(Mask));
       }
       
       // (X << C1) >>u C2  --> X >>u (C2-C1) & (-1 >> C2)
@@ -6571,8 +6573,8 @@
           BinaryOperator::createLShr(X, ConstantInt::get(Ty, ShiftDiff));
         InsertNewInstBefore(Shift, I);
         
-        uint64_t Mask = Ty->getBitMask() >> ShiftAmt2;
-        return BinaryOperator::createAnd(Shift, ConstantInt::get(Ty, Mask));
+        APInt Mask(APInt::getAllOnesValue(TypeBits).lshr(ShiftAmt2));
+        return BinaryOperator::createAnd(Shift, ConstantInt::get(Mask));
       }
       
       // We can't handle (X << C1) >>s C2, it shifts arbitrary bits in.
@@ -6589,8 +6591,8 @@
                                  ConstantInt::get(Ty, ShiftDiff));
         InsertNewInstBefore(Shift, I);
         
-        uint64_t Mask = Ty->getBitMask() << ShiftAmt2;
-        return BinaryOperator::createAnd(Shift, ConstantInt::get(Ty, Mask));
+        APInt Mask(APInt::getAllOnesValue(TypeBits).shl(ShiftAmt2));
+        return BinaryOperator::createAnd(Shift, ConstantInt::get(Mask));
       }
       
       // (X << C1) >>u C2  --> X << (C1-C2) & (-1 >> C2)
@@ -6600,8 +6602,8 @@
           BinaryOperator::createShl(X, ConstantInt::get(Ty, ShiftDiff));
         InsertNewInstBefore(Shift, I);
         
-        uint64_t Mask = Ty->getBitMask() >> ShiftAmt2;
-        return BinaryOperator::createAnd(Shift, ConstantInt::get(Ty, Mask));
+        APInt Mask(APInt::getAllOnesValue(TypeBits).lshr(ShiftAmt2));
+        return BinaryOperator::createAnd(Shift, ConstantInt::get(Mask));
       }
       
       // We can't handle (X << C1) >>a C2, it shifts arbitrary bits in.
@@ -8191,7 +8193,7 @@
       (ParamTy->isInteger() && ActTy->isInteger() &&
        ParamTy->getPrimitiveSizeInBits() >= ActTy->getPrimitiveSizeInBits()) ||
       (c && ParamTy->getPrimitiveSizeInBits() >= ActTy->getPrimitiveSizeInBits()
-       && c->getSExtValue() > 0);
+       && c->getValue().isPositive());
     if (Callee->isDeclaration() && !isConvertible) return false;
   }
 





From dpatel at apple.com  Fri Mar 23 14:15:05 2007
From: dpatel at apple.com (Devang Patel)
Date: Fri, 23 Mar 2007 12:15:05 -0700
Subject: [llvm-commits] CVS: llvm/test/Transforms/InstCombine/APInt/
In-Reply-To: <1174669765.6076.33.camel@bashful.x10sys.com>
References: <200703231510.l2NFAX9A029887@zion.cs.uiuc.edu>
	<7CE48C43-FA1C-485F-A61F-4DBF28EC4EA1@apple.com>
	<1174667545.6076.10.camel@bashful.x10sys.com>
	<55B5920F-0BCA-45CB-A66E-02DE13B97FBA@apple.com>
	<1174669765.6076.33.camel@bashful.x10sys.com>
Message-ID: <FE308B2B-3AEE-44BB-9B28-915F266D8548@apple.com>


On Mar 23, 2007, at 10:09 AM, Reid Spencer wrote:

> On Fri, 2007-03-23 at 09:57 -0700, Devang Patel wrote:
>> On Mar 23, 2007, at 9:32 AM, Reid Spencer wrote:
>>
>>> 2. To allow "make check TESTSUITE=test/Transforms/InstCombine/APInt"
>>> to
>>> just check
>>>    the APInt versions of these tests.
>>
>> How about
>> 	cd test &&  make RUNTESTFLAGS="Transforms/InstCombine/ 
>> dg.exp=*apint*"
>> ?
>
> That doesn't seem to work. How is it supposed to help?
>
> Note this:
>
> ls -l Transforms/InstCombine/*zext*
> -rw-rw-r-- 1 reid reid 339 Dec  1 20:23 Transforms/InstCombine/zext.ll
>
> make RUNTESTFLAGS="Transforms/InstCombine/dg.exp=*zext*"
> ...
>                 ===  Summary ===
>
> # of expected passes            141
> # of expected failures          3
>
> I don't want it to run 144 tests, just 1.

Aha.. it is running all tests. In GCC test suite you can do ../ 
dg.exp=zext.ll to run just zext.ll.
May be some dejagnu/tcl tk machinary is missing. I do not know what?

BTW, I do not have any opinion regrading creating APInt subdirecty so  
go ahead.

-
Devang


From sabre at nondot.org  Fri Mar 23 14:17:48 2007
From: sabre at nondot.org (Chris Lattner)
Date: Fri, 23 Mar 2007 14:17:48 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703231917.l2NJHmJV025732@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.678 -> 1.679
---
Log message:

switch AddReachableCodeToWorklist from being recursive to being iterative.


---
Diffs of the changes:  (+54 -46)

 InstructionCombining.cpp |  100 +++++++++++++++++++++++++----------------------
 1 files changed, 54 insertions(+), 46 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.678 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.679
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.678	Fri Mar 23 13:46:34 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Fri Mar 23 14:17:18 2007
@@ -9989,58 +9989,66 @@
                                        SmallPtrSet<BasicBlock*, 64> &Visited,
                                        InstCombiner &IC,
                                        const TargetData *TD) {
-  // We have now visited this block!  If we've already been here, bail out.
-  if (!Visited.insert(BB)) return;
-    
-  for (BasicBlock::iterator BBI = BB->begin(), E = BB->end(); BBI != E; ) {
-    Instruction *Inst = BBI++;
+  std::vector<BasicBlock*> Worklist;
+  Worklist.push_back(BB);
+
+  while (!Worklist.empty()) {
+    BB = Worklist.back();
+    Worklist.pop_back();
     
-    // DCE instruction if trivially dead.
-    if (isInstructionTriviallyDead(Inst)) {
-      ++NumDeadInst;
-      DOUT << "IC: DCE: " << *Inst;
-      Inst->eraseFromParent();
-      continue;
-    }
+    // We have now visited this block!  If we've already been here, ignore it.
+    if (!Visited.insert(BB)) continue;
     
-    // ConstantProp instruction if trivially constant.
-    if (Constant *C = ConstantFoldInstruction(Inst, TD)) {
-      DOUT << "IC: ConstFold to: " << *C << " from: " << *Inst;
-      Inst->replaceAllUsesWith(C);
-      ++NumConstProp;
-      Inst->eraseFromParent();
-      continue;
+    for (BasicBlock::iterator BBI = BB->begin(), E = BB->end(); BBI != E; ) {
+      Instruction *Inst = BBI++;
+      
+      // DCE instruction if trivially dead.
+      if (isInstructionTriviallyDead(Inst)) {
+        ++NumDeadInst;
+        DOUT << "IC: DCE: " << *Inst;
+        Inst->eraseFromParent();
+        continue;
+      }
+      
+      // ConstantProp instruction if trivially constant.
+      if (Constant *C = ConstantFoldInstruction(Inst, TD)) {
+        DOUT << "IC: ConstFold to: " << *C << " from: " << *Inst;
+        Inst->replaceAllUsesWith(C);
+        ++NumConstProp;
+        Inst->eraseFromParent();
+        continue;
+      }
+      
+      IC.AddToWorkList(Inst);
     }
-    
-    IC.AddToWorkList(Inst);
-  }
 
-  // Recursively visit successors.  If this is a branch or switch on a constant,
-  // only visit the reachable successor.
-  TerminatorInst *TI = BB->getTerminator();
-  if (BranchInst *BI = dyn_cast<BranchInst>(TI)) {
-    if (BI->isConditional() && isa<ConstantInt>(BI->getCondition())) {
-      bool CondVal = cast<ConstantInt>(BI->getCondition())->getZExtValue();
-      AddReachableCodeToWorklist(BI->getSuccessor(!CondVal), Visited, IC, TD);
-      return;
-    }
-  } else if (SwitchInst *SI = dyn_cast<SwitchInst>(TI)) {
-    if (ConstantInt *Cond = dyn_cast<ConstantInt>(SI->getCondition())) {
-      // See if this is an explicit destination.
-      for (unsigned i = 1, e = SI->getNumSuccessors(); i != e; ++i)
-        if (SI->getCaseValue(i) == Cond) {
-          AddReachableCodeToWorklist(SI->getSuccessor(i), Visited, IC, TD);
-          return;
-        }
-      
-      // Otherwise it is the default destination.
-      AddReachableCodeToWorklist(SI->getSuccessor(0), Visited, IC, TD);
-      return;
+    // Recursively visit successors.  If this is a branch or switch on a
+    // constant, only visit the reachable successor.
+    TerminatorInst *TI = BB->getTerminator();
+    if (BranchInst *BI = dyn_cast<BranchInst>(TI)) {
+      if (BI->isConditional() && isa<ConstantInt>(BI->getCondition())) {
+        bool CondVal = cast<ConstantInt>(BI->getCondition())->getZExtValue();
+        Worklist.push_back(BI->getSuccessor(!CondVal));
+        continue;
+      }
+    } else if (SwitchInst *SI = dyn_cast<SwitchInst>(TI)) {
+      if (ConstantInt *Cond = dyn_cast<ConstantInt>(SI->getCondition())) {
+        // See if this is an explicit destination.
+        for (unsigned i = 1, e = SI->getNumSuccessors(); i != e; ++i)
+          if (SI->getCaseValue(i) == Cond) {
+            Worklist.push_back(SI->getSuccessor(i));
+            continue;
+          }
+        
+        // Otherwise it is the default destination.
+        Worklist.push_back(SI->getSuccessor(0));
+        continue;
+      }
     }
+    
+    for (unsigned i = 0, e = TI->getNumSuccessors(); i != e; ++i)
+      Worklist.push_back(TI->getSuccessor(i));
   }
-  
-  for (unsigned i = 0, e = TI->getNumSuccessors(); i != e; ++i)
-    AddReachableCodeToWorklist(TI->getSuccessor(i), Visited, IC, TD);
 }
 
 bool InstCombiner::DoOneIteration(Function &F, unsigned Iteration) {





From rspencer at reidspencer.com  Fri Mar 23 14:25:25 2007
From: rspencer at reidspencer.com (Reid Spencer)
Date: Fri, 23 Mar 2007 12:25:25 -0700
Subject: [llvm-commits] CVS: llvm/test/Transforms/InstCombine/APInt/
In-Reply-To: <FE308B2B-3AEE-44BB-9B28-915F266D8548@apple.com>
References: <200703231510.l2NFAX9A029887@zion.cs.uiuc.edu>
	<7CE48C43-FA1C-485F-A61F-4DBF28EC4EA1@apple.com>
	<1174667545.6076.10.camel@bashful.x10sys.com>
	<55B5920F-0BCA-45CB-A66E-02DE13B97FBA@apple.com>
	<1174669765.6076.33.camel@bashful.x10sys.com>
	<FE308B2B-3AEE-44BB-9B28-915F266D8548@apple.com>
Message-ID: <1174677925.6076.83.camel@bashful.x10sys.com>

On Fri, 2007-03-23 at 12:15 -0700, Devang Patel wrote:

> Aha.. it is running all tests. In GCC test suite you can do ../ 
> dg.exp=zext.ll to run just zext.ll.
> May be some dejagnu/tcl tk machinary is missing. I do not know what?

No, nothing is missing, its just different. Each dg.exp file can "do its
own thing" to determine how the tests in that directory are to be run,
which ones to run, etc. We're just different from gcc, that's all.

> 
> BTW, I do not have any opinion regrading creating APInt subdirecty so  
> go ahead.

It is already created, but we'll see what Chris says about it :)

> 
> -
> Devang



From reid at x10sys.com  Fri Mar 23 15:05:47 2007
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 23 Mar 2007 15:05:47 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703232005.l2NK5lbL019141@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.679 -> 1.680
---
Log message:

For PR1205: http://llvm.org/PR1205 :
APIntify visitDiv, visitMul and visitRem.

Patch by Zhou Sheng.


---
Diffs of the changes:  (+22 -25)

 InstructionCombining.cpp |   47 ++++++++++++++++++++++-------------------------
 1 files changed, 22 insertions(+), 25 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.679 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.680
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.679	Fri Mar 23 14:17:18 2007
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Fri Mar 23 15:05:17 2007
@@ -2961,11 +2961,10 @@
       if (CI->isAllOnesValue())              // X * -1 == 0 - X
         return BinaryOperator::createNeg(Op0, I.getName());
 
-      int64_t Val = (int64_t)cast<ConstantInt>(CI)->getZExtValue();
-      if (isPowerOf2_64(Val)) {          // Replace X*(2^C) with X << C
-        uint64_t C = Log2_64(Val);
+      APInt Val(cast<ConstantInt>(CI)->getValue());
+      if (Val.isPowerOf2()) {          // Replace X*(2^C) with X << C
         return BinaryOperator::createShl(Op0,
-                                      ConstantInt::get(Op0->getType(), C));
+                 ConstantInt::get(Op0->getType(), Val.logBase2()));
       }
     } else if (ConstantFP *Op1F = dyn_cast<ConstantFP>(Op1)) {
       if (Op1F->isNullValue())
@@ -3128,7 +3127,7 @@
                                         ConstantExpr::getMul(RHS, LHSRHS));
         }
 
-    if (!RHS->isNullValue()) { // avoid X udiv 0
+    if (!RHS->isZero()) { // avoid X udiv 0
       if (SelectInst *SI = dyn_cast<SelectInst>(Op0))
         if (Instruction *R = FoldOpIntoSelect(I, SI, this))
           return R;
@@ -3157,23 +3156,21 @@
   // Check to see if this is an unsigned division with an exact power of 2,
   // if so, convert to a right shift.
   if (ConstantInt *C = dyn_cast<ConstantInt>(Op1)) {
-    if (uint64_t Val = C->getZExtValue())    // Don't break X / 0
-      if (isPowerOf2_64(Val)) {
-        uint64_t ShiftAmt = Log2_64(Val);
-        return BinaryOperator::createLShr(Op0, 
-                                    ConstantInt::get(Op0->getType(), ShiftAmt));
-      }
+    APInt Val(C->getValue());
+    if (Val != 0 && Val.isPowerOf2())    // Don't break X / 0
+      return BinaryOperator::createLShr(Op0, 
+               ConstantInt::get(Op0->getType(), Val.logBase2()));
   }
 
   // X udiv (C1 << N), where C1 is "1<<C2"  -->  X >> (N+C2)
   if (BinaryOperator *RHSI = dyn_cast<BinaryOperator>(I.getOperand(1))) {
     if (RHSI->getOpcode() == Instruction::Shl &&
         isa<ConstantInt>(RHSI->getOperand(0))) {
-      uint64_t C1 = cast<ConstantInt>(RHSI->getOperand(0))->getZExtValue();
-      if (isPowerOf2_64(C1)) {
+      APInt C1(cast<ConstantInt>(RHSI->getOperand(0))->getValue());
+      if (C1.isPowerOf2()) {
         Value *N = RHSI->getOperand(1);
         const Type *NTy = N->getType();
-        if (uint64_t C2 = Log2_64(C1)) {
+        if (uint64_t C2 = C1.logBase2()) {
           Constant *C2V = ConstantInt::get(NTy, C2);
           N = InsertNewInstBefore(BinaryOperator::createAdd(N, C2V, "tmp"), I);
         }
@@ -3187,10 +3184,10 @@
   if (SelectInst *SI = dyn_cast<SelectInst>(Op1)) 
     if (ConstantInt *STO = dyn_cast<ConstantInt>(SI->getOperand(1)))
       if (ConstantInt *SFO = dyn_cast<ConstantInt>(SI->getOperand(2)))  {
-        uint64_t TVA = STO->getZExtValue(), FVA = SFO->getZExtValue();
-        if (isPowerOf2_64(TVA) && isPowerOf2_64(FVA)) {
+        APInt TVA(STO->getValue()), FVA(SFO->getValue());
+        if (TVA.isPowerOf2() && FVA.isPowerOf2()) {
           // Compute the shift amounts
-          unsigned TSA = Log2_64(TVA), FSA = Log2_64(FVA);
+          uint32_t TSA = TVA.logBase2(), FSA = FVA.logBase2();
           // Construct the "on true" case of the select
           Constant *TC = ConstantInt::get(Op0->getType(), TSA);
           Instruction *TSI = BinaryOperator::createLShr(
@@ -3230,7 +3227,7 @@
   // If the sign bits of both operands are zero (i.e. we can prove they are
   // unsigned inputs), turn this into a udiv.
   if (I.getType()->isInteger()) {
-    uint64_t Mask = 1ULL << (I.getType()->getPrimitiveSizeInBits()-1);
+    APInt Mask(APInt::getSignBit(I.getType()->getPrimitiveSizeInBits()));
     if (MaskedValueIsZero(Op1, Mask) && MaskedValueIsZero(Op0, Mask)) {
       return BinaryOperator::createUDiv(Op0, Op1, I.getName());
     }
@@ -3381,7 +3378,7 @@
     // Check to see if this is an unsigned remainder with an exact power of 2,
     // if so, convert to a bitwise and.
     if (ConstantInt *C = dyn_cast<ConstantInt>(RHS))
-      if (isPowerOf2_64(C->getZExtValue()))
+      if (C->getValue().isPowerOf2())
         return BinaryOperator::createAnd(Op0, SubOne(C));
   }
 
@@ -3389,8 +3386,8 @@
     // Turn A % (C << N), where C is 2^k, into A & ((C << N)-1)  
     if (RHSI->getOpcode() == Instruction::Shl &&
         isa<ConstantInt>(RHSI->getOperand(0))) {
-      unsigned C1 = cast<ConstantInt>(RHSI->getOperand(0))->getZExtValue();
-      if (isPowerOf2_64(C1)) {
+      APInt C1(cast<ConstantInt>(RHSI->getOperand(0))->getValue());
+      if (C1.isPowerOf2()) {
         Constant *N1 = ConstantInt::getAllOnesValue(I.getType());
         Value *Add = InsertNewInstBefore(BinaryOperator::createAdd(RHSI, N1,
                                                                    "tmp"), I);
@@ -3405,8 +3402,8 @@
     if (ConstantInt *STO = dyn_cast<ConstantInt>(SI->getOperand(1)))
       if (ConstantInt *SFO = dyn_cast<ConstantInt>(SI->getOperand(2))) {
         // STO == 0 and SFO == 0 handled above.
-        if (isPowerOf2_64(STO->getZExtValue()) && 
-            isPowerOf2_64(SFO->getZExtValue())) {
+        if ((STO->getValue().isPowerOf2()) && 
+            (SFO->getValue().isPowerOf2())) {
           Value *TrueAnd = InsertNewInstBefore(
             BinaryOperator::createAnd(Op0, SubOne(STO), SI->getName()+".t"), I);
           Value *FalseAnd = InsertNewInstBefore(
@@ -3427,7 +3424,7 @@
   
   if (Value *RHSNeg = dyn_castNegVal(Op1))
     if (!isa<ConstantInt>(RHSNeg) || 
-        cast<ConstantInt>(RHSNeg)->getSExtValue() > 0) {
+        cast<ConstantInt>(RHSNeg)->getValue().isPositive()) {
       // X % -Y -> X % Y
       AddUsesToWorkList(I);
       I.setOperand(1, RHSNeg);
@@ -3436,7 +3433,7 @@
  
   // If the top bits of both operands are zero (i.e. we can prove they are
   // unsigned inputs), turn this into a urem.
-  uint64_t Mask = 1ULL << (I.getType()->getPrimitiveSizeInBits()-1);
+  APInt Mask(APInt::getSignBit(I.getType()->getPrimitiveSizeInBits()));
   if (MaskedValueIsZero(Op1, Mask) && MaskedValueIsZero(Op0, Mask)) {
     // X srem Y -> X urem Y, iff X and Y don't have sign bit set
     return BinaryOperator::createURem(Op0, Op1, I.getName());





From reid at x10sys.com  Fri Mar 23 15:48:58 2007
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 23 Mar 2007 15:48:58 -0500
Subject: [llvm-commits] CVS:
	llvm/test/Transforms/InstCombine/APInt/.cvsignore add1.ll
	add2.ll and-compare.ll and-or-and.ll and-xor-merge.ll and1.ll
	and2.ll binop-cast.ll call-cast-target.ll cast-and-cast.ll
	cast-cast-to-and.ll cast.ll dg.exp div1.ll div2.ll mul1.ll
	mul2.ll not.ll or1.ll or2.ll rem1.ll rem2.ll select.ll
	shl-trunc.ll sub.ll xor1.ll xor2.ll zext1.ll zext2.ll
Message-ID: <200703232048.l2NKmwBD010922@zion.cs.uiuc.edu>



Changes in directory llvm/test/Transforms/InstCombine/APInt:

.cvsignore added (r1.1)
add1.ll added (r1.1)
add2.ll added (r1.1)
and-compare.ll added (r1.1)
and-or-and.ll added (r1.1)
and-xor-merge.ll added (r1.1)
and1.ll added (r1.1)
and2.ll added (r1.1)
binop-cast.ll added (r1.1)
call-cast-target.ll added (r1.1)
cast-and-cast.ll added (r1.1)
cast-cast-to-and.ll added (r1.1)
cast.ll added (r1.1)
dg.exp added (r1.1)
div1.ll added (r1.1)
div2.ll added (r1.1)
mul1.ll added (r1.1)
mul2.ll added (r1.1)
not.ll added (r1.1)
or1.ll added (r1.1)
or2.ll added (r1.1)
rem1.ll added (r1.1)
rem2.ll added (r1.1)
select.ll added (r1.1)
shl-trunc.ll added (r1.1)
sub.ll added (r1.1)
xor1.ll added (r1.1)
xor2.ll added (r1.1)
zext1.ll added (r1.1)
zext2.ll added (r1.1)
---
Log message:

Add test case for testing InstCombine with arbitrary precision integer
types. These tests mimic the integer test cases in the normal InstCombine
test suite but use "strange" integer bit widths.

Most tests written by Zhou Sheng, a few by me.


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

 .cvsignore          |    3 +
 add1.ll             |   52 +++++++++++++++++++
 add2.ll             |   56 +++++++++++++++++++++
 and-compare.ll      |   16 ++++++
 and-or-and.ll       |   49 ++++++++++++++++++
 and-xor-merge.ll    |   22 ++++++++
 and1.ll             |   59 ++++++++++++++++++++++
 and2.ll             |   83 +++++++++++++++++++++++++++++++
 binop-cast.ll       |   13 ++++
 call-cast-target.ll |   14 +++++
 cast-and-cast.ll    |   15 +++++
 cast-cast-to-and.ll |    8 +++
 cast.ll             |   21 +++++++
 dg.exp              |    3 +
 div1.ll             |   24 +++++++++
 div2.ll             |   24 +++++++++
 mul1.ll             |   12 ++++
 mul2.ll             |   13 ++++
 not.ll              |   42 +++++++++++++++
 or1.ll              |   37 +++++++++++++
 or2.ll              |   38 ++++++++++++++
 rem1.ll             |   24 +++++++++
 rem2.ll             |   24 +++++++++
 select.ll           |   46 +++++++++++++++++
 shl-trunc.ll        |   14 +++++
 sub.ll              |  138 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 xor1.ll             |   52 +++++++++++++++++++
 xor2.ll             |   52 +++++++++++++++++++
 zext1.ll            |   10 +++
 zext2.ll            |   10 +++
 30 files changed, 974 insertions(+)


Index: llvm/test/Transforms/InstCombine/APInt/.cvsignore
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/.cvsignore:1.1
*** /dev/null	Fri Mar 23 15:48:44 2007
--- llvm/test/Transforms/InstCombine/APInt/.cvsignore	Fri Mar 23 15:48:33 2007
***************
*** 0 ****
--- 1,3 ----
+ Output
+ *.log
+ *.sum


Index: llvm/test/Transforms/InstCombine/APInt/add1.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/add1.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/add1.ll	Fri Mar 23 15:48:33 2007
***************
*** 0 ****
--- 1,52 ----
+ ; This test makes sure that add instructions are properly eliminated.
+ ; This test is for Integer BitWidth <= 64 && BitWidth % 8 != 0.
+ 
+ ; RUN: llvm-as < %s | opt -instcombine -disable-output &&
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
+ ; RUN:    grep -v OK | not grep add
+ 
+ implementation
+ 
+ define i1 @test1(i1 %x) {
+         %tmp.2 = xor i1 %x, 1
+         ;; Add of sign bit -> xor of sign bit.
+         %tmp.4 = add i1 %tmp.2, 1
+         ret i1 %tmp.4
+ }
+ 
+ define i47 @test2(i47 %x) {
+         %tmp.2 = xor i47 %x, 70368744177664
+         ;; Add of sign bit -> xor of sign bit.
+         %tmp.4 = add i47 %tmp.2, 70368744177664
+         ret i47 %tmp.4
+ }
+ 
+ define i15 @test3(i15 %x) {
+         %tmp.2 = xor i15 %x, 16384
+         ;; Add of sign bit -> xor of sign bit.
+         %tmp.4 = add i15 %tmp.2, 16384
+         ret i15 %tmp.4
+ }
+ 
+ define i12 @test4(i12 %x) {
+         ;; If we have ADD(XOR(AND(X, 0xFF), 0xF..F80), 0x80), it's a sext.
+         %X = and i12 %x, 63
+         %tmp.2 = xor i12 %X, 4064    ; 0xFE0
+         %tmp.4 = add i12 %tmp.2, 32  ; 0x020
+         ret i12 %tmp.4
+ }
+ 
+ define i49 @test5(i49 %x) {
+         ;; If we have ADD(XOR(AND(X, 0xFF), 0x80), 0xF..F80), it's a sext.
+         %X = and i49 %x, 16777215                     ; 0x0000000ffffff
+         %tmp.2 = xor i49 %X, 8388608                  ; 0x0000000800000
+         %tmp.4 = add i49 %tmp.2, -8388608             ; 0x1FFFFFF800000
+         ret i49 %tmp.4
+ }
+ 
+ define i49 @test6(i49 %x) {
+         ;; (x & 254)+1 -> (x & 254)|1
+         %tmp.2 = and i49 %x, 562949953421310
+         %tmp.4 = add i49 %tmp.2, 1
+         ret i49 %tmp.4
+ }


Index: llvm/test/Transforms/InstCombine/APInt/add2.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/add2.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/add2.ll	Fri Mar 23 15:48:33 2007
***************
*** 0 ****
--- 1,56 ----
+ ; This test makes sure that add instructions are properly eliminated.
+ ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
+ 
+ ; RUN: llvm-as < %s | opt -instcombine -disable-output &&
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | \
+ ; RUN:    grep -v OK | not grep add
+ 
+ implementation
+ 
+ define i111 @test1(i111 %x) {
+         %tmp.2 = shl i111 1, 110
+         %tmp.4 = xor i111 %x, %tmp.2
+         ;; Add of sign bit -> xor of sign bit.
+         %tmp.6 = add i111 %tmp.4, %tmp.2
+         ret i111 %tmp.6
+ }
+ 
+ define i65 @test2(i65 %x) {
+         %tmp.0 = shl i65 1, 64
+         %tmp.2 = xor i65 %x, %tmp.0
+         ;; Add of sign bit -> xor of sign bit.
+         %tmp.4 = add i65 %tmp.2, %tmp.0
+         ret i65 %tmp.4
+ }
+ 
+ define i1024 @test3(i1024 %x) {
+         %tmp.0 = shl i1024 1, 1023
+         %tmp.2 = xor i1024 %x, %tmp.0
+         ;; Add of sign bit -> xor of sign bit.
+         %tmp.4 = add i1024 %tmp.2, %tmp.0
+         ret i1024 %tmp.4
+ }
+ 
+ define i128 @test4(i128 %x) {
+         ;; If we have ADD(XOR(AND(X, 0xFF), 0xF..F80), 0x80), it's a sext.
+         %tmp.5 = shl i128 1, 127
+         %tmp.1 = ashr i128 %tmp.5, 120
+         %tmp.2 = xor i128 %x, %tmp.1      
+         %tmp.4 = add i128 %tmp.2, %tmp.5
+         ret i128 %tmp.4
+ }
+ 
+ define i99 @test5(i99 %x) {
+         ;; If we have ADD(XOR(AND(X, 0xFF), 0x80), 0xF..F80), it's a sext.
+         %X = and i99 %x, 562949953421311
+         %tmp.2 = xor i99 %X, 281474976710656 
+         %tmp.4 = add i99 %tmp.2, -281474976710656
+         ret i99 %tmp.4
+ }
+ 
+ define i77 @test6(i77 %x) {
+         ;; (x & 254)+1 -> (x & 254)|1
+         %tmp.2 = and i77 %x, 562949953421310
+         %tmp.4 = add i77 %tmp.2, 1
+         ret i77 %tmp.4
+ }


Index: llvm/test/Transforms/InstCombine/APInt/and-compare.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/and-compare.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/and-compare.ll	Fri Mar 23 15:48:33 2007
***************
*** 0 ****
--- 1,16 ----
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | wc -l | grep 2
+ 
+ ; Should be optimized to one and.
+ define i1 @test1(i33 %a, i33 %b) {
+         %tmp1 = and i33 %a, 65280
+         %tmp3 = and i33 %b, 65280
+         %tmp = icmp ne i33 %tmp1, %tmp3
+         ret i1 %tmp
+ }
+ 
+ define i1 @test2(i999 %a, i999 %b) {
+         %tmp1 = and i999 %a, 65280
+         %tmp3 = and i999 %b, 65280
+         %tmp = icmp ne i999 %tmp1, %tmp3
+         ret i1 %tmp
+ }


Index: llvm/test/Transforms/InstCombine/APInt/and-or-and.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/and-or-and.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/and-or-and.ll	Fri Mar 23 15:48:33 2007
***************
*** 0 ****
--- 1,49 ----
+ ; If we have an 'and' of the result of an 'or', and one of the 'or' operands
+ ; cannot have contributed any of the resultant bits, delete the or.  This
+ ; occurs for very common C/C++ code like this:
+ ;
+ ; struct foo { int A : 16; int B : 16; };
+ ; void test(struct foo *F, int X, int Y) {
+ ;        F->A = X; F->B = Y;
+ ; }
+ ;
+ ; Which corresponds to test1.
+ ; 
+ ; This tests arbitrary precision integers.
+ 
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'or '
+ 
+ define i17 @test1(i17 %X, i17 %Y) {
+ 	%A = and i17 %X, 7
+ 	%B = and i17 %Y, 8
+ 	%C = or i17 %A, %B
+ 	%D = and i17 %C, 7  ;; This cannot include any bits from %Y!
+ 	ret i17 %D
+ }
+ 
+ define i49 @test3(i49 %X, i49 %Y) {
+ 	%B = shl i49 %Y, 1
+ 	%C = or i49 %X, %B
+ 	%D = and i49 %C, 1  ;; This cannot include any bits from %Y!
+ 	ret i49 %D
+ }
+ 
+ define i67 @test4(i67 %X, i67 %Y) {
+ 	%B = lshr i67 %Y, 66
+ 	%C = or i67 %X, %B
+ 	%D = and i67 %C, 2  ;; This cannot include any bits from %Y!
+ 	ret i67 %D
+ }
+ 
+ define i231 @or_test1(i231 %X, i231 %Y) {
+ 	%A = and i231 %X, 1
+ 	%B = or i231 %A, 1     ;; This cannot include any bits from X!
+ 	ret i231 %B
+ }
+ 
+ define i7 @or_test2(i7 %X, i7 %Y) {
+ 	%A = shl i7 %X, 6
+ 	%B = or i7 %A, 64     ;; This cannot include any bits from X!
+ 	ret i7 %B
+ }
+ 


Index: llvm/test/Transforms/InstCombine/APInt/and-xor-merge.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/and-xor-merge.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/and-xor-merge.ll	Fri Mar 23 15:48:33 2007
***************
*** 0 ****
--- 1,22 ----
+ ; This test case checks that the merge of and/xor can work on arbitrary
+ ; precision integers.
+ 
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep and | wc -l | grep 1 &&
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep xor | wc -l | grep 2
+ 
+ ; (x &z ) ^ (y & z) -> (x ^ y) & z
+ define i57 @test1(i57 %x, i57 %y, i57 %z) {
+         %tmp3 = and i57 %z, %x
+         %tmp6 = and i57 %z, %y
+         %tmp7 = xor i57 %tmp3, %tmp6
+         ret i57 %tmp7
+ }
+ 
+ ; (x & y) ^ (x | y) -> x ^ y
+ define i23 @test2(i23 %x, i23 %y, i23 %z) {
+         %tmp3 = and i23 %y, %x
+         %tmp6 = or i23 %y, %x
+         %tmp7 = xor i23 %tmp3, %tmp6
+         ret i23 %tmp7
+ }
+ 


Index: llvm/test/Transforms/InstCombine/APInt/and1.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/and1.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/and1.ll	Fri Mar 23 15:48:33 2007
***************
*** 0 ****
--- 1,59 ----
+ ; This test makes sure that and instructions are properly eliminated.
+ ; This test is for Integer BitWidth <= 64 && BitWidth % 8 != 0.
+ 
+ ; RUN: llvm-as < %s | opt -instcombine -disable-output &&
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'and '
+ 
+ implementation
+ 
+ define i39 @test0(i39 %A) {
+         %B = and i39 %A, 0 ; zero result
+         ret i39 %B
+ }
+ 
+ define i47 @test1(i47 %A, i47 %B) {
+         ;; (~A & ~B) == (~(A | B)) - De Morgan's Law
+         %NotA = xor i47 %A, -1
+         %NotB = xor i47 %B, -1
+         %C1 = and i47 %NotA, %NotB
+         ret i47 %C1
+ }
+ 
+ define i15 @test2(i15 %x) {
+         %tmp.2 = and i15 %x, -1 ; noop
+         ret i15 %tmp.2
+ }
+ 
+ define i23 @test3(i23 %x) {
+         %tmp.0 = and i23 %x, 127
+         %tmp.2 = and i23 %tmp.0, 128
+         ret i23 %tmp.2
+ }
+ 
+ define i1 @test4(i37 %x) {
+         %A = and i37 %x, -2147483648
+         %B = icmp ne i37 %A, 0
+         ret i1 %B
+ }
+ 
+ define i7 @test5(i7 %A, i7* %P) {
+         %B = or i7 %A, 3
+         %C = xor i7 %B, 12
+         store i7 %C, i7* %P
+         %r = and i7 %C, 3
+         ret i7 %r
+ }
+ 
+ define i7 @test6(i7 %A, i7 %B) {
+         ;; ~(~X & Y) --> (X | ~Y)
+         %t0 = xor i7 %A, -1
+         %t1 = and i7 %t0, %B
+         %r = xor i7 %t1, -1
+         ret i7 %r
+ }
+ 
+ define i47 @test7(i47 %A) {
+         %X = ashr i47 %A, 39 ;; sign extend
+         %C1 = and i47 %X, 255
+         ret i47 %C1
+ }


Index: llvm/test/Transforms/InstCombine/APInt/and2.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/and2.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/and2.ll	Fri Mar 23 15:48:33 2007
***************
*** 0 ****
--- 1,83 ----
+ ; This test makes sure that and instructions are properly eliminated.
+ ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
+ 
+ ; RUN: llvm-as < %s | opt -instcombine -disable-output &&
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'and '
+ 
+ implementation
+ 
+ define i999 @test0(i999 %A) {
+         %B = and i999 %A, 0 ; zero result
+         ret i999 %B
+ }
+ 
+ define i477 @test1(i477 %A, i477 %B) {
+         ;; (~A & ~B) == (~(A | B)) - De Morgan's Law
+         %NotA = xor i477 %A, -1
+         %NotB = xor i477 %B, -1
+         %C1 = and i477 %NotA, %NotB
+         ret i477 %C1
+ }
+ 
+ define i129 @tst(i129 %A, i129 %B) {
+         ;; (~A & ~B) == (~(A | B)) - De Morgan's Law
+         %NotA = xor i129 %A, -1
+         %NotB = xor i129 %B, -1
+         %C1 = and i129 %NotA, %NotB
+         ret i129 %C1
+ }
+ 
+ define i65 @test(i65 %A, i65 %B) {
+         ;; (~A & ~B) == (~(A | B)) - De Morgan's Law
+         %NotA = xor i65 %A, -1
+         %NotB = xor i65 -1, %B
+         %C1 = and i65 %NotA, %NotB
+         ret i65 %C1
+ }
+ 
+ define i66 @tes(i66 %A, i66 %B) {
+         ;; (~A & ~B) == (~(A | B)) - De Morgan's Law
+         %NotA = xor i66 %A, -1
+         %NotB = xor i66 %B, -1
+         %C1 = and i66 %NotA, %NotB
+         ret i66 %C1
+ }
+ 
+ define i1005 @test2(i1005 %x) {
+         %tmp.2 = and i1005 %x, -1 ; noop
+         ret i1005 %tmp.2
+ }
+ 
+ define i123 @test3(i123 %x) {
+         %tmp.0 = and i123 %x, 127
+         %tmp.2 = and i123 %tmp.0, 128
+         ret i123 %tmp.2
+ }
+ 
+ define i1 @test4(i737 %x) {
+         %A = and i737 %x, -2147483648
+         %B = icmp ne i737 %A, 0
+         ret i1 %B
+ }
+ 
+ define i117 @test5(i117 %A, i117* %P) {
+         %B = or i117 %A, 3
+         %C = xor i117 %B, 12
+         store i117 %C, i117* %P
+         %r = and i117 %C, 3
+         ret i117 %r
+ }
+ 
+ define i117 @test6(i117 %A, i117 %B) {
+         ;; ~(~X & Y) --> (X | ~Y)
+         %t0 = xor i117 %A, -1
+         %t1 = and i117 %t0, %B
+         %r = xor i117 %t1, -1
+         ret i117 %r
+ }
+ 
+ define i1024 @test7(i1024 %A) {
+         %X = ashr i1024 %A, 1016 ;; sign extend
+         %C1 = and i1024 %X, 255
+         ret i1024 %C1
+ }


Index: llvm/test/Transforms/InstCombine/APInt/binop-cast.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/binop-cast.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/binop-cast.ll	Fri Mar 23 15:48:33 2007
***************
*** 0 ****
--- 1,13 ----
+ ; RUN: llvm-upgrade < %s | llvm-as | opt -instcombine | llvm-dis | notcast
+ 
+ define i47 @testAdd(i31 %X, i31 %Y) {
+ 	%tmp = add i31 %X, %Y
+ 	%tmp.l = sext i31 %tmp to i47
+ 	ret i47 %tmp.l
+ }
+ 
+ define i747 @testAdd2(i131 %X, i131 %Y) {
+ 	%tmp = add i131 %X, %Y
+ 	%tmp.l = sext i131 %tmp to i747
+ 	ret i747 %tmp.l
+ }


Index: llvm/test/Transforms/InstCombine/APInt/call-cast-target.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/call-cast-target.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/call-cast-target.ll	Fri Mar 23 15:48:33 2007
***************
*** 0 ****
--- 1,14 ----
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep call | not grep bitcast
+ 
+ target datalayout = "e-p:32:32"
+ target triple = "i686-pc-linux-gnu"
+ 
+ implementation   ; Functions:
+ 
+ define i32 @main() {
+ entry:
+ 	%tmp = call i32 bitcast (i7* (i999*)* @ctime to i32 (i99*)*)( i99* null )
+ 	ret i32 %tmp
+ }
+ 
+ declare i7* @ctime(i999*)


Index: llvm/test/Transforms/InstCombine/APInt/cast-and-cast.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/cast-and-cast.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/cast-and-cast.ll	Fri Mar 23 15:48:33 2007
***************
*** 0 ****
--- 1,15 ----
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep bitcast
+ 
+ define i19 @test1(i43 %val) {
+   %t1 = bitcast i43 %val to i43 
+   %t2 = and i43 %t1, 1
+   %t3 = trunc i43 %t2 to i19
+   ret i19 %t3
+ }
+ 
+ define i73 @test2(i677 %val) {
+   %t1 = bitcast i677 %val to i677 
+   %t2 = and i677 %t1, 1
+   %t3 = trunc i677 %t2 to i73
+   ret i73 %t3
+ }


Index: llvm/test/Transforms/InstCombine/APInt/cast-cast-to-and.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/cast-cast-to-and.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/cast-cast-to-and.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,8 ----
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep i41
+ 
+ define i61 @test1(i61 %X) {
+         %Y = trunc i61 %X to i41 ;; Turn i61o an AND
+         %Z = zext i41 %Y to i61
+         ret i61 %Z
+ }
+ 


Index: llvm/test/Transforms/InstCombine/APInt/cast.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/cast.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/cast.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,21 ----
+ ; Tests to make sure elimination of casts is working correctly
+ ; RUN: llvm-as < %s | opt -instcombine -disable-output &&
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast
+ 
+ define i17 @test1(i17 %a) {
+         %tmp = zext i17 %a to i37               ; <i37> [#uses=2]
+         %tmp21 = lshr i37 %tmp, 8               ; <i37> [#uses=1]
+         %tmp5 = shl i37 %tmp, 8         ; <i37> [#uses=1]
+         %tmp.upgrd.32 = or i37 %tmp21, %tmp5            ; <i37> [#uses=1]
+         %tmp.upgrd.3 = trunc i37 %tmp.upgrd.32 to i17   ; <i17> [#uses=1]
+         ret i17 %tmp.upgrd.3
+ }
+ 
+ define i167 @test2(i167 %a) {
+         %tmp = zext i167 %a to i577               ; <i577> [#uses=2]
+         %tmp21 = lshr i577 %tmp, 9               ; <i577> [#uses=1]
+         %tmp5 = shl i577 %tmp, 8         ; <i577> [#uses=1]
+         %tmp.upgrd.32 = or i577 %tmp21, %tmp5            ; <i577> [#uses=1]
+         %tmp.upgrd.3 = trunc i577 %tmp.upgrd.32 to i167  ; <i167> [#uses=1]
+         ret i167 %tmp.upgrd.3
+ }


Index: llvm/test/Transforms/InstCombine/APInt/dg.exp
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/dg.exp:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/dg.exp	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,3 ----
+ load_lib llvm-dg.exp
+ 
+ llvm-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,llx,c,cpp,tr}]] $objdir $srcdir $subdir $target_triplet $llvmgcc $llvmgxx $prcontext $llvmgcc_version


Index: llvm/test/Transforms/InstCombine/APInt/div1.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/div1.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/div1.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,24 ----
+ ; This test makes sure that div instructions are properly eliminated.
+ ; This test is for Integer BitWidth < 64 && BitWidth % 2 != 0.
+ ;
+ 
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep div
+ 
+ implementation
+ 
+ define i33 @test1(i33 %X) {
+     %Y = udiv i33 %X, 4096
+     ret i33 %Y
+ }
+ 
+ define i49 @test2(i49 %X) {
+     %tmp.0 = shl i49 4096, 17
+     %Y = udiv i49 %X, %tmp.0
+     ret i49 %Y
+ }
+ 
+ define i59 @test3(i59 %X, bool %C) {
+         %V = select bool %C, i59 1024, i59 4096
+         %R = udiv i59 %X, %V
+         ret i59 %R
+ }


Index: llvm/test/Transforms/InstCombine/APInt/div2.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/div2.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/div2.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,24 ----
+ ; This test makes sure that div instructions are properly eliminated.
+ ; This test is for Integer BitWidth >= 64 && BitWidth <= 1024.
+ ;
+ 
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep div
+ 
+ implementation
+ 
+ define i333 @test1(i333 %X) {
+     %Y = udiv i333 %X, 70368744177664
+     ret i333 %Y
+ }
+ 
+ define i499 @test2(i499 %X) {
+     %tmp.0 = shl i499 4096, 197
+     %Y = udiv i499 %X, %tmp.0
+     ret i499 %Y
+ }
+ 
+ define i599 @test3(i599 %X, bool %C) {
+         %V = select bool %C, i599 70368744177664, i599 4096
+         %R = udiv i599 %X, %V
+         ret i599 %R
+ }


Index: llvm/test/Transforms/InstCombine/APInt/mul1.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/mul1.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/mul1.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,12 ----
+ ; This test makes sure that mul instructions are properly eliminated.
+ ; This test is for Integer BitWidth < 64 && BitWidth % 2 != 0.
+ ;
+ 
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep mul
+ 
+ implementation
+ 
+ define i17 @test1(i17 %X) {
+     %Y = mul i17 %X, 1024
+     ret i17 %Y
+ } 


Index: llvm/test/Transforms/InstCombine/APInt/mul2.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/mul2.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/mul2.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,13 ----
+ ; This test makes sure that mul instructions are properly eliminated.
+ ; This test is for Integer BitWidth >= 64 && BitWidth % 2 >= 1024.
+ ;
+ 
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep mul
+ 
+ implementation
+ 
+ define i177 @test1(i177 %X) {
+     %C = shl i177 1, 155
+     %Y = mul i177 %X, %C
+     ret i177 %Y
+ } 


Index: llvm/test/Transforms/InstCombine/APInt/not.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/not.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/not.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,42 ----
+ ; This test makes sure that the xor instructions are properly eliminated
+ ; when arbitrary precision integers are used.
+ 
+ ; RUN: llvm-as | opt -instcombine | llvm-dis | not grep xor
+ 
+ define i33 @test1(i33 %A) {
+ 	%B = xor i33 %A, -1
+ 	%C = xor i33 %B, -1
+ 	ret i33 %C
+ }
+ 
+ define i1 @test2(i52 %A, i52 %B) {
+ 	%cond = icmp ule i52 %A, %B     ; Can change into uge
+ 	%Ret = xor i1 %cond, true
+ 	ret i1 %Ret
+ }
+ 
+ ; Test that demorgans law can be instcombined
+ define i47 @test3(i47 %A, i47 %B) {
+ 	%a = xor i47 %A, -1
+ 	%b = xor i47 %B, -1
+ 	%c = and i47 %a, %b
+ 	%d = xor i47 %c, -1
+ 	ret i47 %d
+ }
+ 
+ ; Test that demorgens law can work with constants
+ define i61 @test4(i61 %A, i61 %B) {
+ 	%a = xor i61 %A, -1
+ 	%c = and i61 %a, 5    ; 5 = ~c2
+ 	%d = xor i61 %c, -1
+ 	ret i61 %d
+ }
+ 
+ ; test the mirror of demorgans law...
+ define i71 @test5(i71 %A, i71 %B) {
+ 	%a = xor i71 %A, -1
+ 	%b = xor i71 %B, -1
+ 	%c = or i71 %a, %b
+ 	%d = xor i71 %c, -1
+ 	ret i71 %d
+ }


Index: llvm/test/Transforms/InstCombine/APInt/or1.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/or1.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/or1.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,37 ----
+ ; This test makes sure that or instructions are properly eliminated.
+ ; This test is for Integer BitWidth <= 64 && BitWidth % 2 != 0.
+ ;
+ 
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep or
+ 
+ implementation
+ 
+ define i7 @test0(i7 %X) {
+     %Y = or i7 %X, 0
+     ret i7 %Y
+ }
+ 
+ define i17 @test1(i17 %X) {
+     %Y = or i17 %X, -1
+     ret i17 %Y
+ } 
+ 
+ define i23 @test2(i23 %A) {
+     ;; A | ~A == -1
+     %NotA = xor i23 -1, %A
+     %B = or i23 %A, %NotA
+     ret i23 %B
+ }
+ 
+ define i39 @test3(i39 %V, i39 %M) {
+     ;; If we have: ((V + N) & C1) | (V & C2)
+     ;; .. and C2 = ~C1 and C2 is 0+1+ and (N & C2) == 0
+     ;; replace with V+N.
+     %C1 = xor i39 274877906943, -1 ;; C2 = 274877906943
+     %N = and i39 %M, 274877906944
+     %A = add i39 %V, %N
+     %B = and i39 %A, %C1
+     %D = and i39 %V, 274877906943
+     %R = or i39 %B, %D
+     ret i39 %R
+ }


Index: llvm/test/Transforms/InstCombine/APInt/or2.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/or2.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/or2.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,38 ----
+ ; This test makes sure that or instructions are properly eliminated.
+ ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
+ ;
+ 
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis > /tmp/or2.rel &&
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep or
+ 
+ implementation
+ 
+ define i777 @test0(i777 %X) {
+     %Y = or i777 %X, 0
+     ret i777 %Y
+ }
+ 
+ define i117 @test1(i117 %X) {
+     %Y = or i117 %X, -1
+     ret i117 %Y
+ } 
+ 
+ define i1023 @test2(i1023 %A) {
+     ;; A | ~A == -1
+     %NotA = xor i1023 -1, %A
+     %B = or i1023 %A, %NotA
+     ret i1023 %B
+ }
+ 
+ define i399 @test3(i399 %V, i399 %M) {
+     ;; If we have: ((V + N) & C1) | (V & C2)
+     ;; .. and C2 = ~C1 and C2 is 0+1+ and (N & C2) == 0
+     ;; replace with V+N.
+     %C1 = xor i399 274877906943, -1 ;; C2 = 274877906943
+     %N = and i399 %M, 18446742974197923840
+     %A = add i399 %V, %N
+     %B = and i399 %A, %C1
+     %D = and i399 %V, 274877906943
+     %R = or i399 %B, %D
+     ret i399 %R
+ }


Index: llvm/test/Transforms/InstCombine/APInt/rem1.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/rem1.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/rem1.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,24 ----
+ ; This test makes sure that these instructions are properly eliminated.
+ ; This test is for Integer BitWidth < 64 && BitWidth % 2 != 0.
+ ;
+ ; RUN: llvm-as < %s | opt -instcombine -disable-output &&
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep rem
+ 
+ implementation
+ 
+ define i33 @test1(i33 %A) {
+     %B = urem i33 %A, 4096
+     ret i33 %B
+ }
+ 
+ define i49 @test2(i49 %A) {
+     %B = shl i49 4096, 11
+     %Y = urem i49 %A, %B
+     ret i49 %Y
+ }
+ 
+ define i59 @test3(i59 %X, i1 %C) {
+ 	%V = select i1 %C, i59 70368744177664, i59 4096
+ 	%R = urem i59 %X, %V
+ 	ret i59 %R
+ }


Index: llvm/test/Transforms/InstCombine/APInt/rem2.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/rem2.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/rem2.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,24 ----
+ ; This test makes sure that these instructions are properly eliminated.
+ ; This test is for Integer BitWidth >= 64 && BitWidth <= 1024.
+ ;
+ ; RUN: llvm-as < %s | opt -instcombine -disable-output &&
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep rem
+ 
+ implementation
+ 
+ define i333 @test1(i333 %A) {
+     %B = urem i333 %A, 70368744177664
+     ret i333 %B
+ }
+ 
+ define i499 @test2(i499 %A) {
+     %B = shl i499 4096, 111
+     %Y = urem i499 %A, %B
+     ret i499 %Y
+ }
+ 
+ define i599 @test3(i599 %X, i1 %C) {
+ 	%V = select i1 %C, i599 70368744177664, i599 4096
+ 	%R = urem i599 %X, %V
+ 	ret i599 %R
+ }


Index: llvm/test/Transforms/InstCombine/APInt/select.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/select.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/select.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,46 ----
+ ; This test makes sure that these instructions are properly eliminated.
+ 
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep select &&
+ ; RUN: llvm-as < %s | opt -instcombine -disable-output
+ 
+ implementation
+ 
+ define i41 @test1(i1 %C) {
+ 	%V = select i1 %C, i41 1, i41 0  ; V = C
+ 	ret i41 %V
+ }
+ 
+ define i999 @test2(i1 %C) {
+ 	%V = select i1 %C, i999 0, i999 1  ; V = C
+ 	ret i999 %V
+ }
+ 
+ define i41 @test3(i41 %X) {
+     ;; (x <s 0) ? -1 : 0 -> ashr x, 31
+     %t = icmp slt i41 %X, 0
+     %V = select i1 %t, i41 -1, i41 0
+     ret i41 %V
+ }
+ 
+ define i1023 @test4(i1023 %X) {
+     ;; (x <s 0) ? -1 : 0 -> ashr x, 31
+     %t = icmp slt i1023 %X, 0
+     %V = select i1 %t, i1023 -1, i1023 0
+     ret i1023 %V
+ }
+ 
+ define i41 @test5(i41 %X) {
+     ;; ((X & 27) ? 27 : 0)
+     %Y = and i41 %X, 32
+     %t = icmp ne i41 %Y, 0
+     %V = select i1 %t, i41 32, i41 0
+     ret i41 %V
+ }
+ 
+ define i1023 @test6(i1023 %X) {
+     ;; ((X & 27) ? 27 : 0)
+     %Y = and i1023 %X, 64 
+     %t = icmp ne i1023 %Y, 0
+     %V = select i1 %t, i1023 64, i1023 0
+     ret i1023 %V
+ }


Index: llvm/test/Transforms/InstCombine/APInt/shl-trunc.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/shl-trunc.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/shl-trunc.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,14 ----
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis > /tmp/sht.rel &&
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | grep shl
+ 
+ define i1 @test0(i39 %X, i39 %A) {
+ 	%B = lshr i39 %X, %A
+ 	%D = trunc i39 %B to i1
+ 	ret i1 %D
+ }
+ 
+ define i1 @test1(i799 %X, i799 %A) {
+ 	%B = lshr i799 %X, %A
+ 	%D = trunc i799 %B to i1
+ 	ret i1 %D
+ }


Index: llvm/test/Transforms/InstCombine/APInt/sub.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/sub.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/sub.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,138 ----
+ ; This test makes sure that sub instructions are properly eliminated
+ ; even with arbitrary precision integers.
+ ;
+ 
+ ; RUN:  llvm-as | opt -instcombine | llvm-dis | \
+ ; RUN:   grep -v 'sub i19 %Cok, %Bok' | not grep sub
+ 
+ define i23 @test1(i23 %A) {
+ 	%B = sub i23 %A, %A		; <i23> [#uses=1]
+ 	ret i23 %B
+ }
+ 
+ define i47 @test2(i47 %A) {
+ 	%B = sub i47 %A, 0		; <i47> [#uses=1]
+ 	ret i47 %B
+ }
+ 
+ define i97 @test3(i97 %A) {
+ 	%B = sub i97 0, %A		; <i97> [#uses=1]
+ 	%C = sub i97 0, %B		; <i97> [#uses=1]
+ 	ret i97 %C
+ }
+ 
+ define i108 @test4(i108 %A, i108 %x) {
+ 	%B = sub i108 0, %A		; <i108> [#uses=1]
+ 	%C = sub i108 %x, %B		; <i108> [#uses=1]
+ 	ret i108 %C
+ }
+ 
+ define i19 @test5(i19 %A, i19 %Bok, i19 %Cok) {
+ 	%D = sub i19 %Bok, %Cok		; <i19> [#uses=1]
+ 	%E = sub i19 %A, %D		; <i19> [#uses=1]
+ 	ret i19 %E
+ }
+ 
+ define i57 @test6(i57 %A, i57 %B) {
+ 	%C = and i57 %A, %B		; <i57> [#uses=1]
+ 	%D = sub i57 %A, %C		; <i57> [#uses=1]
+ 	ret i57 %D
+ }
+ 
+ define i77 @test7(i77 %A) {
+ 	%B = sub i77 -1, %A		; <i77> [#uses=1]
+ 	ret i77 %B
+ }
+ 
+ define i27 @test8(i27 %A) {
+ 	%B = mul i27 9, %A		; <i27> [#uses=1]
+ 	%C = sub i27 %B, %A		; <i27> [#uses=1]
+ 	ret i27 %C
+ }
+ 
+ define i42 @test9(i42 %A) {
+ 	%B = mul i42 3, %A		; <i42> [#uses=1]
+ 	%C = sub i42 %A, %B		; <i42> [#uses=1]
+ 	ret i42 %C
+ }
+ 
+ define i124 @test10(i124 %A, i124 %B) {
+ 	%C = sub i124 0, %A		; <i124> [#uses=1]
+ 	%D = sub i124 0, %B		; <i124> [#uses=1]
+ 	%E = mul i124 %C, %D		; <i124> [#uses=1]
+ 	ret i124 %E
+ }
+ 
+ define i55 @test10a(i55 %A) {
+ 	%C = sub i55 0, %A		; <i55> [#uses=1]
+ 	%E = mul i55 %C, 7		; <i55> [#uses=1]
+ 	ret i55 %E
+ }
+ 
+ define i1 @test11(i9 %A, i9 %B) {
+ 	%C = sub i9 %A, %B		; <i9> [#uses=1]
+ 	%cD = icmp ne i9 %C, 0		; <i1> [#uses=1]
+ 	ret i1 %cD
+ }
+ 
+ define i43 @test12(i43 %A) {
+ 	%B = ashr i43 %A, 42		; <i43> [#uses=1]
+ 	%C = sub i43 0, %B		; <i43> [#uses=1]
+ 	ret i43 %C
+ }
+ 
+ define i79 @test13(i79 %A) {
+ 	%B = lshr i79 %A, 78		; <i79> [#uses=1]
+ 	%C = sub i79 0, %B		; <i79> [#uses=1]
+ 	ret i79 %C
+ }
+ 
+ define i1024 @test14(i1024 %A) {
+ 	%B = lshr i1024 %A, 1023        ; <i1024> [#uses=1]
+ 	%C = bitcast i1024 %B to i1024	; <i1024> [#uses=1]
+ 	%D = sub i1024 0, %C		; <i1024> [#uses=1]
+ 	ret i1024 %D
+ }
+ 
+ define i14 @test15(i14 %A, i14 %B) {
+ 	%C = sub i14 0, %A		; <i14> [#uses=1]
+ 	%D = srem i14 %B, %C		; <i14> [#uses=1]
+ 	ret i14 %D
+ }
+ 
+ define i51 @test16(i51 %A) {
+ 	%X = sdiv i51 %A, 1123		; <i51> [#uses=1]
+ 	%Y = sub i51 0, %X		; <i51> [#uses=1]
+ 	ret i51 %Y
+ }
+ 
+ define i25 @test17(i25 %A) {
+ 	%B = sub i25 0, %A		; <i25> [#uses=1]
+ 	%C = sdiv i25 %B, 1234		; <i25> [#uses=1]
+ 	ret i25 %C
+ }
+ 
+ define i128 @test18(i128 %Y) {
+ 	%tmp.4 = shl i128 %Y, 2		; <i128> [#uses=1]
+ 	%tmp.12 = shl i128 %Y, 2	; <i128> [#uses=1]
+ 	%tmp.8 = sub i128 %tmp.4, %tmp.12	; <i128> [#uses=1]
+ 	ret i128 %tmp.8
+ }
+ 
+ define i39 @test19(i39 %X, i39 %Y) {
+ 	%Z = sub i39 %X, %Y		; <i39> [#uses=1]
+ 	%Q = add i39 %Z, %Y		; <i39> [#uses=1]
+ 	ret i39 %Q
+ }
+ 
+ define i1 @test20(i33 %g, i33 %h) {
+ 	%tmp.2 = sub i33 %g, %h		; <i33> [#uses=1]
+ 	%tmp.4 = icmp ne i33 %tmp.2, %g		; <i1> [#uses=1]
+ 	ret i1 %tmp.4
+ }
+ 
+ define i1 @test21(i256 %g, i256 %h) {
+ 	%tmp.2 = sub i256 %g, %h	; <i256> [#uses=1]
+ 	%tmp.4 = icmp ne i256 %tmp.2, %g; <i1> [#uses=1]
+ 	ret i1 %tmp.4
+ }


Index: llvm/test/Transforms/InstCombine/APInt/xor1.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/xor1.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/xor1.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,52 ----
+ ; This test makes sure that xor instructions are properly eliminated.
+ ; This test is for Integer BitWidth <= 64 && BitWidth % 8 != 0.
+ 
+ ; RUN: llvm-as < %s | opt -instcombine -disable-output &&
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'xor '
+ 
+ implementation
+ 
+ define i47 @test1(i47 %A, i47 %B) {
+         ;; (A & C1)^(B & C2) -> (A & C1)|(B & C2) iff C1&C2 == 0
+         %A1 = and i47 %A, 70368744177664
+         %B1 = and i47 %B, 70368744177663
+         %C1 = xor i47 %A1, %B1
+         ret i47 %C1
+ }
+ 
+ define i15 @test2(i15 %x) {
+         %tmp.2 = xor i15 %x, 0
+         ret i15 %tmp.2
+ }
+ 
+ define i23 @test3(i23 %x) {
+         %tmp.2 = xor i23 %x, %x
+         ret i23 %tmp.2
+ }
+ 
+ define i37 @test4(i37 %x) {
+         ; x ^ ~x == -1
+         %NotX = xor i37 -1, %x
+         %B = xor i37 %x, %NotX
+         ret i37 %B
+ }
+ 
+ define i7 @test5(i7 %A) {
+         ;; (A|B)^B == A & (~B)
+         %t1 = or i7 %A, 23
+         %r = xor i7 %t1, 23
+         ret i7 %r
+ }
+ 
+ define i7 @test6(i7 %A) {
+         %t1 = xor i7 %A, 23
+         %r = xor i7 %t1, 23
+         ret i7 %r
+ }
+ 
+ define i47 @test7(i47 %A) {
+         ;; (A | C1) ^ C2 -> (A | C1) & ~C2 iff (C1&C2) == C2
+         %B1 = or i47 %A,   70368744177663
+         %C1 = xor i47 %B1, 703687463
+         ret i47 %C1
+ }


Index: llvm/test/Transforms/InstCombine/APInt/xor2.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/xor2.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/xor2.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,52 ----
+ ; This test makes sure that xor instructions are properly eliminated.
+ ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
+ 
+ ; RUN: llvm-as < %s | opt -instcombine -disable-output &&
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | not grep 'xor '
+ 
+ implementation
+ 
+ define i447 @test1(i447 %A, i447 %B) {
+         ;; (A & C1)^(B & C2) -> (A & C1)|(B & C2) iff C1&C2 == 0
+         %A1 = and i447 %A, 70368744177664
+         %B1 = and i447 %B, 70368744177663
+         %C1 = xor i447 %A1, %B1
+         ret i447 %C1
+ }
+ 
+ define i1005 @test2(i1005 %x) {
+         %tmp.2 = xor i1005 %x, 0
+         ret i1005 %tmp.2
+ }
+ 
+ define i123 @test3(i123 %x) {
+         %tmp.2 = xor i123 %x, %x
+         ret i123 %tmp.2
+ }
+ 
+ define i737 @test4(i737 %x) {
+         ; x ^ ~x == -1
+         %NotX = xor i737 -1, %x
+         %B = xor i737 %x, %NotX
+         ret i737 %B
+ }
+ 
+ define i700 @test5(i700 %A) {
+         ;; (A|B)^B == A & (~B)
+         %t1 = or i700 %A, 288230376151711743 
+         %r = xor i700 %t1, 288230376151711743 
+         ret i700 %r
+ }
+ 
+ define i77 @test6(i77 %A) {
+         %t1 = xor i77 %A, 23
+         %r = xor i77 %t1, 23
+         ret i77 %r
+ }
+ 
+ define i1023 @test7(i1023 %A) {
+         ;; (A | C1) ^ C2 -> (A | C1) & ~C2 iff (C1&C2) == C2
+         %B1 = or i1023 %A,   70368744177663
+         %C1 = xor i1023 %B1, 703687463
+         ret i1023 %C1
+ }


Index: llvm/test/Transforms/InstCombine/APInt/zext1.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/zext1.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/zext1.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,10 ----
+ ; Tests to make sure elimination of casts is working correctly
+ ; This test is for Integer BitWidth <= 64 && BitWidth % 2 != 0.
+ ; RUN: llvm-as < %s | opt -instcombine -disable-output &&
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast '' '%c1.*'
+ 
+ define i47 @test_sext_zext(i11 %A) {
+     %c1 = zext i11 %A to i39
+     %c2 = sext i39 %c1 to i47
+     ret i47 %c2
+ }


Index: llvm/test/Transforms/InstCombine/APInt/zext2.ll
diff -c /dev/null llvm/test/Transforms/InstCombine/APInt/zext2.ll:1.1
*** /dev/null	Fri Mar 23 15:48:57 2007
--- llvm/test/Transforms/InstCombine/APInt/zext2.ll	Fri Mar 23 15:48:34 2007
***************
*** 0 ****
--- 1,10 ----
+ ; Tests to make sure elimination of casts is working correctly
+ ; This test is for Integer BitWidth > 64 && BitWidth <= 1024.
+ ; RUN: llvm-as < %s | opt -instcombine -disable-output &&
+ ; RUN: llvm-as < %s | opt -instcombine | llvm-dis | notcast '' '%c1.*'
+ 
+ define i1024 @test_sext_zext(i77 %A) {
+     %c1 = zext i77 %A to i533
+     %c2 = sext i533 %c1 to i1024
+     ret i1024 %c2
+ }





From lauro.venancio at gmail.com  Fri Mar 23 15:55:08 2007
From: lauro.venancio at gmail.com (Lauro Ramos Venancio)
Date: Fri, 23 Mar 2007 15:55:08 -0500
Subject: [llvm-commits] CVS:
	llvm-test/MultiSource/Applications/JM/ldecod/cabac.c global.h
	loopFilter.c macroblock.c mbuffer.h vlc.c vlc.h
Message-ID: <200703232055.l2NKt8wJ011057@zion.cs.uiuc.edu>



Changes in directory llvm-test/MultiSource/Applications/JM/ldecod:

cabac.c updated: 1.4 -> 1.5
global.h updated: 1.6 -> 1.7
loopFilter.c updated: 1.4 -> 1.5
macroblock.c updated: 1.4 -> 1.5
mbuffer.h updated: 1.4 -> 1.5
vlc.c updated: 1.4 -> 1.5
vlc.h updated: 1.4 -> 1.5
---
Log message:

"The C standards do say that "char" may either be a "signed char" or "unsigned 
char" and it is up to the compilers implementation or the platform which is 
followed."
http://www.arm.linux.org.uk/docs/faqs/signedchar.php




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

 cabac.c      |    2 +-
 global.h     |    4 ++--
 loopFilter.c |    6 +++---
 macroblock.c |   24 ++++++++++++------------
 mbuffer.h    |    8 ++++----
 vlc.c        |    2 +-
 vlc.h        |    2 +-
 7 files changed, 24 insertions(+), 24 deletions(-)


Index: llvm-test/MultiSource/Applications/JM/ldecod/cabac.c
diff -u llvm-test/MultiSource/Applications/JM/ldecod/cabac.c:1.4 llvm-test/MultiSource/Applications/JM/ldecod/cabac.c:1.5
--- llvm-test/MultiSource/Applications/JM/ldecod/cabac.c:1.4	Thu Feb  8 16:38:32 2007
+++ llvm-test/MultiSource/Applications/JM/ldecod/cabac.c	Fri Mar 23 15:54:51 2007
@@ -873,7 +873,7 @@
   int   a, b;
   int   act_ctx;
   int   act_sym;
-  char** refframe_array = dec_picture->ref_idx[se->value2];
+  signed char** refframe_array = dec_picture->ref_idx[se->value2];
   int   b8a, b8b;
 
   PixelPos block_a, block_b;


Index: llvm-test/MultiSource/Applications/JM/ldecod/global.h
diff -u llvm-test/MultiSource/Applications/JM/ldecod/global.h:1.6 llvm-test/MultiSource/Applications/JM/ldecod/global.h:1.7
--- llvm-test/MultiSource/Applications/JM/ldecod/global.h:1.6	Thu Feb  8 16:40:47 2007
+++ llvm-test/MultiSource/Applications/JM/ldecod/global.h	Fri Mar 23 15:54:51 2007
@@ -327,8 +327,8 @@
   int           is_skip;
 
   int           i16mode;
-  char          b8mode[4];
-  char          b8pdir[4];
+  signed char   b8mode[4];
+  signed char   b8pdir[4];
   int           ei_flag;
 
   int           LFDisableIdc;


Index: llvm-test/MultiSource/Applications/JM/ldecod/loopFilter.c
diff -u llvm-test/MultiSource/Applications/JM/ldecod/loopFilter.c:1.4 llvm-test/MultiSource/Applications/JM/ldecod/loopFilter.c:1.5
--- llvm-test/MultiSource/Applications/JM/ldecod/loopFilter.c:1.4	Thu Feb  8 16:38:32 2007
+++ llvm-test/MultiSource/Applications/JM/ldecod/loopFilter.c	Fri Mar 23 15:54:51 2007
@@ -52,7 +52,7 @@
   { 0, 9,12,18,18},{ 0,10,13,20,20},{ 0,11,15,23,23},{ 0,13,17,25,25}
 } ;
 
-static const char chroma_edge[2][4][4] = //[dir][edge][yuv_format]
+static const signed char chroma_edge[2][4][4] = //[dir][edge][yuv_format]
 { { {-1, 0, 0, 0},
     {-1,-1,-1, 1},
     {-1, 1, 1, 2},
@@ -217,8 +217,8 @@
   int    blk_x, blk_x2, blk_y, blk_y2 ;
   short  ***list0_mv = p->mv[LIST_0];
   short  ***list1_mv = p->mv[LIST_1];
-  char   **list0_refIdxArr = p->ref_idx[LIST_0];
-  char   **list1_refIdxArr = p->ref_idx[LIST_1];
+  signed char **list0_refIdxArr = p->ref_idx[LIST_0];
+  signed char **list1_refIdxArr = p->ref_idx[LIST_1];
   int64  **list0_refPicIdArr = p->ref_pic_id[LIST_0];
   int64  **list1_refPicIdArr = p->ref_pic_id[LIST_1];
   int64    ref_p0,ref_p1,ref_q0,ref_q1;


Index: llvm-test/MultiSource/Applications/JM/ldecod/macroblock.c
diff -u llvm-test/MultiSource/Applications/JM/ldecod/macroblock.c:1.4 llvm-test/MultiSource/Applications/JM/ldecod/macroblock.c:1.5
--- llvm-test/MultiSource/Applications/JM/ldecod/macroblock.c:1.4	Thu Feb  8 16:38:32 2007
+++ llvm-test/MultiSource/Applications/JM/ldecod/macroblock.c	Fri Mar 23 15:54:51 2007
@@ -53,9 +53,9 @@
 
 static void SetMotionVectorPredictor (struct img_par  *img,
                                       short           pmv[2],
-                                      char            ref_frame,
+                                      signed char     ref_frame,
                                       byte            list,
-                                      char            ***refPic,
+                                      signed char     ***refPic,
                                       short           ****tmp_mv,
                                       int             block_x,
                                       int             block_y,
@@ -1266,9 +1266,9 @@
  */
 static void SetMotionVectorPredictor (struct img_par  *img,
                                       short           pmv[2],
-                                      char            ref_frame,
+                                      signed char     ref_frame,
                                       byte            list,
-                                      char            ***refPic,
+                                      signed char     ***refPic,
                                       short           ****tmp_mv,
                                       int             block_x,
                                       int             block_y,
@@ -1501,7 +1501,7 @@
   int step_v0         = BLOCK_STEP [partmode][1];
 
   int mv_mode, i0, j0;
-  char refframe;
+  signed char refframe;
   short pmv[2];
   int j4, i4, ii,jj;
   int vec;
@@ -1514,7 +1514,7 @@
 
   byte  **    moving_block;
   short ****  co_located_mv;
-  char  ***   co_located_ref_idx;
+  signed char *** co_located_ref_idx;
   int64 ***   co_located_ref_id;
 
   if ((img->MbaffFrameFlag)&&(currMB->mb_field))
@@ -1552,7 +1552,7 @@
 
       PixelPos mb_left, mb_up, mb_upleft, mb_upright;
 
-      char  l0_rFrame,l1_rFrame;
+      signed char  l0_rFrame,l1_rFrame;
       short pmvl0[2]={0,0}, pmvl1[2]={0,0};
 
       getLuma4x4Neighbour(img->current_mb_nr, -1,  0, &mb_left);
@@ -2353,7 +2353,7 @@
   int numones, totzeros, level, cdc=0, cac=0;
   int zerosleft, ntr, dptype = 0;
   int max_coeff_num = 0, nnz;
-  char type[15];
+  signed char type[15];
   static int incVlc[] = {0,3,6,12,24,48,32768};    // maximum vlc = 6
 
   numcoeff = 0;
@@ -3858,7 +3858,7 @@
 
   int jf;
 
-  char l0_rFrame = -1, l1_rFrame = -1;
+  signed char l0_rFrame = -1, l1_rFrame = -1;
 
   short pmvl0[2]={0,0},
         pmvl1[2]={0,0};
@@ -3869,7 +3869,7 @@
 
   byte  **    moving_block;
   short ****  co_located_mv;
-  char  ***   co_located_ref_idx;
+  signed char *** co_located_ref_idx;
   int64 ***   co_located_ref_id;
 
   int need_4x4_transform = (!currMB->luma_transform_size_8x8_flag);
@@ -3976,8 +3976,8 @@
   if (img->type==B_SLICE && img->direct_spatial_mv_pred_flag && (IS_DIRECT (currMB) ||
     (IS_P8x8(currMB) && !(currMB->b8mode[0] && currMB->b8mode[1] && currMB->b8mode[2] && currMB->b8mode[3]))))
   {
-    char l0_rFrameL, l0_rFrameU, l0_rFrameUL, l0_rFrameUR;
-    char l1_rFrameL, l1_rFrameU, l1_rFrameUL, l1_rFrameUR;
+    signed char l0_rFrameL, l0_rFrameU, l0_rFrameUL, l0_rFrameUR;
+    signed char l1_rFrameL, l1_rFrameU, l1_rFrameUL, l1_rFrameUR;
 
     PixelPos mb_left, mb_up, mb_upleft, mb_upright;
 


Index: llvm-test/MultiSource/Applications/JM/ldecod/mbuffer.h
diff -u llvm-test/MultiSource/Applications/JM/ldecod/mbuffer.h:1.4 llvm-test/MultiSource/Applications/JM/ldecod/mbuffer.h:1.5
--- llvm-test/MultiSource/Applications/JM/ldecod/mbuffer.h:1.4	Thu Feb  8 16:38:32 2007
+++ llvm-test/MultiSource/Applications/JM/ldecod/mbuffer.h	Fri Mar 23 15:54:51 2007
@@ -66,7 +66,7 @@
 
   short **     slice_id;      //!< reference picture   [mb_x][mb_y]
 
-  char  ***    ref_idx;       //!< reference picture   [list][subblock_y][subblock_x]
+  signed char *** ref_idx;       //!< reference picture   [list][subblock_y][subblock_x]
 
   int64 ***    ref_pic_id;    //!< reference picture identifier [list][subblock_y][subblock_x]
                               //   (not  simply index)
@@ -115,21 +115,21 @@
 
   int64       ref_pic_num[6][MAX_LIST_SIZE];
 
-  char  ***   ref_idx;       //!< reference picture   [list][subblock_y][subblock_x]
+  signed char *** ref_idx;       //!< reference picture   [list][subblock_y][subblock_x]
   int64 ***   ref_pic_id;    //!< reference picture identifier [list][subblock_y][subblock_x]
   short ****  mv;            //!< motion vector       [list][subblock_y][subblock_x][component]
   byte  **    moving_block;
 
   // Top field params
   int64       top_ref_pic_num[6][MAX_LIST_SIZE];
-  char  ***   top_ref_idx;       //!< reference picture   [list][subblock_y][subblock_x]
+  signed char *** top_ref_idx;       //!< reference picture   [list][subblock_y][subblock_x]
   int64 ***   top_ref_pic_id;    //!< reference picture identifier [list][subblock_y][subblock_x]
   short ****  top_mv;            //!< motion vector       [list][subblock_y][subblock_x][component]
   byte **     top_moving_block;
 
   // Bottom field params
   int64       bottom_ref_pic_num[6][MAX_LIST_SIZE];
-  char  ***   bottom_ref_idx;       //!< reference picture   [list][subblock_y][subblock_x]
+  signed char *** bottom_ref_idx;       //!< reference picture   [list][subblock_y][subblock_x]
   int64 ***   bottom_ref_pic_id;    //!< reference picture identifier [list][subblock_y][subblock_x]
   short ****  bottom_mv;            //!< motion vector       [list][subblock_y][subblock_x][component]
   byte **     bottom_moving_block;


Index: llvm-test/MultiSource/Applications/JM/ldecod/vlc.c
diff -u llvm-test/MultiSource/Applications/JM/ldecod/vlc.c:1.4 llvm-test/MultiSource/Applications/JM/ldecod/vlc.c:1.5
--- llvm-test/MultiSource/Applications/JM/ldecod/vlc.c:1.4	Thu Feb  8 16:38:32 2007
+++ llvm-test/MultiSource/Applications/JM/ldecod/vlc.c	Fri Mar 23 15:54:51 2007
@@ -685,7 +685,7 @@
  */
 
 int readSyntaxElement_NumCoeffTrailingOnes(SyntaxElement *sym,  DataPartition *dP,
-                                           char *type)
+                                           signed char *type)
 {
   Bitstream   *currStream = dP->bitstream;
   int frame_bitoffset = currStream->frame_bitoffset;


Index: llvm-test/MultiSource/Applications/JM/ldecod/vlc.h
diff -u llvm-test/MultiSource/Applications/JM/ldecod/vlc.h:1.4 llvm-test/MultiSource/Applications/JM/ldecod/vlc.h:1.5
--- llvm-test/MultiSource/Applications/JM/ldecod/vlc.h:1.4	Thu Feb  8 16:38:32 2007
+++ llvm-test/MultiSource/Applications/JM/ldecod/vlc.h	Fri Mar 23 15:54:51 2007
@@ -38,7 +38,7 @@
 
 int readSyntaxElement_FLC(SyntaxElement *sym, Bitstream *currStream);
 int readSyntaxElement_NumCoeffTrailingOnes(SyntaxElement *sym,  DataPartition *dP,
-                                           char *type);
+                                           signed char *type);
 int readSyntaxElement_NumCoeffTrailingOnesChromaDC(SyntaxElement *sym,  DataPartition *dP);
 int readSyntaxElement_Level_VLC0(SyntaxElement *sym, struct datapartition *dP);
 int readSyntaxElement_Level_VLCN(SyntaxElement *sym, int vlc, struct datapartition *dP);





From evan.cheng at apple.com  Fri Mar 23 15:55:38 2007
From: evan.cheng at apple.com (Evan Cheng)
Date: Fri, 23 Mar 2007 15:55:38 -0500
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
Message-ID: <200703232055.l2NKtc52011075@zion.cs.uiuc.edu>



Changes in directory llvm/lib/CodeGen/SelectionDAG:

DAGCombiner.cpp updated: 1.278 -> 1.279
---
Log message:

Also replace uses of SRL if that's also folded during ReduceLoadWidth().

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

 DAGCombiner.cpp |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)


Index: llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.278 llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.279
--- llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp:1.278	Thu Mar 22 21:16:52 2007
+++ llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp	Fri Mar 23 15:55:21 2007
@@ -2279,6 +2279,7 @@
 
   unsigned EVTBits = MVT::getSizeInBits(EVT);
   unsigned ShAmt = 0;
+  bool CombineSRL =  false;
   if (N0.getOpcode() == ISD::SRL && N0.hasOneUse()) {
     if (ConstantSDNode *N01 = dyn_cast<ConstantSDNode>(N0.getOperand(1))) {
       ShAmt = N01->getValue();
@@ -2288,6 +2289,7 @@
         if (MVT::getSizeInBits(N0.getValueType()) <= EVTBits)
           return SDOperand();
         ShAmt /= 8;
+        CombineSRL = true;
       }
     }
   }
@@ -2317,7 +2319,12 @@
       : DAG.getExtLoad(ExtType, VT, LN0->getChain(), NewPtr,
                        LN0->getSrcValue(), LN0->getSrcValueOffset(), EVT);
     AddToWorkList(N);
-    CombineTo(N0.Val, Load, Load.getValue(1));
+    if (CombineSRL) {
+      std::vector<SDNode*> NowDead;
+      DAG.ReplaceAllUsesOfValueWith(N0.getValue(1), Load.getValue(1), NowDead);
+      CombineTo(N->getOperand(0).Val, Load);
+    } else
+      CombineTo(N0.Val, Load, Load.getValue(1));
     if (ShAmt)
       return DAG.getNode(N->getOpcode(), VT, Load);
     return SDOperand(N, 0);   // Return N so it doesn't get rechecked!





From clattner at apple.com  Fri Mar 23 16:05:25 2007
From: clattner at apple.com (Chris Lattner)
Date: Fri, 23 Mar 2007 14:05:25 -0700
Subject: [llvm-commits] CVS:
	llvm/include/llvm/CodeGen/MachineBasicBlock.h MachineConstantPool.h
	MachineInstrBuilder.h	MachineJumpTableInfo.h
	MachineLocation.h SelectionDAGISel.h	SelectionDAGNodes.h
In-Reply-To: <200703231844.l2NIialR024437@zion.cs.uiuc.edu>
References: <200703231844.l2NIialR024437@zion.cs.uiuc.edu>
Message-ID: <243647FF-07B6-4182-8B48-AE685D08F3EC@apple.com>

On Mar 23, 2007, at 11:44 AM, Dan Gohman wrote:
> Add the 'explicit' keyword to several constructors that accept one
> argument that don't appear intended as implicit-conversion operators.

Nice.  How did you find these?  Did you just inspect the code, or do  
you have a tool that finds them?

-Chris

>
> ---
> Diffs of the changes:  (+16 -13)
>
>  MachineBasicBlock.h    |    7 ++++---
>  MachineConstantPool.h  |    2 +-
>  MachineInstrBuilder.h  |    2 +-
>  MachineJumpTableInfo.h |    3 ++-
>  MachineLocation.h      |    2 +-
>  SelectionDAGISel.h     |    3 ++-
>  SelectionDAGNodes.h    |   10 +++++-----
>  7 files changed, 16 insertions(+), 13 deletions(-)
>
>
> Index: llvm/include/llvm/CodeGen/MachineBasicBlock.h
> diff -u llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.61 llvm/ 
> include/llvm/CodeGen/MachineBasicBlock.h:1.62
> --- llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.61	Wed Feb 28  
> 20:00:40 2007
> +++ llvm/include/llvm/CodeGen/MachineBasicBlock.h	Fri Mar 23  
> 13:44:11 2007
> @@ -79,9 +79,10 @@
>    bool IsLandingPad;
>
>  public:
> -  MachineBasicBlock(const BasicBlock *bb = 0) : Prev(0), Next(0),  
> BB(bb),
> -                                                Number(-1), Parent 
> (0),
> -                                                IsLandingPad(false) {
> +  explicit MachineBasicBlock(const BasicBlock *bb = 0) : Prev(0),  
> Next(0),
> +                                                         BB(bb),  
> Number(-1),
> +                                                         Parent(0),
> +                                                          
> IsLandingPad(false) {
>      Insts.parent = this;
>    }
>
>
>
> Index: llvm/include/llvm/CodeGen/MachineConstantPool.h
> diff -u llvm/include/llvm/CodeGen/MachineConstantPool.h:1.25 llvm/ 
> include/llvm/CodeGen/MachineConstantPool.h:1.26
> --- llvm/include/llvm/CodeGen/MachineConstantPool.h:1.25	Sat Dec 16  
> 23:15:12 2006
> +++ llvm/include/llvm/CodeGen/MachineConstantPool.h	Fri Mar 23  
> 13:44:11 2007
> @@ -35,7 +35,7 @@
>    const Type *Ty;
>
>  public:
> -  MachineConstantPoolValue(const Type *ty) : Ty(ty) {}
> +  explicit MachineConstantPoolValue(const Type *ty) : Ty(ty) {}
>    virtual ~MachineConstantPoolValue() {};
>
>    /// getType - get type of this MachineConstantPoolValue.
>
>
> Index: llvm/include/llvm/CodeGen/MachineInstrBuilder.h
> diff -u llvm/include/llvm/CodeGen/MachineInstrBuilder.h:1.43 llvm/ 
> include/llvm/CodeGen/MachineInstrBuilder.h:1.44
> --- llvm/include/llvm/CodeGen/MachineInstrBuilder.h:1.43	Wed Feb 14  
> 20:52:40 2007
> +++ llvm/include/llvm/CodeGen/MachineInstrBuilder.h	Fri Mar 23  
> 13:44:11 2007
> @@ -27,7 +27,7 @@
>  class MachineInstrBuilder {
>    MachineInstr *MI;
>  public:
> -  MachineInstrBuilder(MachineInstr *mi) : MI(mi) {}
> +  explicit MachineInstrBuilder(MachineInstr *mi) : MI(mi) {}
>
>    /// Allow automatic conversion to the machine instruction we are  
> working on.
>    ///
>
>
> Index: llvm/include/llvm/CodeGen/MachineJumpTableInfo.h
> diff -u llvm/include/llvm/CodeGen/MachineJumpTableInfo.h:1.11 llvm/ 
> include/llvm/CodeGen/MachineJumpTableInfo.h:1.12
> --- llvm/include/llvm/CodeGen/MachineJumpTableInfo.h:1.11	Sat Dec  
> 16 23:15:12 2006
> +++ llvm/include/llvm/CodeGen/MachineJumpTableInfo.h	Fri Mar 23  
> 13:44:11 2007
> @@ -34,7 +34,8 @@
>    /// MBBs - The vector of basic blocks from which to create the  
> jump table.
>    std::vector<MachineBasicBlock*> MBBs;
>
> -  MachineJumpTableEntry(const std::vector<MachineBasicBlock*>  
> &M) : MBBs(M) {}
> +  explicit MachineJumpTableEntry(const  
> std::vector<MachineBasicBlock*> &M)
> +  : MBBs(M) {}
>  };
>
>  class MachineJumpTableInfo {
>
>
> Index: llvm/include/llvm/CodeGen/MachineLocation.h
> diff -u llvm/include/llvm/CodeGen/MachineLocation.h:1.3 llvm/ 
> include/llvm/CodeGen/MachineLocation.h:1.4
> --- llvm/include/llvm/CodeGen/MachineLocation.h:1.3	Wed Jan 24  
> 12:45:12 2007
> +++ llvm/include/llvm/CodeGen/MachineLocation.h	Fri Mar 23 13:44:11  
> 2007
> @@ -40,7 +40,7 @@
>    , Register(0)
>    , Offset(0)
>    {}
> -  MachineLocation(unsigned R)
> +  explicit MachineLocation(unsigned R)
>    : IsRegister(true)
>    , Register(R)
>    , Offset(0)
>
>
> Index: llvm/include/llvm/CodeGen/SelectionDAGISel.h
> diff -u llvm/include/llvm/CodeGen/SelectionDAGISel.h:1.33 llvm/ 
> include/llvm/CodeGen/SelectionDAGISel.h:1.34
> --- llvm/include/llvm/CodeGen/SelectionDAGISel.h:1.33	Wed Mar  7  
> 10:25:08 2007
> +++ llvm/include/llvm/CodeGen/SelectionDAGISel.h	Fri Mar 23  
> 13:44:11 2007
> @@ -42,7 +42,8 @@
>    std::vector<SDNode*> TopOrder;
>    unsigned DAGSize;
>
> -  SelectionDAGISel(TargetLowering &tli) : TLI(tli), DAGSize(0), JT 
> (0,0,0,0) {}
> +  explicit SelectionDAGISel(TargetLowering &tli)
> +  : TLI(tli), DAGSize(0), JT(0,0,0,0) {}
>
>    TargetLowering &getTargetLowering() { return TLI; }
>
>
>
> Index: llvm/include/llvm/CodeGen/SelectionDAGNodes.h
> diff -u llvm/include/llvm/CodeGen/SelectionDAGNodes.h:1.181 llvm/ 
> include/llvm/CodeGen/SelectionDAGNodes.h:1.182
> --- llvm/include/llvm/CodeGen/SelectionDAGNodes.h:1.181	Wed Mar  7  
> 10:25:08 2007
> +++ llvm/include/llvm/CodeGen/SelectionDAGNodes.h	Fri Mar 23  
> 13:44:11 2007
> @@ -1075,7 +1075,7 @@
>    virtual void ANCHOR();  // Out-of-line virtual method to give  
> class a home.
>    SDOperand Op;
>  public:
> -  HandleSDNode(SDOperand X)
> +  explicit HandleSDNode(SDOperand X)
>      : SDNode(ISD::HANDLENODE, getSDVTList(MVT::Other)), Op(X) {
>      InitOperands(&Op, 1);
>    }
> @@ -1088,7 +1088,7 @@
>    virtual void ANCHOR();  // Out-of-line virtual method to give  
> class a home.
>  protected:
>    friend class SelectionDAG;
> -  StringSDNode(const std::string &val)
> +  explicit StringSDNode(const std::string &val)
>      : SDNode(ISD::STRING, getSDVTList(MVT::Other)), Value(val) {
>    }
>  public:
> @@ -1298,7 +1298,7 @@
>    virtual void ANCHOR();  // Out-of-line virtual method to give  
> class a home.
>  protected:
>    friend class SelectionDAG;
> -  BasicBlockSDNode(MachineBasicBlock *mbb)
> +  explicit BasicBlockSDNode(MachineBasicBlock *mbb)
>      : SDNode(ISD::BasicBlock, getSDVTList(MVT::Other)), MBB(mbb) {
>    }
>  public:
> @@ -1375,7 +1375,7 @@
>    virtual void ANCHOR();  // Out-of-line virtual method to give  
> class a home.
>  protected:
>    friend class SelectionDAG;
> -  CondCodeSDNode(ISD::CondCode Cond)
> +  explicit CondCodeSDNode(ISD::CondCode Cond)
>      : SDNode(ISD::CONDCODE, getSDVTList(MVT::Other)), Condition 
> (Cond) {
>    }
>  public:
> @@ -1395,7 +1395,7 @@
>    virtual void ANCHOR();  // Out-of-line virtual method to give  
> class a home.
>  protected:
>    friend class SelectionDAG;
> -  VTSDNode(MVT::ValueType VT)
> +  explicit VTSDNode(MVT::ValueType VT)
>      : SDNode(ISD::VALUETYPE, getSDVTList(MVT::Other)), ValueType 
> (VT) {
>    }
>  public:
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From reid at x10sys.com  Fri Mar 23 16:25:16 2007
From: reid at x10sys.com (Reid Spencer)
Date: Fri, 23 Mar 2007 16:25:16 -0500
Subject: [llvm-commits] CVS:
	llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200703232125.l2NLPGqp011670@zion.cs.uiuc.edu>



Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.680 -> 1.681
---
Log message:

For PR1205: http://llvm.org/PR1205 :
* APIntify visitAdd and visitSelectInst
* Remove unused uint64_t versions of utility functions that have been 
  replaced with APInt versions.
This completes most of the changes for APIntification of InstCombine. This
passes llvm-test and llvm/test/Transforms/InstCombine/APInt.

Patch by Zhou Sheng.


---
Diffs of the changes:  (+165 -890)

 InstructionCombining.cpp | 1055 +++++++----------------------------------------
 1 files changed, 165 insertions(+), 890 deletions(-)


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.680 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.681
--- llvm/lib/Transforms/Scalar/InstructionCom