Zap the /Za compiler switch from MSVC projects, the option is considered harmful...

Only 1 minor code change was necessary: can't use cdecl as variable name anymore.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c828482ac70298f5edecf7142d0d92774dd9682b..ebf5e418e3f90eab990c5990c3bbce22d970d83a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,14 +198,6 @@ macro(add_clang_library name)
   link_system_libs( ${name} )
 
   add_dependencies(${name} ClangDiagnosticCommon)
-  if(MSVC)
-    get_target_property(cflag ${name} COMPILE_FLAGS)
-    if(NOT cflag)
-      set(cflag "")
-    endif(NOT cflag)
-    set(cflag "${cflag} /Za")
-    set_target_properties(${name} PROPERTIES COMPILE_FLAGS ${cflag})
-  endif(MSVC)
   install(TARGETS ${name}
     LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
     ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX}

diff --git a/lib/Analysis/CFG.cpp b/lib/Analysis/CFG.cpp
index 9a50578c4fbfa283da5439060fcde17f50514ee3..44a0eec21de7c294b452bb6273008a992e908c54 100644 (file)
--- a/lib/Analysis/CFG.cpp
+++ b/lib/Analysis/CFG.cpp
@@ -3200,8 +3200,8 @@ CFGImplicitDtor::getDestructorDecl(ASTContext &astContext) const {
 }
 
 bool CFGImplicitDtor::isNoReturn(ASTContext &astContext) const {
-  if (const CXXDestructorDecl *cdecl = getDestructorDecl(astContext)) {
-    QualType ty = cdecl->getType();
+  if (const CXXDestructorDecl *decl = getDestructorDecl(astContext)) {
+    QualType ty = decl->getType();
     return cast<FunctionType>(ty)->getNoReturnAttr();
   }
   return false;

diff --git a/lib/Driver/CMakeLists.txt b/lib/Driver/CMakeLists.txt
index c7850656e38bb2c667f13d3170c3a7c1c510a915..a16b2ce69f01425703ff956b1e739beebcb35d1a 100644 (file)
--- a/lib/Driver/CMakeLists.txt
+++ b/lib/Driver/CMakeLists.txt
@@ -20,13 +20,6 @@ add_clang_library(clangDriver
   Types.cpp
   )
 
-IF(MSVC)
-  get_target_property(NON_ANSI_COMPILE_FLAGS clangDriver COMPILE_FLAGS)
-  string(REPLACE /Za
-    "" NON_ANSI_COMPILE_FLAGS
-    ${NON_ANSI_COMPILE_FLAGS})
-  set_target_properties(clangDriver PROPERTIES COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
-ENDIF(MSVC)
 
 add_dependencies(clangDriver ClangAttrList ClangDiagnosticDriver
                  ClangDriverOptions ClangCC1AsOptions)

diff --git a/lib/Frontend/CMakeLists.txt b/lib/Frontend/CMakeLists.txt
index a2b5c1e28e5a3ef3c56b7dea03e742da6e01dd7f..6f61290c0538a91316a784b58372e31bebe0e46d 100644 (file)
--- a/lib/Frontend/CMakeLists.txt
+++ b/lib/Frontend/CMakeLists.txt
@@ -41,13 +41,6 @@ add_clang_library(clangFrontend
   Warnings.cpp
   )
 
-IF(MSVC)
-  get_target_property(NON_ANSI_COMPILE_FLAGS clangFrontend COMPILE_FLAGS)
-  string(REPLACE /Za
-    "" NON_ANSI_COMPILE_FLAGS
-    ${NON_ANSI_COMPILE_FLAGS})
-  set_target_properties(clangFrontend PROPERTIES COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
-ENDIF(MSVC)
 
 add_dependencies(clangFrontend
   ClangAttrClasses

diff --git a/tools/libclang/CMakeLists.txt b/tools/libclang/CMakeLists.txt
index 373bfb35b9f44eb991f338da803d6cbd3b3c43a5..293dfa3ff94d675973b0c67111aabfb9d9a55eb9 100644 (file)
--- a/tools/libclang/CMakeLists.txt
+++ b/tools/libclang/CMakeLists.txt
@@ -76,13 +76,6 @@ if( LLVM_ENABLE_PIC )
       INSTALL_NAME_DIR "@executable_path/../lib")
   endif()
 
-  if(MSVC)
-    # windows.h doesn't compile with /Za
-    get_target_property(NON_ANSI_COMPILE_FLAGS libclang COMPILE_FLAGS)
-    string(REPLACE "/Za" "" NON_ANSI_COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
-    set_target_properties(libclang PROPERTIES
-      COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
-  endif()
 
   set(LIBCLANG_STATIC_TARGET_NAME libclang_static)
 else()