Merge branch 'master' of github.com:microsoft/checkedc-clang

Author: mattmccutchen-cci

README.md

@@ -10,8 +10,11 @@ C specification is available at the
 
 ### Source code update
 
+On Feb 19, 2021 we updated the checkedc-clang sources to upstream release_110,
+specifically [this](https://github.com/llvm/llvm-project/commit/2e10b7a39b930ef8d9c4362509d8835b221fbc0a) commit.
+
 On Feb 18, 2020 we updated the checkedc-clang sources to upstream release_90,
-specifically [this](http://llvm.org/viewvc/llvm-project?view=revision&revision=366428) commit.
+specifically [this](https://github.com/llvm/llvm-project/commit/c89a3d78f43d81b9cff7b9248772ddf14d21b749) commit.
 
 ### Transition to monorepo
 

clang/lib/CodeGen/CGCall.cpp

@@ -4264,7 +4264,6 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
         CGM, Loc, dyn_cast_or_null<FunctionDecl>(CurCodeDecl), FD, CallArgs);
   }
 
-#ifndef NDEBUG
   if (!(CallInfo.isVariadic() && CallInfo.getArgStruct())) {
     // For an inalloca varargs function, we don't expect CallInfo to match the
     // function pointer's type, because the inalloca struct a will have extra
@@ -4310,10 +4309,15 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
 
     if (getLangOpts().CheckedC)
       IRFuncTy = cast<llvm::FunctionType>(TypeFromVal);
-    else
+    else {
+    // NOTE: This may cause merge conflicts during checkedc-clang source
+    // upgrades. For more details refer
+    // https://github.com/microsoft/checkedc-clang/pull/990
+#ifndef NDEBUG
       assert(IRFuncTy == TypeFromVal);
-  }
 #endif
+    }
+  }
 
   // 1. Set up the arguments.
 

clang/test/Analysis/lit.local.cfg

@@ -19,7 +19,7 @@ config.substitutions.append(('%normalize_plist',
 
 # Filtering command for testing SARIF output against reference output.
 config.substitutions.append(('%normalize_sarif',
-    "grep -Ev '^[[:space:]]*(%s|%s|%s)[[:space:]]*$'" %
+    "grep -Eva '^[[:space:]]*(%s|%s|%s)[[:space:]]*$'" %
         ('"uri": "file:.*%basename_t"',
          '"version": ".* version .*"',
          '"version": "2.1.0"')))

clang/test/CheckedC/verification/codegen-checked.c

@@ -2,7 +2,7 @@
 // There should be a __VERIFIER_error at each dynamic check failed block.
 //
 //
-// RUN: %clang -finject-verifier-calls -emit-llvm -S %s -o - | FileCheck %s
+// RUN: %clang_cc1 -finject-verifier-calls -emit-llvm %s -o - | FileCheck %s
 
 extern void __VERIFIER_error (void);
 extern void __VERIFIER_assume (int);

clang/test/CheckedC/verification/codegen-unchecked.c

@@ -3,7 +3,7 @@
 // dynamic check failed block.
 //
 //
-// RUN: %clang -finject-verifier-calls -funchecked-pointers-dynamic-check -emit-llvm -S %s -o - | FileCheck %s
+// RUN: %clang_cc1 -finject-verifier-calls -funchecked-pointers-dynamic-check -emit-llvm %s -o - | FileCheck %s
 
 extern void __VERIFIER_error (void);
 extern void __VERIFIER_assume (int);