[clang] 947905a - clang: Use correct address space for redeclared functions

[Matt Arsenault via cfe-commits]

Author: Matt Arsenault
Date: 2022-12-21T08:27:24-05:00
New Revision: 947905a1c5843b677849c3c4fadb524b6405c139

URL: https://github.com/llvm/llvm-project/commit/947905a1c5843b677849c3c4fadb524b6405c139
DIFF: https://github.com/llvm/llvm-project/commit/947905a1c5843b677849c3c4fadb524b6405c139.diff

LOG: clang: Use correct address space for redeclared functions

Fixes assert/verifier error with AVR.

Added: 
    clang/test/CodeGen/redeclare-function-addrspace.c

Modified: 
    clang/lib/CodeGen/CodeGenModule.cpp

Removed: 
    


################################################################################
diff  --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index c8783ea8578d..50e2f5bf212e 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -4056,7 +4056,7 @@ llvm::Constant *CodeGenModule::GetOrCreateLLVMFunction(
     }
 
     llvm::Constant *BC = llvm::ConstantExpr::getBitCast(
-        F, Entry->getValueType()->getPointerTo());
+        F, Entry->getValueType()->getPointerTo(Entry->getAddressSpace()));
     addGlobalValReplacement(Entry, BC);
   }
 

diff  --git a/clang/test/CodeGen/redeclare-function-addrspace.c b/clang/test/CodeGen/redeclare-function-addrspace.c
new file mode 100644
index 000000000000..bb434b99812d
--- /dev/null
+++ b/clang/test/CodeGen/redeclare-function-addrspace.c
@@ -0,0 +1,54 @@
+// NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py UTC_ARGS: --function-signature
+// REQUIRES: avr-registered-target
+// RUN: %clang_cc1 -triple avr-- -Wno-strict-prototypes -Wno-deprecated-non-prototype -emit-llvm -o - -verify %s | FileCheck %s
+// expected-no-diagnostics
+
+// Make sure redeclarations of functions as a 
diff erent type work when functions
+// use non-0 address spaces.
+
+int g();
+
+// CHECK-LABEL: define {{[^@]+}}@bar
+// CHECK-SAME: (i16 noundef [[I:%.*]], i16 noundef [[J:%.*]]) addrspace(1) #[[ATTR0:[0-9]+]] {
+// CHECK-NEXT:  entry:
+// CHECK-NEXT:    [[I_ADDR:%.*]] = alloca i16, align 1
+// CHECK-NEXT:    [[J_ADDR:%.*]] = alloca i16, align 1
+// CHECK-NEXT:    store i16 [[I]], ptr [[I_ADDR]], align 1
+// CHECK-NEXT:    store i16 [[J]], ptr [[J_ADDR]], align 1
+// CHECK-NEXT:    [[TMP0:%.*]] = load i16, ptr [[I_ADDR]], align 1
+// CHECK-NEXT:    [[TMP1:%.*]] = load i16, ptr [[J_ADDR]], align 1
+// CHECK-NEXT:    [[CALL:%.*]] = call addrspace(1) i16 @g(i16 noundef [[TMP0]], i16 noundef [[TMP1]])
+// CHECK-NEXT:    ret i16 [[CALL]]
+//
+int bar(int i, int j) {
+  return g(i, j);
+}
+
+// CHECK-LABEL: define {{[^@]+}}@foo
+// CHECK-SAME: (i16 noundef [[I:%.*]]) addrspace(1) #[[ATTR0]] {
+// CHECK-NEXT:  entry:
+// CHECK-NEXT:    [[I_ADDR:%.*]] = alloca i16, align 1
+// CHECK-NEXT:    store i16 [[I]], ptr [[I_ADDR]], align 1
+// CHECK-NEXT:    [[TMP0:%.*]] = load i16, ptr [[I_ADDR]], align 1
+// CHECK-NEXT:    [[CALL:%.*]] = call addrspace(1) i16 @g(i16 noundef [[TMP0]])
+// CHECK-NEXT:    ret i16 [[CALL]]
+//
+int foo(int i) {
+  return g(i);
+}
+
+// CHECK-LABEL: define {{[^@]+}}@g
+// CHECK-SAME: (i16 noundef [[X:%.*]], i16 noundef [[Y:%.*]]) addrspace(1) #[[ATTR0]] {
+// CHECK-NEXT:  entry:
+// CHECK-NEXT:    [[X_ADDR:%.*]] = alloca i16, align 1
+// CHECK-NEXT:    [[Y_ADDR:%.*]] = alloca i16, align 1
+// CHECK-NEXT:    store i16 [[X]], ptr [[X_ADDR]], align 1
+// CHECK-NEXT:    store i16 [[Y]], ptr [[Y_ADDR]], align 1
+// CHECK-NEXT:    [[TMP0:%.*]] = load i16, ptr [[X_ADDR]], align 1
+// CHECK-NEXT:    [[TMP1:%.*]] = load i16, ptr [[Y_ADDR]], align 1
+// CHECK-NEXT:    [[ADD:%.*]] = add nsw i16 [[TMP0]], [[TMP1]]
+// CHECK-NEXT:    ret i16 [[ADD]]
+//
+int g(int x, int y) {
+  return x + y;
+}