Fix for PR46384. Failure on weak dllimport.

[Sunil_Srivastava]

Summary

The patch simply relaxes the check. I think it is OK to have dllimport-weak-externals.

[wristow]

llvm/lib/IR/Verifier.cpp

593

This relaxation of the assertion-check LGTM.

llvm/test/Verifier/weak-dllimport.ll

2

This test seems somewhat complicated. Can it be simplified significantly, and still trigger the problem?

[Sunil_Srivastava]

llvm/test/Verifier/weak-dllimport.ll

2

Yes it can be simplified. Most of the executable code and attributes can go away. It will lose its connection to the source though. Is that preferred ?

[wristow]

llvm/test/Verifier/weak-dllimport.ll

2

IMO, yes that's preferred.

Leaving a fragment of source in as a comment to show how the situation came about is fine. But simplifying the IR of the test so it focuses on the problem makes it clearer to me.

[Sunil_Srivastava]

Simplified the test case.

[wristow]

In D86907#2250689, @Sunil_Srivastava wrote:

Simplified the test case.

Thanks. The reduced test looks good.

Overall: LGTM.

[Sunil_Srivastava]

Tweaked the test to specifically look for the error of interest

[wristow]

In D86907#2253599, @Sunil_Srivastava wrote:

Tweaked the test to specifically look for the error of interest

LGTM

llvm/lib/IR/Verifier.cpp

void Verifier::visitGlobalValue(const GlobalValue &GV) {
 
   if (GV.isDeclarationForLinker())
     Assert(!GV.hasComdat(), "Declaration may not be in a Comdat!", &GV);
 
   if (GV.hasDLLImportStorageClass()) {
     Assert(!GV.isDSOLocal(),
            "GlobalValue with DLLImport Storage is dso_local!", &GV);
 
-    Assert((GV.isDeclaration() && GV.hasExternalLinkage()) ||
+    Assert((GV.isDeclaration() &&
+            (GV.hasExternalLinkage() || GV.hasExternalWeakLinkage())) ||
                GV.hasAvailableExternallyLinkage(),
            "Global is marked as dllimport, but not external", &GV);
   }
 
   if (GV.isImplicitDSOLocal())
     Assert(GV.isDSOLocal(),
            "GlobalValue with local linkage or non-default "
            "visibility must be dso_local!",

llvm/test/Verifier/weak-dllimport.ll

+; RUN: opt -verify < %s 2>&1 | FileCheck %s
+; CHECK-NOT: Global is marked as dllimport, but not external
+
+target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-windows-msvc19.11.0"
+
+@"?var_hook@@3HA" = extern_weak dllimport global i32, align 4
+
+; Function Attrs: noinline optnone uwtable
+define dso_local zeroext i1 @"?foo@@YA_NPEAHH@Z"(i32* %0, i32 %1) #0 {
+   ret i1 0
+}
+
+declare extern_weak dllimport void @func_hook(i32) #1
+
+attributes #0 = { noinline optnone uwtable }
+attributes #1 = { uwtable }
+
+; Compiled from the following C++ example with --target=x86_64-pc-win32,
+; using the non-checking configuration
+;__declspec(dllimport) __attribute__((weak)) extern "C" void func_hook(int);
+;extern __declspec(dllimport) __attribute__((weak)) int var_hook;
+;bool foo(int *q, int p)
+;{
+;  if (func_hook)
+;    func_hook(p);
+;  return &var_hook == q;
+;}