2 files changed, 7 insertions, 10 deletions
diff --git a/include/llvm/Analysis/SlotCalculator.h b/include/llvm/Analysis/SlotCalculator.h
index c371a0e..42f2297 100644
--- a/include/llvm/Analysis/SlotCalculator.h
+++ b/include/llvm/Analysis/SlotCalculator.h
@@ -34,12 +34,6 @@ class ConstantArray;
 class SlotCalculator {
   const Module *TheModule;
 
-  /// BuildBytecodeInfo - If true, this is the creating information for the
-  /// bytecode writer, if false, we are building information for the assembly
-  /// emitter.  The assembly emitter doesn't need named objects numbered, among
-  /// other differences.
-  bool BuildBytecodeInfo;
-
   typedef std::vector<const Value*> TypePlane;
   std::vector<TypePlane> Table;
   std::map<const Value*, unsigned> NodeMap;
@@ -68,9 +62,9 @@ class SlotCalculator {
   SlotCalculator(const SlotCalculator &);  // DO NOT IMPLEMENT
   void operator=(const SlotCalculator &);  // DO NOT IMPLEMENT
 public:
-  SlotCalculator(const Module *M, bool BuildBytecodeInfo);
+  SlotCalculator(const Module *M );
   // Start out in incorp state
-  SlotCalculator(const Function *F, bool BuildBytecodeInfo);
+  SlotCalculator(const Function *F );
   
   /// getSlot - Return the slot number of the specified value in it's type
   /// plane.  This returns < 0 on error!
diff --git a/include/llvm/Assembly/CachedWriter.h b/include/llvm/Assembly/CachedWriter.h
index 27193e7..b3f572f 100644
--- a/include/llvm/Assembly/CachedWriter.h
+++ b/include/llvm/Assembly/CachedWriter.h
@@ -20,16 +20,19 @@
 #include "llvm/Value.h"
 #include <iostream>
 
+namespace {
+class SlotMachine;     // Internal private class
+}
+
 namespace llvm {
 
 class Module;
 class PointerType;
-class SlotCalculator;
 class AssemblyWriter;  // Internal private class
 
 class CachedWriter {
   AssemblyWriter *AW;
-  SlotCalculator *SC;
+  SlotMachine *SC;
   bool SymbolicTypes;
   std::ostream *Out;