Unbreak VC++ build.

llvm-svn: 31464

include/llvm/ADT/FoldingSet.h

@@ -16,7 +16,9 @@
 #ifndef LLVM_ADT_FOLDINGSET_H
 #define LLVM_ADT_FOLDINGSET_H
 
+#include "llvm/Support/DataTypes.h"
 #include "llvm/ADT/SmallVector.h"
+#include <string>
 
 namespace llvm {
 

include/llvm/Analysis/Dominators.h

@@ -304,9 +304,9 @@ protected:
   Node *RootNode;
 public:
   class Node {
-    friend struct DominatorTree;
+    friend class DominatorTree;
     friend struct PostDominatorTree;
-    friend struct DominatorTreeBase;
+    friend class DominatorTreeBase;
     BasicBlock *TheBB;
     Node *IDom;
     std::vector<Node*> Children;

include/llvm/Analysis/LoopInfo.h

@@ -35,7 +35,7 @@
 
 namespace llvm {
 
-struct ETForest;
+class ETForest;
 class LoopInfo;
 class PHINode;
 class Instruction;

include/llvm/Bytecode/Archive.h

@@ -95,7 +95,7 @@ class ArchiveMember {
 
     /// @returns the size of the archive member in bytes.
     /// @brief Get the size of the archive member.
-    unsigned getSize() const             { return info.getSize(); }
+    uint64_t getSize() const             { return info.getSize(); }
 
     /// This method returns the total size of the archive member as it
     /// appears on disk. This includes the file content, the header, the

include/llvm/CodeGen/MachineConstantPool.h

@@ -61,7 +61,8 @@ inline std::ostream &operator<<(std::ostream &OS,
 /// It contains a pointer to the value and an offset from the start of
 /// the constant pool.
 /// @brief An entry in a MachineConstantPool
-struct MachineConstantPoolEntry {
+class MachineConstantPoolEntry {
+public:
   /// The constant itself.
   union {
     Constant *ConstVal;

include/llvm/CodeGen/SelectionDAG.h

@@ -322,9 +322,9 @@ public:
 
   /// getStore - Helper function to build ISD::STORE nodes.
   ///
-  SDOperand getStore(SDOperand Chain, SDOperand Value, SDOperand Ptr,
+  SDOperand getStore(SDOperand Chain, SDOperand Val, SDOperand Ptr,
                      const Value *SV, int SVOffset, bool isVolatile=false);
-  SDOperand getTruncStore(SDOperand Chain, SDOperand Value, SDOperand Ptr,
+  SDOperand getTruncStore(SDOperand Chain, SDOperand Val, SDOperand Ptr,
                           const Value *SV, int SVOffset, MVT::ValueType TVT,
                           bool isVolatile=false);
   SDOperand getIndexedStore(SDOperand OrigStoe, SDOperand Base,

include/llvm/Support/Compressor.h

@@ -16,6 +16,7 @@
 
 #include "llvm/Support/DataTypes.h"
 #include <iosfwd>
+#include <string>
 
 namespace llvm {
 

include/llvm/System/Path.h

@@ -47,7 +47,7 @@ namespace sys {
                    group(999), isDir(false) { }
     
     TimeValue getTimestamp() const { return modTime; }
-    size_t getSize() const { return fileSize; }
+    uint64_t getSize() const { return fileSize; }
     uint32_t getMode() const { return mode; }
     uint32_t getUser() const { return user; }
     uint32_t getGroup() const { return group; }

include/llvm/Transforms/Utils/FunctionUtils.h

@@ -18,7 +18,7 @@
 
 namespace llvm {
   class BasicBlock;
-  struct DominatorSet;
+  class DominatorSet;
   class Function;
   class Loop;
 

include/llvm/Transforms/Utils/PromoteMemToReg.h

@@ -20,8 +20,8 @@
 namespace llvm {
 
 class AllocaInst;
-struct DominatorTree;
+class DominatorTree;
-struct DominanceFrontier;
+class DominanceFrontier;
 class TargetData;
 class AliasSetTracker;
 

lib/CodeGen/BranchFolding.cpp

@@ -25,6 +25,7 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/STLExtras.h"
+#include <algorithm>
 using namespace llvm;
 
 static Statistic<> NumDeadBlocks("branchfold", "Number of dead blocks removed");

lib/CodeGen/SelectionDAG/DAGCombiner.cpp

@@ -383,7 +383,7 @@ namespace {
     bool isAlias(SDOperand Ptr1, int64_t Size1,
                  const Value *SrcValue1, int SrcValueOffset1,
                  SDOperand Ptr2, int64_t Size2,
-                 const Value *SrcValue2, int SrcValueOffset1);
+                 const Value *SrcValue2, int SrcValueOffset2);
                  
     /// FindAliasInfo - Extracts the relevant alias information from the memory
     /// node.  Returns true if the operand was a load.

lib/CodeGen/SelectionDAG/SelectionDAG.cpp

@@ -1657,16 +1657,16 @@ SDOperand SelectionDAG::getVecLoad(unsigned Count, MVT::ValueType EVT,
   return getNode(ISD::VLOAD, getVTList(MVT::Vector, MVT::Other), Ops, 5);
 }
 
-SDOperand SelectionDAG::getStore(SDOperand Chain, SDOperand Value,
+SDOperand SelectionDAG::getStore(SDOperand Chain, SDOperand Val,
                                  SDOperand Ptr, const Value *SV, int SVOffset,
                                  bool isVolatile) {
-  MVT::ValueType VT = Value.getValueType();
+  MVT::ValueType VT = Val.getValueType();
 
   // FIXME: Alignment == 1 for now.
   unsigned Alignment = 1;
   SDVTList VTs = getVTList(MVT::Other);
   SDOperand Undef = getNode(ISD::UNDEF, Ptr.getValueType());
-  SDOperand Ops[] = { Chain, Value, Ptr, Undef };
+  SDOperand Ops[] = { Chain, Val, Ptr, Undef };
   FoldingSetNodeID ID;
   AddNodeIDNode(ID, ISD::STORE, VTs, Ops, 4);
   ID.AddInteger(ISD::UNINDEXED);
@@ -1679,7 +1679,7 @@ SDOperand SelectionDAG::getStore(SDOperand Chain, SDOperand Value,
   void *IP = 0;
   if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))
     return SDOperand(E, 0);
-  SDNode *N = new StoreSDNode(Chain, Value, Ptr, Undef, ISD::UNINDEXED, false,
+  SDNode *N = new StoreSDNode(Chain, Val, Ptr, Undef, ISD::UNINDEXED, false,
                               VT, SV, SVOffset, Alignment, isVolatile);
   N->setValueTypes(VTs);
   CSEMap.InsertNode(N, IP);
@@ -1687,11 +1687,11 @@ SDOperand SelectionDAG::getStore(SDOperand Chain, SDOperand Value,
   return SDOperand(N, 0);
 }
 
-SDOperand SelectionDAG::getTruncStore(SDOperand Chain, SDOperand Value,
+SDOperand SelectionDAG::getTruncStore(SDOperand Chain, SDOperand Val,
                                       SDOperand Ptr, const Value *SV,
                                       int SVOffset, MVT::ValueType SVT,
                                       bool isVolatile) {
-  MVT::ValueType VT = Value.getValueType();
+  MVT::ValueType VT = Val.getValueType();
   bool isTrunc = VT != SVT;
 
   assert(VT > SVT && "Not a truncation?");
@@ -1702,7 +1702,7 @@ SDOperand SelectionDAG::getTruncStore(SDOperand Chain, SDOperand Value,
   unsigned Alignment = 1;
   SDVTList VTs = getVTList(MVT::Other);
   SDOperand Undef = getNode(ISD::UNDEF, Ptr.getValueType());
-  SDOperand Ops[] = { Chain, Value, Ptr, Undef };
+  SDOperand Ops[] = { Chain, Val, Ptr, Undef };
   FoldingSetNodeID ID;
   AddNodeIDNode(ID, ISD::STORE, VTs, Ops, 4);
   ID.AddInteger(ISD::UNINDEXED);
@@ -1715,7 +1715,7 @@ SDOperand SelectionDAG::getTruncStore(SDOperand Chain, SDOperand Value,
   void *IP = 0;
   if (SDNode *E = CSEMap.FindNodeOrInsertPos(ID, IP))
     return SDOperand(E, 0);
-  SDNode *N = new StoreSDNode(Chain, Value, Ptr, Undef, ISD::UNINDEXED, isTrunc,
+  SDNode *N = new StoreSDNode(Chain, Val, Ptr, Undef, ISD::UNINDEXED, isTrunc,
                               SVT, SV, SVOffset, Alignment, isVolatile);
   N->setValueTypes(VTs);
   CSEMap.InsertNode(N, IP);

lib/System/Win32/Path.inc

@@ -124,7 +124,12 @@ Path::GetTemporaryDirectory(std::string* ErrMsg) {
 
   // Append a subdirectory passed on our process id so multiple LLVMs don't
   // step on each other's toes.
+#ifdef __MINGW32__
+  // Mingw's Win32 header files are broken.
   sprintf(pathname, "LLVM_%u", unsigned(GetCurrentProcessId()));
+#else
+  sprintf(pathname, "LLVM_%u", GetCurrentProcessId());
+#endif
   result.appendComponent(pathname);
 
   // If there's a directory left over from a previous LLVM execution that

lib/Target/X86/X86ISelDAGToDAG.cpp

@@ -663,7 +663,7 @@ bool X86DAGToDAGISel::MatchAddress(SDOperand N, X86ISelAddressMode &AM,
             AM.IndexReg = ShVal.Val->getOperand(0);
             ConstantSDNode *AddVal =
               cast<ConstantSDNode>(ShVal.Val->getOperand(1));
-            uint64_t Disp = AM.Disp + AddVal->getValue() << Val;
+            uint64_t Disp = AM.Disp + (AddVal->getValue() << Val);
             if (isInt32(Disp))
               AM.Disp = Disp;
             else

lib/Target/X86/X86RegisterInfo.h

@@ -22,9 +22,11 @@ namespace llvm {
   class TargetInstrInfo;
   class X86TargetMachine;
 
-struct X86RegisterInfo : public X86GenRegisterInfo {
+class X86RegisterInfo : public X86GenRegisterInfo {
+public:
   X86TargetMachine &TM;
   const TargetInstrInfo &TII;
+
 private:
   /// Is64Bit - Is the target 64-bits.
   bool Is64Bit;

lib/Transforms/Scalar/PredicateSimplifier.cpp

@@ -428,7 +428,7 @@ namespace {
           // "setlt/gt int %a, %b" NE false then %a NE %b
 
           if (ConstantBool *CB = dyn_cast<ConstantBool>(V1)) {
-            if (CB->getValue() ^ Opcode==NE)
+            if (CB->getValue() ^ (Opcode==NE))
               addNotEqual(BO->getOperand(0), BO->getOperand(1));
 	  }
           break;
@@ -437,7 +437,7 @@ namespace {
           // "setle/ge int %a, %b" EQ false then %a NE %b
           // "setle/ge int %a, %b" NE true  then %a NE %b
           if (ConstantBool *CB = dyn_cast<ConstantBool>(V1)) {
-            if (CB->getValue() ^ Opcode==EQ)
+            if (CB->getValue() ^ (Opcode==EQ))
               addNotEqual(BO->getOperand(0), BO->getOperand(1));
 	  }
           break;
@@ -486,7 +486,7 @@ namespace {
           if (ConstantBool *CB = dyn_cast<ConstantBool>(V1)) {
             if (ConstantBool *A = dyn_cast<ConstantBool>(LHS)) {
               addEqual(RHS, ConstantBool::get(A->getValue() ^ CB->getValue()
-                                              ^ Opcode==NE));
+                                              ^ (Opcode==NE)));
             }
           }
           else if (ConstantIntegral *CI = dyn_cast<ConstantIntegral>(V1)) {

lib/Transforms/Utils/CloneFunction.cpp

@@ -313,9 +313,9 @@ void llvm::CloneAndPruneFunctionInto(Function *NewFunc, const Function *OldFunc,
   assert(NameSuffix && "NameSuffix cannot be null!");
   
 #ifndef NDEBUG
-  for (Function::const_arg_iterator I = OldFunc->arg_begin(), 
+  for (Function::const_arg_iterator II = OldFunc->arg_begin(), 
-       E = OldFunc->arg_end(); I != E; ++I)
+       E = OldFunc->arg_end(); II != E; ++II)
-    assert(ValueMap.count(I) && "No mapping from source argument specified!");
+    assert(ValueMap.count(II) && "No mapping from source argument specified!");
 #endif
   
   PruningFunctionCloner PFC(NewFunc, OldFunc, ValueMap, Returns, 

tools/bugpoint/ExecutionDriver.cpp

@@ -320,7 +320,7 @@ std::string BugDriver::compileSharedObject(const std::string &BytecodeFile) {
 bool BugDriver::createReferenceFile(Module *M, const std::string &Filename) {
   try {
     compileProgram(Program);
-  } catch (ToolExecutionError &TEE) {
+  } catch (ToolExecutionError &) {
     return false;
   }
   try {

tools/llvm-ld/llvm-ld.cpp

@@ -499,7 +499,7 @@ int main(int argc, char **argv, char **envp) {
           // Get the program arguments
           sys::Path tmp_output("opt_result");
           std::string ErrMsg;
-          if (tmp_output.createTemporaryFileOnDisk(&ErrMsg)) {
+          if (tmp_output.createTemporaryFileOnDisk(true)) {
             return PrintAndReturn(ErrMsg);
           }
           const char* args[4];

utils/TableGen/AsmWriterEmitter.cpp

@@ -69,7 +69,8 @@ namespace {
 }
 
 namespace llvm {
-  struct AsmWriterInst {
+  class AsmWriterInst {
+  public:
     std::vector<AsmWriterOperand> Operands;
     const CodeGenInstruction *CGI;
 

utils/TableGen/CodeGenInstruction.h

@@ -23,7 +23,8 @@ namespace llvm {
   class Record;
   class DagInit;
 
-  struct CodeGenInstruction {
+  class CodeGenInstruction {
+  public:
     Record *TheDef;            // The actual record defining this instruction.
     std::string Name;          // Contents of the 'Name' field.
     std::string Namespace;     // The namespace the instruction is in.

utils/TableGen/FileLexer.l

@@ -27,6 +27,7 @@
 %x comment
 
 %{
+#include "llvm/Config/config.h"
 #include "Record.h"
 typedef std::pair<llvm::Record*, std::vector<llvm::Init*>*> SubClassRefTy;
 #include "FileParser.h"

utils/TableGen/InstrInfoEmitter.h

@@ -24,7 +24,7 @@ namespace llvm {
 class StringInit;
 class IntInit;
 class ListInit;
-struct CodeGenInstruction;
+class CodeGenInstruction;
 
 class InstrInfoEmitter : public TableGenBackend {
   RecordKeeper &Records;

win32/Analysis/Analysis.vcproj

@@ -196,6 +196,9 @@
 				<File
 					RelativePath="..\..\lib\Analysis\DataStructure\BottomUpClosure.cpp">
 				</File>
+				<File
+					RelativePath="..\..\lib\Analysis\DataStructure\CallTargets.cpp">
+				</File>
 				<File
 					RelativePath="..\..\lib\Analysis\DataStructure\CompleteBottomUp.cpp">
 				</File>
@@ -316,6 +319,9 @@
 			<Filter
 				Name="DataStructure"
 				Filter="">
+				<File
+					RelativePath="..\..\include\llvm\Analysis\DataStructure\CallTargets.h">
+				</File>
 				<File
 					RelativePath="..\..\include\llvm\Analysis\DataStructure\DataStructure.h">
 				</File>

win32/CodeGen/CodeGen.vcproj

@@ -132,6 +132,9 @@
 			<File
 				RelativePath="..\..\lib\CodeGen\LiveVariables.cpp">
 			</File>
+			<File
+				RelativePath="..\..\lib\CodeGen\LLVMTargetMachine.cpp">
+			</File>
 			<File
 				RelativePath="..\..\lib\CodeGen\MachineBasicBlock.cpp">
 			</File>
@@ -144,6 +147,9 @@
 			<File
 				RelativePath="..\..\lib\CodeGen\MachineInstr.cpp">
 			</File>
+			<File
+				RelativePath="..\..\lib\CodeGen\MachinePassRegistry.cpp">
+			</File>
 			<File
 				RelativePath="..\..\lib\CodeGen\Passes.cpp">
 			</File>
@@ -168,9 +174,6 @@
 			<File
 				RelativePath="..\..\lib\CodeGen\UnreachableBlockElim.cpp">
 			</File>
-			<File
-				RelativePath="..\..\lib\CodeGen\ValueTypes.cpp">
-			</File>
 			<File
 				RelativePath="..\..\lib\CodeGen\VirtRegMap.cpp">
 			</File>
@@ -189,6 +192,9 @@
 				<File
 					RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGList.cpp">
 				</File>
+				<File
+					RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGRRList.cpp">
+				</File>
 				<File
 					RelativePath="..\..\lib\CodeGen\SelectionDAG\ScheduleDAGSimple.cpp">
 				</File>
@@ -201,6 +207,9 @@
 				<File
 					RelativePath="..\..\lib\CodeGen\SelectionDAG\SelectionDAGPrinter.cpp">
 				</File>
+				<File
+					RelativePath="..\..\lib\CodeGen\SelectionDAG\TargetLowering.cpp">
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -222,6 +231,9 @@
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\IntrinsicLowering.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\CodeGen\LinkAllCodegenComponents.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\LiveInterval.h">
 			</File>
@@ -261,21 +273,33 @@
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\MachineLocation.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\CodeGen\MachinePassRegistry.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\MachineRelocation.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\CodeGen\MachOWriter.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\Passes.h">
 			</File>
 			<File
 				RelativePath="..\..\lib\CodeGen\PhysRegTracker.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\CodeGen\RegAllocRegistry.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\SchedGraphCommon.h">
 			</File>
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\ScheduleDAG.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\CodeGen\SchedulerRegistry.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\SelectionDAG.h">
 			</File>
@@ -288,9 +312,6 @@
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\SSARegMap.h">
 			</File>
-			<File
-				RelativePath="..\..\include\llvm\CodeGen\ValueSet.h">
-			</File>
 			<File
 				RelativePath="..\..\include\llvm\CodeGen\ValueTypes.h">
 			</File>

win32/Support/Support.vcproj

@@ -109,6 +109,9 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\lib\Support\Allocator.cpp">
+			</File>
 			<File
 				RelativePath="..\..\lib\Support\Annotation.cpp">
 			</File>
@@ -124,6 +127,9 @@
 						AdditionalIncludeDirectories=""/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\lib\Support\CStringMap.cpp">
+			</File>
 			<File
 				RelativePath="..\..\lib\Support\Debug.cpp">
 			</File>
@@ -133,12 +139,21 @@
 			<File
 				RelativePath="..\..\lib\Support\FileUtilities.cpp">
 			</File>
+			<File
+				RelativePath="..\..\lib\Support\FoldingSet.cpp">
+			</File>
+			<File
+				RelativePath="..\..\lib\Support\GraphWriter.cpp">
+			</File>
 			<File
 				RelativePath="..\..\lib\Support\IsInf.cpp">
 			</File>
 			<File
 				RelativePath="..\..\lib\Support\IsNAN.cpp">
 			</File>
+			<File
+				RelativePath="..\..\lib\Support\ManagedStatic.cpp">
+			</File>
 			<File
 				RelativePath="..\..\lib\Support\PluginLoader.cpp">
 			</File>
@@ -169,9 +184,6 @@
 			<File
 				RelativePath="..\..\lib\Support\Timer.cpp">
 			</File>
-			<File
-				RelativePath="..\..\lib\Support\ToolRunner.cpp">
-			</File>
 			<Filter
 				Name="bzip2"
 				Filter="">
@@ -211,6 +223,9 @@
 			<File
 				RelativePath="..\..\include\llvm\Support\AIXDataTypesFix.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\Support\Allocator.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\Support\Annotation.h">
 			</File>
@@ -226,6 +241,9 @@
 			<File
 				RelativePath="..\..\include\llvm\Support\CommandLine.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\Support\Compiler.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\Support\Compressor.h">
 			</File>
@@ -271,6 +289,9 @@
 			<File
 				RelativePath="..\..\include\llvm\Support\MallocAllocator.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\Support\ManagedStatic.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\Support\Mangler.h">
 			</File>
@@ -304,9 +325,6 @@
 			<File
 				RelativePath="..\..\include\llvm\Support\Timer.h">
 			</File>
-			<File
-				RelativePath="..\..\include\llvm\Support\ToolRunner.h">
-			</File>
 			<File
 				RelativePath="..\..\include\llvm\Support\type_traits.h">
 			</File>
@@ -320,6 +338,9 @@
 			<File
 				RelativePath="..\..\include\llvm\Adt\BitSetVector.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\ADT\CStringMap.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\Adt\DenseMap.h">
 			</File>
@@ -329,6 +350,9 @@
 			<File
 				RelativePath="..\..\include\llvm\Adt\EquivalenceClasses.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\ADT\FoldingSet.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\Adt\GraphTraits.h">
 			</File>
@@ -359,6 +383,12 @@
 			<File
 				RelativePath="..\..\include\llvm\Adt\SetVector.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\ADT\SmallString.h">
+			</File>
+			<File
+				RelativePath="..\..\include\llvm\ADT\SmallVector.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\Adt\Statistic.h">
 			</File>

win32/System/System.vcproj

@@ -109,9 +109,15 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\lib\System\Alarm.cpp">
+			</File>
 			<File
 				RelativePath="..\..\lib\System\DynamicLibrary.cpp">
 			</File>
+			<File
+				RelativePath="..\..\lib\System\IncludeFile.cpp">
+			</File>
 			<File
 				RelativePath="..\..\lib\System\MappedFile.cpp">
 			</File>
@@ -141,9 +147,15 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath="..\..\include\llvm\System\Alarm.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\System\DynamicLibrary.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\System\IncludeFile.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\System\MappedFile.h">
 			</File>

win32/Target/Target.vcproj

@@ -114,6 +114,9 @@
 			<File
 				RelativePath="..\..\lib\Target\SubtargetFeature.cpp">
 			</File>
+			<File
+				RelativePath="..\..\lib\Target\TargetAsmInfo.cpp">
+			</File>
 			<File
 				RelativePath="..\..\lib\Target\TargetData.cpp">
 			</File>
@@ -123,9 +126,6 @@
 			<File
 				RelativePath="..\..\lib\Target\TargetInstrInfo.cpp">
 			</File>
-			<File
-				RelativePath="..\..\lib\Target\TargetLowering.cpp">
-			</File>
 			<File
 				RelativePath="..\..\lib\Target\TargetMachine.cpp">
 			</File>
@@ -146,6 +146,9 @@
 			<File
 				RelativePath="..\..\include\llvm\Target\SubtargetFeature.h">
 			</File>
+			<File
+				RelativePath="..\..\include\llvm\Target\TargetAsmInfo.h">
+			</File>
 			<File
 				RelativePath="..\..\include\llvm\Target\TargetData.h">
 			</File>

win32/Transforms/Transforms.vcproj

@@ -260,26 +260,14 @@
 				<File
 					RelativePath="..\..\lib\Transforms\Scalar\LoopUnswitch.cpp">
 				</File>
-				<File
-					RelativePath="..\..\lib\Transforms\Scalar\LowerAllocations.cpp">
-				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Scalar\LowerGC.cpp">
 				</File>
-				<File
-					RelativePath="..\..\lib\Transforms\Scalar\LowerInvoke.cpp">
-				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Scalar\LowerPacked.cpp">
 				</File>
 				<File
-					RelativePath="..\..\lib\Transforms\Scalar\LowerSelect.cpp">
+					RelativePath="..\..\lib\Transforms\Scalar\PredicateSimplifier.cpp">
-				</File>
-				<File
-					RelativePath="..\..\lib\Transforms\Scalar\LowerSwitch.cpp">
-				</File>
-				<File
-					RelativePath="..\..\lib\Transforms\Scalar\Mem2Reg.cpp">
 				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Scalar\Reassociate.cpp">
@@ -334,12 +322,30 @@
 				<File
 					RelativePath="..\..\lib\Transforms\Utils\InlineFunction.cpp">
 				</File>
+				<File
+					RelativePath="..\..\lib\Transforms\Utils\LCSSA.cpp">
+				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Utils\Local.cpp">
 				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Utils\LoopSimplify.cpp">
 				</File>
+				<File
+					RelativePath="..\..\lib\Transforms\Utils\LowerAllocations.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Transforms\Utils\LowerInvoke.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Transforms\Utils\LowerSelect.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Transforms\Utils\LowerSwitch.cpp">
+				</File>
+				<File
+					RelativePath="..\..\lib\Transforms\Utils\Mem2Reg.cpp">
+				</File>
 				<File
 					RelativePath="..\..\lib\Transforms\Utils\PromoteMemoryToRegister.cpp">
 				</File>
@@ -388,9 +394,6 @@
 			<File
 				RelativePath="..\..\include\llvm\Transforms\IPO.h">
 			</File>
-			<File
-				RelativePath="..\..\include\llvm\Transforms\LinkAllPasses.h">
-			</File>
 			<File
 				RelativePath="..\..\include\llvm\Transforms\Utils\Local.h">
 			</File>

win32/VMCore/VMCore.vcproj

@@ -198,6 +198,9 @@
 			<File
 				RelativePath="..\..\lib\VMCore\ValueSymbolTable.cpp">
 			</File>
+			<File
+				RelativePath="..\..\lib\VMCore\ValueTypes.cpp">
+			</File>
 			<File
 				RelativePath="..\..\lib\VMCore\Verifier.cpp">
 			</File>

win32/analyze/analyze.vcproj

@@ -124,15 +124,6 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
-			<File
-				RelativePath="..\..\tools\analyze\AnalysisWrappers.cpp">
-			</File>
-			<File
-				RelativePath="..\..\tools\analyze\analyze.cpp">
-			</File>
-			<File
-				RelativePath="..\..\tools\analyze\GraphPrinters.cpp">
-			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"

win32/bugpoint/bugpoint.vcproj

@@ -139,6 +139,9 @@
 			<File
 				RelativePath="..\..\tools\bugpoint\ExtractFunction.cpp">
 			</File>
+			<File
+				RelativePath="..\..\tools\bugpoint\FindBugs.cpp">
+			</File>
 			<File
 				RelativePath="..\..\tools\bugpoint\Miscompilation.cpp">
 			</File>
@@ -148,6 +151,9 @@
 			<File
 				RelativePath="..\..\tools\bugpoint\TestPasses.cpp">
 			</File>
+			<File
+				RelativePath="..\..\tools\bugpoint\ToolRunner.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -159,6 +165,9 @@
 			<File
 				RelativePath="..\..\tools\bugpoint\ListReducer.h">
 			</File>
+			<File
+				RelativePath="..\..\tools\bugpoint\ToolRunner.h">
+			</File>
 		</Filter>
 	</Files>
 	<Globals>

win32/config.h

@@ -20,3 +20,5 @@
 #define LTDL_SHLIB_EXT ".dll" 
 #define LTDL_SYSSEARCHPATH "" 
 #define LLVM_ON_WIN32 1 
+
+#define strtoll strtol

win32/llvm.sln

@@ -220,19 +220,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm-prof", "llvm-prof\llvm
 		{0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "analyze", "analyze\analyze.vcproj", "{DF8506B5-28D2-4D2E-9A6C-57D5BC98BF76}"
-	ProjectSection(ProjectDependencies) = postProject
-		{0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08}
-		{28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508}
-		{19514E48-456C-4B9D-8637-F2285476461E} = {19514E48-456C-4B9D-8637-F2285476461E}
-		{F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D61}
-		{059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4} = {059FBAB8-C76D-48A0-AA75-3C57BD3EAFE4}
-		{C59374C1-9FC0-4147-B836-327DFDC52D99} = {C59374C1-9FC0-4147-B836-327DFDC52D99}
-		{45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB}
-		{0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489}
-		{3DC216F5-1DDD-478A-84F8-C124E5C31982} = {3DC216F5-1DDD-478A-84F8-C124E5C31982}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bugpoint", "bugpoint\bugpoint.vcproj", "{57249192-8E29-4D85-8B7A-FEFF1760B1DA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08}
@@ -252,6 +239,8 @@ Global
 		Debug = Debug
 		Release = Release
 	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
 		{28AA9146-3482-4F41-9CC6-407B1D258508}.Debug.ActiveCfg = Debug|Win32
 		{28AA9146-3482-4F41-9CC6-407B1D258508}.Debug.Build.0 = Debug|Win32
@@ -365,10 +354,6 @@ Global
 		{ACBE81D9-64B1-4133-823A-807A4E60B454}.Debug.Build.0 = Debug|Win32
 		{ACBE81D9-64B1-4133-823A-807A4E60B454}.Release.ActiveCfg = Release|Win32
 		{ACBE81D9-64B1-4133-823A-807A4E60B454}.Release.Build.0 = Release|Win32
-		{DF8506B5-28D2-4D2E-9A6C-57D5BC98BF76}.Debug.ActiveCfg = Debug|Win32
-		{DF8506B5-28D2-4D2E-9A6C-57D5BC98BF76}.Debug.Build.0 = Debug|Win32
-		{DF8506B5-28D2-4D2E-9A6C-57D5BC98BF76}.Release.ActiveCfg = Release|Win32
-		{DF8506B5-28D2-4D2E-9A6C-57D5BC98BF76}.Release.Build.0 = Release|Win32
 		{57249192-8E29-4D85-8B7A-FEFF1760B1DA}.Debug.ActiveCfg = Debug|Win32
 		{57249192-8E29-4D85-8B7A-FEFF1760B1DA}.Debug.Build.0 = Debug|Win32
 		{57249192-8E29-4D85-8B7A-FEFF1760B1DA}.Release.ActiveCfg = Release|Win32

win32/opt/opt.vcproj

@@ -124,9 +124,18 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\..\tools\opt\AnalysisWrappers.cpp">
+			</File>
+			<File
+				RelativePath="..\..\tools\opt\GraphPrinters.cpp">
+			</File>
 			<File
 				RelativePath="..\..\tools\opt\opt.cpp">
 			</File>
+			<File
+				RelativePath="..\..\tools\opt\PrintSCC.cpp">
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"

win32/x86/x86.vcproj

@@ -116,15 +116,15 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Performing TableGen Step"
-						CommandLine="..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc
+						CommandLine="..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc
-..\$(IntDir)\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.h.inc
+..\$(IntDir)\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.h.inc
-..\$(IntDir)\TableGen.exe -gen-register-desc -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.inc
+..\$(IntDir)\TableGen.exe -gen-register-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.inc
-..\$(IntDir)\TableGen.exe -gen-instr-enums -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrNames.inc
+..\$(IntDir)\TableGen.exe -gen-instr-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrNames.inc
-..\$(IntDir)\TableGen.exe -gen-instr-desc -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrInfo.inc
+..\$(IntDir)\TableGen.exe -gen-instr-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrInfo.inc
-..\$(IntDir)\TableGen.exe -gen-asm-writer -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter.inc
+..\$(IntDir)\TableGen.exe -gen-asm-writer -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter.inc
-..\$(IntDir)\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter1.inc
+..\$(IntDir)\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter1.inc
-..\$(IntDir)\TableGen.exe -gen-dag-isel -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenDAGISel.inc
+..\$(IntDir)\TableGen.exe -gen-dag-isel -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenDAGISel.inc
-..\$(IntDir)\TableGen.exe -gen-subtarget -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenSubtarget.inc
+..\$(IntDir)\TableGen.exe -gen-subtarget -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenSubtarget.inc
 "
 						AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)X86InstrFPStack.td;$(InputDir)X86InstrMMX.td;$(InputDir)X86InstrSSE.td;$(InputDir)..\Target.td;$(InputDir)..\TargetSchedule.td;$(InputDir)..\TargetScheduleDAG.td;$(ProjectDir)..\$(IntDir)\TableGen.exe"
 						Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc;X86GenDAGISel.inc;X86GenSubtarget.inc"/>
@@ -134,15 +134,15 @@
 					<Tool
 						Name="VCCustomBuildTool"
 						Description="Performing TableGen Step"
-						CommandLine="..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc
+						CommandLine="..\$(IntDir)\TableGen.exe -gen-register-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterNames.inc
-..\$(IntDir)\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.h.inc
+..\$(IntDir)\TableGen.exe -gen-register-desc-header -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.h.inc
-..\$(IntDir)\TableGen.exe -gen-register-desc -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.inc
+..\$(IntDir)\TableGen.exe -gen-register-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenRegisterInfo.inc
-..\$(IntDir)\TableGen.exe -gen-instr-enums -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrNames.inc
+..\$(IntDir)\TableGen.exe -gen-instr-enums -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrNames.inc
-..\$(IntDir)\TableGen.exe -gen-instr-desc -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrInfo.inc
+..\$(IntDir)\TableGen.exe -gen-instr-desc -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenInstrInfo.inc
-..\$(IntDir)\TableGen.exe -gen-asm-writer -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter.inc
+..\$(IntDir)\TableGen.exe -gen-asm-writer -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter.inc
-..\$(IntDir)\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter1.inc
+..\$(IntDir)\TableGen.exe -gen-asm-writer -asmwriternum=1 -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenAsmWriter1.inc
-..\$(IntDir)\TableGen.exe -gen-dag-isel -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenDAGISel.inc
+..\$(IntDir)\TableGen.exe -gen-dag-isel -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenDAGISel.inc
-..\$(IntDir)\TableGen.exe -gen-subtarget -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenSubtarget.inc
+..\$(IntDir)\TableGen.exe -gen-subtarget -I ..\..\lib\Target -I ..\..\lib\Target\X86 -I ..\..\include $(InputPath) -o X86GenSubtarget.inc
 "
 						AdditionalDependencies="$(InputDir)X86InstrInfo.td;$(InputDir)X86RegisterInfo.td;$(InputDir)X86InstrFPStack.td;$(InputDir)X86InstrMMX.td;$(InputDir)X86InstrSSE.td;$(InputDir)..\Target.td;$(InputDir)..\TargetSchedule.td;$(InputDir)..\TargetScheduleDAG.td;$(ProjectDir)..\$(IntDir)\TableGen.exe"
 						Outputs="X86GenRegisterNames.inc;X86GenRegisterInfo.h.inc;X86GenRegisterInfo.inc;X86GenInstrNames.inc;X86GenInstrInfo.inc;X86GenAsmWriter.inc;X86GenAsmWriter1.inc;X86GenDAGISel.inc;X86GenSubtarget.inc"/>
@@ -166,6 +166,9 @@
 			<File
 				RelativePath="..\..\lib\Target\X86\X86InstrInfo.cpp">
 			</File>
+			<File
+				RelativePath="..\..\lib\Target\X86\X86InstrX86-64.td">
+			</File>
 			<File
 				RelativePath="..\..\lib\Target\X86\X86IntelAsmPrinter.cpp">
 			</File>
@@ -184,6 +187,9 @@
 			<File
 				RelativePath="..\..\lib\Target\X86\X86Subtarget.cpp">
 			</File>
+			<File
+				RelativePath="..\..\lib\Target\X86\X86TargetAsmInfo.cpp">
+			</File>
 			<File
 				RelativePath="..\..\lib\Target\X86\X86TargetMachine.cpp">
 			</File>
@@ -234,6 +240,9 @@
 			<File
 				RelativePath="..\..\lib\Target\X86\X86JITInfo.h">
 			</File>
+			<File
+				RelativePath="..\..\lib\Target\X86\X86MachineFunctionInfo.h">
+			</File>
 			<File
 				RelativePath="..\..\lib\Target\X86\X86RegisterInfo.h">
 			</File>
@@ -243,6 +252,9 @@
 			<File
 				RelativePath="..\..\lib\Target\X86\X86Subtarget.h">
 			</File>
+			<File
+				RelativePath="..\..\lib\Target\X86\X86TargetAsmInfo.h">
+			</File>
 			<File
 				RelativePath="..\..\lib\Target\X86\X86TargetMachine.h">
 			</File>