[llvm-commits] CVS: llvm/lib/Bytecode/Writer/SlotCalculator.cpp Writer.cpp

[Chris Lattner]

Changes in directory llvm/lib/Bytecode/Writer:

SlotCalculator.cpp updated: 1.65 -> 1.66
Writer.cpp updated: 1.91 -> 1.92
---
Log message:

Check in some patches for better assertions



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

Index: llvm/lib/Bytecode/Writer/SlotCalculator.cpp
diff -u llvm/lib/Bytecode/Writer/SlotCalculator.cpp:1.65 llvm/lib/Bytecode/Writer/SlotCalculator.cpp:1.66
--- llvm/lib/Bytecode/Writer/SlotCalculator.cpp:1.65	Sat Oct 23 23:27:59 2004
+++ llvm/lib/Bytecode/Writer/SlotCalculator.cpp	Sat Dec  4 15:28:47 2004
@@ -691,6 +691,9 @@
   int SlotNo = getSlot(V);        // Check to see if it's already in!
   if (SlotNo != -1) return SlotNo;
 
+  if (const GlobalValue *GV = dyn_cast<GlobalValue>(V))
+    assert(GV->getParent() != 0 && "Global not embedded into a module!");
+
   if (!isa<GlobalValue>(V))  // Initializers for globals are handled explicitly
     if (const Constant *C = dyn_cast<Constant>(V)) {
       assert(CompactionNodeMap.empty() &&


Index: llvm/lib/Bytecode/Writer/Writer.cpp
diff -u llvm/lib/Bytecode/Writer/Writer.cpp:1.91 llvm/lib/Bytecode/Writer/Writer.cpp:1.92
--- llvm/lib/Bytecode/Writer/Writer.cpp:1.91	Thu Nov 25 13:38:05 2004
+++ llvm/lib/Bytecode/Writer/Writer.cpp	Sat Dec  4 15:28:47 2004
@@ -295,6 +295,7 @@
   if (const ConstantExpr *CE = dyn_cast<ConstantExpr>(CPV)) {
     // FIXME: Encoding of constant exprs could be much more compact!
     assert(CE->getNumOperands() > 0 && "ConstantExpr with 0 operands");
+    assert(CE->getNumOperands() != 1 || CE->getOpcode() == Instruction::Cast);
     output_vbr(1+CE->getNumOperands());   // flags as an expr
     output_vbr(CE->getOpcode());        // flags as an expr