Handle static function declaration that starts with a macro expansion

immunant · Oct 15, 2024 · 669f781 · 669f781
1 parent 4db0d95
commit 669f781
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/tests/static_addr_taken/include/static_fns.h b/tests/static_addr_taken/include/static_fns.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#define LOCAL static
+
 typedef void (*fn_ptr_ty)(void);
 
 static void inline_noop(void) {

diff --git a/tests/static_addr_taken/lib.c b/tests/static_addr_taken/lib.c
@@ -32,7 +32,7 @@ Test(static_addr_taken, call_ptrs_in_lib) {
 
 Test(static_addr_taken, call_ptr_from_main) {
     fn_ptr_ty *main_ptrs = get_ptrs_in_main();
-    for (int i = 0; i < 3; i++) {
+    for (int i = 0; i < 4; i++) {
         main_ptrs[i]();
     }
 }
diff --git a/tests/static_addr_taken/main.c b/tests/static_addr_taken/main.c
@@ -12,21 +12,25 @@ static void duplicate_noop(void) {
     printf("called %s in main binary\n", __func__);
 }
 
+LOCAL void macro_attr_noop(void) {
+    printf("called %s in main binary\n", __func__);
+}
+
 static void identical_name(void) {
     static int x = 3;
     printf("%s in main binary read x = %d\n", __func__, x);
 }
 
-static fn_ptr_ty ptrs[3] IA2_SHARED_DATA = {
-    inline_noop, duplicate_noop, identical_name
+static fn_ptr_ty ptrs[] IA2_SHARED_DATA = {
+    inline_noop, duplicate_noop, identical_name, macro_attr_noop,
 };
 
 fn_ptr_ty *get_ptrs_in_main(void) {
     return ptrs;
 }
 
 Test(static_addr_taken, call_ptrs_in_main) {
-    for (int i = 0; i < 3; i++) {
+    for (int i = 0; i < sizeof(ptrs) / sizeof(ptrs[0]); i++) {
         ptrs[i]();
     }
 }

diff --git a/tools/rewriter/SourceRewriter.cpp b/tools/rewriter/SourceRewriter.cpp
@@ -671,10 +671,12 @@ class FnPtrExpr : public RefactoringCallback {
       // internal_addr_taken_fns map. To make the rewriter idempotent we should
       // check for an existing used attribute.
       if (new_fn) {
-        auto decl_start = fn_decl->getBeginLoc();
-        if (!decl_start.isFileID()) {
+        auto static_fn_range = fn_decl->getSourceRange();
+        auto expansion_range = sm.getExpansionRange(static_fn_range);
+        if (!expansion_range.getBegin().isFileID()) {
           llvm::errs() << "Error: non-file loc for function " << fn_name << '\n';
         } else {
+          auto decl_start = expansion_range.getBegin();
           Filename decl_filename = get_filename(decl_start, sm);
           Replacement old_used_attr(sm, decl_start, 0,
                                     llvm::StringRef("__attribute__((used)) "));