[PATCH] D78125: [AVR] Use the correct address space for non-prototyped function calls

[Ayke via Phabricator via llvm-commits]

aykevl updated this revision to Diff 257548.
aykevl added a comment.

Update to use the function pointer address space from the function declaration.

(This is slightly different from what @rjmccall suggested but I think this is more readable).


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D78125/new/

https://reviews.llvm.org/D78125

Files:
  clang/lib/CodeGen/CGExpr.cpp
  clang/test/CodeGen/address-space-avr.c


Index: clang/test/CodeGen/address-space-avr.c
===================================================================
--- /dev/null
+++ clang/test/CodeGen/address-space-avr.c
@@ -0,0 +1,9 @@
+// RUN: %clang_cc1 -triple avr -emit-llvm < %s | FileCheck %s
+
+// CHECK: define void @bar() addrspace(1)
+// CHECK: call addrspace(1) void bitcast (void (...) addrspace(1)* @foo to void (i16) addrspace(1)*)(i16 3)
+// CHECK: declare void @foo(...) addrspace(1)
+void foo();
+void bar(void) {
+	foo(3);
+}
Index: clang/lib/CodeGen/CGExpr.cpp
===================================================================
--- clang/lib/CodeGen/CGExpr.cpp
+++ clang/lib/CodeGen/CGExpr.cpp
@@ -5048,7 +5048,8 @@
   // to the function type.
   if (isa<FunctionNoProtoType>(FnType) || Chain) {
     llvm::Type *CalleeTy = getTypes().GetFunctionType(FnInfo);
-    CalleeTy = CalleeTy->getPointerTo();
+    int AS = Callee.getFunctionPointer()->getType()->getPointerAddressSpace();
+    CalleeTy = CalleeTy->getPointerTo(AS);
 
     llvm::Value *CalleePtr = Callee.getFunctionPointer();
     CalleePtr = Builder.CreateBitCast(CalleePtr, CalleeTy, "callee.knr.cast");


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D78125.257548.patch
Type: text/x-patch
Size: 1138 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200414/c4eff7bf/attachment-0001.bin>