From 7188706c4fbbae660fa7eb6f2bf13130ddf1726a Mon Sep 17 00:00:00 2001
From: "A.J. Gardner" <aaron.j.gardner@gmail.com>
Date: Sat, 20 Jan 2018 14:32:33 -0600
Subject: Teach rustc about DW_AT_noreturn and a few more DIFlags

---
 src/test/codegen/noreturnflag.rs | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 src/test/codegen/noreturnflag.rs

(limited to 'src/test/codegen')

diff --git a/src/test/codegen/noreturnflag.rs b/src/test/codegen/noreturnflag.rs
new file mode 100644
index 00000000000..473fed8e046
--- /dev/null
+++ b/src/test/codegen/noreturnflag.rs
@@ -0,0 +1,29 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// ignore-tidy-linelength
+// min-llvm-version 3.8
+
+// compile-flags: -g -C no-prepopulate-passes
+
+// CHECK-LABEL: foo
+// CHECK: {{.*}}DISubprogram{{.*}} name: "foo",{{.*}}DIFlagNoReturn{{.*}}
+
+#[no_mangle]
+pub fn foo() -> ! {
+    loop {}
+}
+
+// CHECK-LABEL: main
+// CHECK: {{.*}}DISubprogram{{.*}}name: "main",{{.*}}DIFlagMainSubprogram{{.*}}
+
+pub fn main() {
+    foo();
+}
-- 
cgit 1.4.1-3-g733a5


From f7f6598083f24191bbdb170b993dbf97abd1b5c9 Mon Sep 17 00:00:00 2001
From: "A.J. Gardner" <aaron.j.gardner@gmail.com>
Date: Sat, 20 Jan 2018 21:22:11 -0600
Subject: Simplify and fix test

---
 src/test/codegen/noreturnflag.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/test/codegen')

diff --git a/src/test/codegen/noreturnflag.rs b/src/test/codegen/noreturnflag.rs
index 473fed8e046..3fa7921b444 100644
--- a/src/test/codegen/noreturnflag.rs
+++ b/src/test/codegen/noreturnflag.rs
@@ -13,15 +13,12 @@
 
 // compile-flags: -g -C no-prepopulate-passes
 
-// CHECK-LABEL: foo
-// CHECK: {{.*}}DISubprogram{{.*}} name: "foo",{{.*}}DIFlagNoReturn{{.*}}
+// CHECK: {{.*}}DISubprogram{{.*}}name: "foo"{{.*}}DIFlagNoReturn
 
-#[no_mangle]
-pub fn foo() -> ! {
+fn foo() -> ! {
     loop {}
 }
 
-// CHECK-LABEL: main
 // CHECK: {{.*}}DISubprogram{{.*}}name: "main",{{.*}}DIFlagMainSubprogram{{.*}}
 
 pub fn main() {
-- 
cgit 1.4.1-3-g733a5


From e0f9b26899ea16bb2b6b966266e46698ebad9c4a Mon Sep 17 00:00:00 2001
From: "A.J. Gardner" <aaron.j.gardner@gmail.com>
Date: Sun, 21 Jan 2018 12:36:25 -0600
Subject: Ensure test doesn't run with llvm 3.9

---
 src/rustllvm/RustWrapper.cpp     | 2 +-
 src/test/codegen/noreturnflag.rs | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/test/codegen')

diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index 2e8207d1cbb..42ddf5663f9 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -548,7 +548,6 @@ static unsigned fromRust(LLVMRustDIFlags Flags) {
   if (isSet(Flags & LLVMRustDIFlags::FlagRValueReference)) {
     Result |= DINode::DIFlags::FlagRValueReference;
   }
-#if LLVM_RUSTLLVM || LLVM_VERSION_GE(4, 0)
   if (isSet(Flags & LLVMRustDIFlags::FlagExternalTypeRef)) {
     Result |= DINode::DIFlags::FlagExternalTypeRef;
   }
@@ -558,6 +557,7 @@ static unsigned fromRust(LLVMRustDIFlags Flags) {
   if (isSet(Flags & LLVMRustDIFlags::FlagBitField)) {
     Result |= DINode::DIFlags::FlagBitField;
   }
+#if LLVM_RUSTLLVM || LLVM_VERSION_GE(4, 0)
   if (isSet(Flags & LLVMRustDIFlags::FlagNoReturn)) {
     Result |= DINode::DIFlags::FlagNoReturn;
   }
diff --git a/src/test/codegen/noreturnflag.rs b/src/test/codegen/noreturnflag.rs
index 3fa7921b444..24a5a4e44cb 100644
--- a/src/test/codegen/noreturnflag.rs
+++ b/src/test/codegen/noreturnflag.rs
@@ -9,7 +9,7 @@
 // except according to those terms.
 
 // ignore-tidy-linelength
-// min-llvm-version 3.8
+// min-llvm-version 4.0
 
 // compile-flags: -g -C no-prepopulate-passes
 
@@ -19,8 +19,6 @@ fn foo() -> ! {
     loop {}
 }
 
-// CHECK: {{.*}}DISubprogram{{.*}}name: "main",{{.*}}DIFlagMainSubprogram{{.*}}
-
 pub fn main() {
     foo();
 }
-- 
cgit 1.4.1-3-g733a5