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 7b544a2..7dac601 100644
--- a/Sema/SemaStmt.cpp
+++ b/Sema/SemaStmt.cpp
@@ -280,7 +280,8 @@
// 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 4eb6c3d..72cde09 100644
--- a/include/clang/Basic/TargetInfo.h
+++ b/include/clang/Basic/TargetInfo.h
@@ -150,7 +150,8 @@
/// 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 @@
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 014c781..ee11b68 100644
--- a/include/clang/Parse/Action.h
+++ b/include/clang/Parse/Action.h
@@ -21,7 +21,7 @@
// 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 943f146..31de24a 100644
--- a/win32/clangAST/clangAST.vcproj
+++ b/win32/clangAST/clangAST.vcproj
@@ -203,6 +203,10 @@
>
</File>
<File
+ RelativePath="..\..\include\clang\AST\ASTConsumer.h"
+ >
+ </File>
+ <File
RelativePath="..\..\include\clang\AST\ASTContext.h"
>
</File>
@@ -227,6 +231,10 @@
>
</File>
<File
+ RelativePath="..\..\include\clang\AST\PrettyPrinter.h"
+ >
+ </File>
+ <File
RelativePath="..\..\include\clang\AST\RecordLayout.h"
>
</File>
diff --git a/win32/clangAnalysis/clangAnalysis.vcproj b/win32/clangAnalysis/clangAnalysis.vcproj
index 49aca4e..220cf7d 100644
--- a/win32/clangAnalysis/clangAnalysis.vcproj
+++ b/win32/clangAnalysis/clangAnalysis.vcproj
@@ -160,6 +160,10 @@
RelativePath="..\..\Analysis\LiveVariables.cpp"
>
</File>
+ <File
+ RelativePath="..\..\Analysis\UnintializedValues.cpp"
+ >
+ </File>
</Filter>
<Filter
Name="Header Files"
@@ -167,6 +171,26 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
+ RelativePath="..\..\include\clang\Analysis\CFGStmtVisitor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\clang\Analysis\CFGVarDeclVisitor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\Analysis\DataflowSolver.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\clang\Analysis\DataflowStmtVisitor.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\include\clang\Analysis\DataflowValues.h"
+ >
+ </File>
+ <File
RelativePath="..\..\include\clang\Analysis\LiveVariables.h"
>
</File>
@@ -174,6 +198,10 @@
RelativePath="..\..\include\clang\Analysis\LocalCheckers.h"
>
</File>
+ <File
+ RelativePath="..\..\include\clang\Analysis\UninitializedValues.h"
+ >
+ </File>
</Filter>
</Files>
<Globals>
diff --git a/win32/clangRewrite/clangRewrite.vcproj b/win32/clangRewrite/clangRewrite.vcproj
new file mode 100644
index 0000000..1d2ffea
--- /dev/null
+++ b/win32/clangRewrite/clangRewrite.vcproj
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="clangRewrite"
+ ProjectGUID="{F9FBDDA2-9EE1-473C-A456-BE20B7B2439D}"
+ RootNamespace="clangRewrite"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="..\Debug"
+ IntermediateDirectory="Debug"
+ ConfigurationType="4"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\win32"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="..\Release"
+ IntermediateDirectory="Release"
+ ConfigurationType="4"
+ CharacterSet="2"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ AdditionalIncludeDirectories="..\..\include;..\..\..\..\include;..\..\..\..\win32"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;__STDC_LIMIT_MACROS"
+ RuntimeLibrary="2"
+ UsePrecompiledHeader="0"
+ WarningLevel="3"
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="3"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLibrarianTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+ Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+ >
+ <File
+ RelativePath="..\..\Rewrite\Rewriter.cpp"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\..\include\clang\Rewrite\Rewriter.h"
+ >
+ </File>
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>