merge main into amd-staging

Change-Id: I74db595ab68900435ab64769f8a163846fe1a140

Author: ronlieb

llvm/include/llvm/IR/Intrinsics.h

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 //
 // This file defines a set of enums which allow processing of intrinsic
-// functions.  Values of these enum types are returned by
+// functions. Values of these enum types are returned by
 // Function::getIntrinsicID.
 //
 //===----------------------------------------------------------------------===//

llvm/lib/IR/CMakeLists.txt

@@ -33,6 +33,7 @@ add_llvm_component_library(LLVMCore
   GVMaterializer.cpp
   Globals.cpp
   HeterogeneousDebugVerify.cpp
+  Intrinsics.cpp
   IRBuilder.cpp
   IRPrintingPasses.cpp
   SSAContext.cpp