[llvm-commits] CVS: llvm/lib/Bytecode/Reader/Reader.cpp ReaderInternals.h

[Chris Lattner]

Changes in directory llvm/lib/Bytecode/Reader:

Reader.cpp updated: 1.97 -> 1.98
ReaderInternals.h updated: 1.74 -> 1.75

---
Log message:

Bytecode format for LLVM 1.2 no longer explicitly encodes zeros in primitive
type planes.  This saves about 5k on 176.gcc, and is needed for a subsequent
patch of mine I'm working on.


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

Index: llvm/lib/Bytecode/Reader/Reader.cpp
diff -u llvm/lib/Bytecode/Reader/Reader.cpp:1.97 llvm/lib/Bytecode/Reader/Reader.cpp:1.98
--- llvm/lib/Bytecode/Reader/Reader.cpp:1.97	Thu Jan 15 12:45:25 2004
+++ llvm/lib/Bytecode/Reader/Reader.cpp	Sat Jan 17 17:25:26 2004
@@ -66,10 +66,17 @@
   throw std::string("Illegal type reference!");
 }
 
+static inline bool hasImplicitNull(unsigned TyID, bool EncodesPrimitiveZeros) {
+  if (!EncodesPrimitiveZeros)
+    return TyID != Type::LabelTyID && TyID != Type::TypeTyID &&
+           TyID != Type::VoidTyID;
+  return TyID >= Type::FirstDerivedTyID;
+}
+
 unsigned BytecodeParser::insertValue(Value *Val, unsigned type,
                                      ValueTable &ValueTab) {
-  assert((!isa<Constant>(Val) || Val->getType()->isPrimitiveType() ||
-          !cast<Constant>(Val)->isNullValue()) &&
+  assert((!isa<Constant>(Val) || !cast<Constant>(Val)->isNullValue()) ||
+          !hasImplicitNull(type, hasExplicitPrimitiveZeros) &&
          "Cannot read null values from bytecode!");
   assert(type != Type::TypeTyID && "Types should never be insertValue'd!");
 
@@ -88,13 +95,12 @@
   return ValueTab[type]->size()-1 + HasOffset;
 }
 
-
 Value *BytecodeParser::getValue(unsigned type, unsigned oNum, bool Create) {
   assert(type != Type::TypeTyID && "getValue() cannot get types!");
   assert(type != Type::LabelTyID && "getValue() cannot get blocks!");
   unsigned Num = oNum;
 
-  if (type >= FirstDerivedTyID) {
+  if (hasImplicitNull(type, hasExplicitPrimitiveZeros)) {
     if (Num == 0)
       return Constant::getNullValue(getType(type));
     --Num;
@@ -536,6 +542,7 @@
   hasOldStyleVarargs = false;
   hasVarArgCallPadding = false;
   hasInconsistentModuleGlobalInfo = false;
+  hasExplicitPrimitiveZeros = false;
   FirstDerivedTyID = 14;
 
   switch (RevisionNum) {
@@ -545,16 +552,15 @@
     hasExtendedLinkageSpecs = false;
     hasOldStyleVarargs = true;
     hasVarArgCallPadding = true;
-    hasInconsistentModuleGlobalInfo = true;
-
-    break;
+    // FALL THROUGH
   case 0:               //  LLVM 1.0, 1.1 release version
     // Compared to rev #2, we added support for weak linkage, a more dense
     // encoding, and better varargs support.
 
     // Base LLVM 1.0 bytecode format.
     hasInconsistentModuleGlobalInfo = true;
-    break;
+    hasExplicitPrimitiveZeros = true;
+    // FALL THROUGH
   case 1:               // LLVM 1.2 release version
     // LLVM 1.2 added explicit support for emitting strings efficiently.
 


Index: llvm/lib/Bytecode/Reader/ReaderInternals.h
diff -u llvm/lib/Bytecode/Reader/ReaderInternals.h:1.74 llvm/lib/Bytecode/Reader/ReaderInternals.h:1.75
--- llvm/lib/Bytecode/Reader/ReaderInternals.h:1.74	Thu Jan 15 11:55:01 2004
+++ llvm/lib/Bytecode/Reader/ReaderInternals.h	Sat Jan 17 17:25:26 2004
@@ -97,9 +97,15 @@
 
   bool usesOldStyleVarargs;         // Does this module USE old style varargs?
 
-  // LLVM 1.0 & 1.1 had an explicit alignment of data only for the
-  // ModuleGlobalInfo block.  This was fixed to be like all other blocks in 1.2
+  // Flags to distinguish LLVM 1.0 & 1.1 bytecode formats (revision #0)
+
+  // Revision #0 had an explicit alignment of data only for the ModuleGlobalInfo
+  // block.  This was fixed to be like all other blocks in 1.2
   bool hasInconsistentModuleGlobalInfo;
+
+  // Revision #0 also explicitly encoded zero values for primitive types like
+  // int/sbyte/etc.
+  bool hasExplicitPrimitiveZeros;
 
   typedef std::vector<ValueList*> ValueTable;
   ValueTable Values;