[llvm-branch-commits] [cfe-branch] r304294 - Merging r298177:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Wed May 31 04:58:36 2017
New Revision: 304294

URL: http://llvm.org/viewvc/llvm-project?rev=304294&view=rev
Log:
Merging r298177:

------------------------------------------------------------------------
r298177 | niravd | 2017-03-17 20:43:39 -0400 (Fri, 17 Mar 2017) | 7 lines

[X86] Add NumRegisterParameters Module Flag.

Reviewers: rnk, mkuper

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D27051
------------------------------------------------------------------------

Added:
    cfe/branches/release_40/test/CodeGen/pr3997.c
Modified:
    cfe/branches/release_40/lib/CodeGen/CodeGenModule.cpp
    cfe/branches/release_40/test/Headers/altivec-header.c

Modified: cfe/branches/release_40/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/lib/CodeGen/CodeGenModule.cpp?rev=304294&r1=304293&r2=304294&view=diff
==============================================================================
--- cfe/branches/release_40/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/branches/release_40/lib/CodeGen/CodeGenModule.cpp Wed May 31 04:58:36 2017
@@ -159,6 +159,12 @@ CodeGenModule::CodeGenModule(ASTContext
   // CoverageMappingModuleGen object.
   if (CodeGenOpts.CoverageMapping)
     CoverageMapping.reset(new CoverageMappingModuleGen(*this, *CoverageInfo));
+
+  // Record mregparm value now so it is visible through rest of codegen.
+  if (Context.getTargetInfo().getTriple().getArch() == llvm::Triple::x86)
+    getModule().addModuleFlag(llvm::Module::Error, "NumRegisterParameters",
+                              CodeGenOpts.NumRegisterParameters);
+
 }
 
 CodeGenModule::~CodeGenModule() {}
@@ -416,6 +422,7 @@ void CodeGenModule::Release() {
       (Context.getLangOpts().Modules || !LinkerOptionsMetadata.empty())) {
     EmitModuleLinkOptions();
   }
+
   if (CodeGenOpts.DwarfVersion) {
     // We actually want the latest version when there are conflicts.
     // We can change from Warning to Latest if such mode is supported.

Added: cfe/branches/release_40/test/CodeGen/pr3997.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/test/CodeGen/pr3997.c?rev=304294&view=auto
==============================================================================
--- cfe/branches/release_40/test/CodeGen/pr3997.c (added)
+++ cfe/branches/release_40/test/CodeGen/pr3997.c Wed May 31 04:58:36 2017
@@ -0,0 +1,13 @@
+// RUN: %clang_cc1 %s -triple i386-unknown-linux-gnu -mregparm 3 -emit-llvm -o - | FileCheck %s
+
+void *memcpy(void *dest, const void *src, unsigned int n);
+
+void use_builtin_memcpy(void *dest, const void *src, unsigned int n) {
+  __builtin_memcpy(dest, src, n);
+}
+
+void use_memcpy(void *dest, const void *src, unsigned int n) {
+  memcpy(dest, src, n);
+}
+
+//CHECK: !{i32 1, !"NumRegisterParameters", i32 3}

Modified: cfe/branches/release_40/test/Headers/altivec-header.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/test/Headers/altivec-header.c?rev=304294&r1=304293&r2=304294&view=diff
==============================================================================
--- cfe/branches/release_40/test/Headers/altivec-header.c (original)
+++ cfe/branches/release_40/test/Headers/altivec-header.c Wed May 31 04:58:36 2017
@@ -9,4 +9,4 @@
 
 // CHECK: target triple = "powerpc64-
 // CHECK-NEXT: {{^$}}
-// CHECK-NEXT: llvm.ident
+// CHECK-NEXT: {{llvm\..*}}