[PATCH] D69522: [Bugpoint] Do not create illegal function attribute combos

[David Greene via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG055aeb527515: [Bugpoint] Do not create illegal function attribute combos (authored by greened).

Repository:
  rG LLVM Github Monorepo

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

https://reviews.llvm.org/D69522

Files:
  llvm/test/BugPoint/attr-crash.ll
  llvm/tools/bugpoint/CrashDebugger.cpp


Index: llvm/tools/bugpoint/CrashDebugger.cpp
===================================================================
--- llvm/tools/bugpoint/CrashDebugger.cpp
+++ llvm/tools/bugpoint/CrashDebugger.cpp
@@ -364,6 +364,11 @@
   // Set this new list of attributes on the function.
   F->setAttributes(NewAttrs);
 
+  // If the attribute list includes "optnone" we need to make sure it also
+  // includes "noinline" otherwise we will get a verifier failure.
+  if (F->hasFnAttribute(Attribute::OptimizeNone))
+    F->addFnAttr(Attribute::NoInline);
+
   // Try running on the hacked up program...
   if (TestFn(BD, M.get())) {
     BD.setNewProgram(std::move(M)); // It crashed, keep the trimmed version...
Index: llvm/test/BugPoint/attr-crash.ll
===================================================================
--- /dev/null
+++ llvm/test/BugPoint/attr-crash.ll
@@ -0,0 +1,16 @@
+; RUN: bugpoint -load %llvmshlibdir/BugpointPasses%shlibext %s -output-prefix %t -bugpoint-crashfuncattr 2>&1 | FileCheck %s
+; REQUIRES: plugins
+;
+; ModuleID = 'attr-crash.ll'
+source_filename = "test.c"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+
+; Function Attrs: noinline nounwind optnone uwtable
+define dso_local i32 @main(i32 %argc, i8** %argv) local_unnamed_addr #0 {
+  ret i32 0
+}
+
+; CHECK-NOT: Attribute 'optnone' requires 'noinline'!
+attributes #0 = { noinline nounwind optnone uwtable "bugpoint-crash" }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D69522.234083.patch
Type: text/x-patch
Size: 1498 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20191216/c3edbd0a/attachment.bin>