[llvm] 7ca7d81 - [Verifier] Restore defined-resolver verification for IFuncs

[Itay Bookstein via llvm-commits]

Author: Itay Bookstein
Date: 2022-02-26T12:56:14+02:00
New Revision: 7ca7d8126d4e47b48dbeb1bd3efd462c5bd889b1

URL: https://github.com/llvm/llvm-project/commit/7ca7d8126d4e47b48dbeb1bd3efd462c5bd889b1
DIFF: https://github.com/llvm/llvm-project/commit/7ca7d8126d4e47b48dbeb1bd3efd462c5bd889b1.diff

LOG: [Verifier] Restore defined-resolver verification for IFuncs

Now that clang no longer emits GlobalIFunc-s with a
declaration for a resolver, we can restore that check.
In addition, add a linkage check like the one we have
on GlobalAlias-es, and a Verifier test for ifuncs.

Signed-off-by: Itay Bookstein <ibookstein at gmail.com>

Reviewed By: MaskRay

Differential Revision: https://reviews.llvm.org/D120267

Added: 
    llvm/test/Verifier/ifunc.ll

Modified: 
    llvm/include/llvm/IR/GlobalIFunc.h
    llvm/lib/IR/Verifier.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/IR/GlobalIFunc.h b/llvm/include/llvm/IR/GlobalIFunc.h
index 10088ee2fff42..976772b343fd9 100644
--- a/llvm/include/llvm/IR/GlobalIFunc.h
+++ b/llvm/include/llvm/IR/GlobalIFunc.h
@@ -84,6 +84,11 @@ class GlobalIFunc final : public GlobalObject, public ilist_node<GlobalIFunc> {
     return FunctionType::get(IFuncValTy->getPointerTo(), false);
   }
 
+  static bool isValidLinkage(LinkageTypes L) {
+    return isExternalLinkage(L) || isLocalLinkage(L) || isWeakLinkage(L) ||
+           isLinkOnceLinkage(L);
+  }
+
   // Methods for support type inquiry through isa, cast, and dyn_cast:
   static bool classof(const Value *V) {
     return V->getValueID() == Value::GlobalIFuncVal;

diff  --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp
index 57c2d08782e58..11d27ebfaf9c8 100644
--- a/llvm/lib/IR/Verifier.cpp
+++ b/llvm/lib/IR/Verifier.cpp
@@ -836,13 +836,19 @@ void Verifier::visitGlobalAlias(const GlobalAlias &GA) {
 }
 
 void Verifier::visitGlobalIFunc(const GlobalIFunc &GI) {
+  Assert(GlobalIFunc::isValidLinkage(GI.getLinkage()),
+         "IFunc should have private, internal, linkonce, weak, linkonce_odr, "
+         "weak_odr, or external linkage!",
+         &GI);
   // Pierce through ConstantExprs and GlobalAliases and check that the resolver
-  // has a Function 
+  // is a Function definition.
   const Function *Resolver = GI.getResolverFunction();
   Assert(Resolver, "IFunc must have a Function resolver", &GI);
+  Assert(!Resolver->isDeclarationForLinker(),
+         "IFunc resolver must be a definition", &GI);
 
   // Check that the immediate resolver operand (prior to any bitcasts) has the
-  // correct type
+  // correct type.
   const Type *ResolverTy = GI.getResolver()->getType();
   const Type *ResolverFuncTy =
       GlobalIFunc::getResolverFunctionType(GI.getValueType());

diff  --git a/llvm/test/Verifier/ifunc.ll b/llvm/test/Verifier/ifunc.ll
new file mode 100644
index 0000000000000..e2130370e8da2
--- /dev/null
+++ b/llvm/test/Verifier/ifunc.ll
@@ -0,0 +1,29 @@
+; RUN:  not llvm-as %s -o /dev/null 2>&1 | FileCheck %s
+
+define void ()* @resolver() {
+  ret void ()* null
+}
+
+ at inval_linkage = extern_weak ifunc void (), void ()* ()* @resolver
+; CHECK: IFunc should have {{.*}} linkage!
+; CHECK-NEXT: @inval_linkage
+
+ at g = external global i32
+ at inval_objtype = ifunc void (), bitcast(i32* @g to void ()* ()*)
+; CHECK: IFunc must have a Function resolver
+
+declare void ()* @resolver_decl()
+ at inval_resolver_decl = ifunc void (), void ()* ()* @resolver_decl
+; CHECK: IFunc resolver must be a definition
+; CHECK-NEXT: @inval_resolver_decl
+
+define available_externally void ()* @resolver_linker_decl() {
+  ret void ()* null
+}
+ at inval_resolver_decl2 = ifunc void (), void ()* ()* @resolver_linker_decl
+; CHECK: IFunc resolver must be a definition
+; CHECK-NEXT: @inval_resolver_decl2
+
+ at inval_resolver_type = ifunc i32 (), void ()* ()* @resolver
+; CHECK: IFunc resolver has incorrect type
+; CHECK-NEXT: @inval_resolver_type