Updated VC++ build system.

Silenced a couple of VC++ warnings.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@41994 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Sema/SemaStmt.cpp b/Sema/SemaStmt.cpp
index 7b544a280740699e26c053c94e31a26fcc53c117..7dac6011f82614058e1087aa314a616aa10ef9ec 100644 (file)
--- a/Sema/SemaStmt.cpp
+++ b/Sema/SemaStmt.cpp
@@ -280,7 +280,8 @@ Sema::FinishSwitchStmt(SourceLocation SwitchLoc, StmtTy *Switch, ExprTy *Body) {
   
   // Get the bitwidth of the switched-on value before promotions.  We must
   // convert the integer case values to this width before comparison.
-  unsigned CondWidth = Context.getTypeSize(CondType, SwitchLoc);
+  unsigned CondWidth = 
+    static_cast<unsigned>(Context.getTypeSize(CondType, SwitchLoc));
   bool CondIsSigned = CondType->isSignedIntegerType();
   
   // Accumulate all of the case values in a vector so that we can sort them

diff --git a/include/clang/Basic/TargetInfo.h b/include/clang/Basic/TargetInfo.h
index 4eb6c3df3e55063ed5e42a727a103b0e955503e5..72cde09c38d0b06c9a36f663d51316742365fb04 100644 (file)
--- a/include/clang/Basic/TargetInfo.h
+++ b/include/clang/Basic/TargetInfo.h
@@ -150,7 +150,8 @@ public:
   
   /// getFloatInfo - Return the size of 'float' for this target, in bits.  
   void getFloatInfo(uint64_t &Size, unsigned &Align, SourceLocation Loc) {
-    Align = Size = 32;  // FIXME: implement correctly.
+    Align = 32;  // FIXME: implement correctly.
+    Size = 32;
   }
 
   /// getDoubleInfo - Return the size of 'double' for this target, in bits.  
@@ -191,31 +192,31 @@ public:
   unsigned getCharWidth(SourceLocation Loc) {
     uint64_t Size; unsigned Align;
     getCharInfo(Size, Align, Loc);
-    return Size;
+    return static_cast<unsigned>(Size);
   }
   
   unsigned getWCharWidth(SourceLocation Loc) {
     uint64_t Size; unsigned Align;
     getWCharInfo(Size, Align, Loc);
-    return Size;
+    return static_cast<unsigned>(Size);
   }
   
   unsigned getIntWidth(SourceLocation Loc) {
     uint64_t Size; unsigned Align;
     getIntInfo(Size, Align, Loc);
-    return Size;
+    return static_cast<unsigned>(Size);
   }
   
   unsigned getLongWidth(SourceLocation Loc) {
     uint64_t Size; unsigned Align;
     getLongInfo(Size, Align, Loc);
-    return Size;
+    return static_cast<unsigned>(Size);
   }
 
   unsigned getLongLongWidth(SourceLocation Loc) {
     uint64_t Size; unsigned Align;
     getLongLongInfo(Size, Align, Loc);
-    return Size;
+    return static_cast<unsigned>(Size);
   }
 private:
   void ComputeWCharInfo(SourceLocation Loc);

diff --git a/include/clang/Parse/Action.h b/include/clang/Parse/Action.h
index 014c7818e3d753769ee0bb0bd36faf53a41787ce..ee11b684449522899e84d390718a6042cc57d7f3 100644 (file)
--- a/include/clang/Parse/Action.h
+++ b/include/clang/Parse/Action.h
@@ -21,7 +21,7 @@ namespace clang {
   // Semantic.
   class DeclSpec;
   class Declarator;
-  class ObjcKeywordInfo;
+  struct ObjcKeywordInfo;
   class AttributeList;
   // Parse.
   class Scope;

diff --git a/win32/clangAST/clangAST.vcproj b/win32/clangAST/clangAST.vcproj
index 943f146bb7507ce03e284d0254d4e34e9f3a4f90..31de24ab71f6747df2ffba2ab90020cc8ef6955c 100644 (file)
--- a/win32/clangAST/clangAST.vcproj
+++ b/win32/clangAST/clangAST.vcproj
@@ -202,6 +202,10 @@
                                RelativePath="..\..\include\clang\AST\AST.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\clang\AST\ASTConsumer.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\clang\AST\ASTContext.h"\r
                                >\r
@@ -226,6 +230,10 @@
                                RelativePath="..\..\include\clang\AST\ExprCXX.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\clang\AST\PrettyPrinter.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\clang\AST\RecordLayout.h"\r
                                >\r

diff --git a/win32/clangAnalysis/clangAnalysis.vcproj b/win32/clangAnalysis/clangAnalysis.vcproj
index 49aca4eab2796cf4d69a26c7c66b1f70aedf48be..220cf7d3a968a7f99eb502f0dd41dc1e1cd2e350 100644 (file)
--- a/win32/clangAnalysis/clangAnalysis.vcproj
+++ b/win32/clangAnalysis/clangAnalysis.vcproj
@@ -160,12 +160,36 @@
                                RelativePath="..\..\Analysis\LiveVariables.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\Analysis\UnintializedValues.cpp"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Header Files"\r
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
+                       <File\r
+                               RelativePath="..\..\include\clang\Analysis\CFGStmtVisitor.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\clang\Analysis\CFGVarDeclVisitor.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Analysis\DataflowSolver.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\clang\Analysis\DataflowStmtVisitor.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\include\clang\Analysis\DataflowValues.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\include\clang\Analysis\LiveVariables.h"\r
                                >\r
@@ -174,6 +198,10 @@
                                RelativePath="..\..\include\clang\Analysis\LocalCheckers.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\include\clang\Analysis\UninitializedValues.h"\r
+                               >\r
+                       </File>\r
                </Filter>\r
        </Files>\r
        <Globals>\r

diff --git a/win32/clangRewrite/clangRewrite.vcproj b/win32/clangRewrite/clangRewrite.vcproj
new file mode 100644 (file)
index 0000000..1d2ffea
--- /dev/null
+++ b/win32/clangRewrite/clangRewrite.vcproj
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="8.00"\r
+       Name="clangRewrite"\r
+       ProjectGUID="{F9FBDDA2-9EE1-473C-A456-BE20B7B2439D}"\r
+       RootNamespace="clangRewrite"\r
+       Keyword="Win32Proj"\r
+       >\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"\r
+               />\r
+       </Platforms>\r
+       <ToolFiles>\r
+       </ToolFiles>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory="..\Debug"\r
+                       IntermediateDirectory="Debug"\r
+                       ConfigurationType="4"\r
+                       CharacterSet="2"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\win32"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS"\r
+                               MinimalRebuild="true"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="3"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory="..\Release"\r
+                       IntermediateDirectory="Release"\r
+                       ConfigurationType="4"\r
+                       CharacterSet="2"\r
+                       WholeProgramOptimization="1"\r
+                       >\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\win32"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS"\r
+                               RuntimeLibrary="2"\r
+                               UsePrecompiledHeader="0"\r
+                               WarningLevel="3"\r
+                               Detect64BitPortabilityProblems="false"\r
+                               DebugInformationFormat="3"\r
+                       />\r
+                       <Tool\r
+                               Name="VCManagedResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCLibrarianTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCALinkTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCXDCMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCBscMakeTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCFxCopTool"\r
+                       />\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                       />\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
+                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\Rewrite\Rewriter.cpp"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
+                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
+                       >\r
+                       <File\r
+                               RelativePath="..\..\include\clang\Rewrite\Rewriter.h"\r
+                               >\r
+                       </File>\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r