Simplify optimization-remark.c test following r211610

With LocTrackingOnly there's no longer a user-facing distinction so the NDEBUG
checks can go away. (Except maybe column info, but -verify only checks line
numbers anyway.)

Also add a RUN line to validate the traditional !LocTrackingOnly case.

llvm-svn: 211622

1 files changed, 7 insertions, 12 deletions

diff --git a/clang/test/Frontend/optimization-remark.c b/clang/test/Frontend/optimization-remark.c
index a0921086767..e512253682a 100644
--- a/clang/test/Frontend/optimization-remark.c
+++ b/clang/test/Frontend/optimization-remark.c
@@ -4,7 +4,7 @@
 // optimization level.
 
 // RUN: %clang_cc1 %s -Rpass=inline -Rpass-analysis=inline -Rpass-missed=inline -O0 -emit-llvm-only -verify
-// RUN: %clang_cc1 %s -DNDEBUG -Rpass=inline -emit-llvm-only -verify
+// RUN: %clang_cc1 %s -Rpass=inline -Rpass-analysis=inline -Rpass-missed=inline -O0 -emit-llvm-only -gline-tables-only -verify
 // RUN: %clang_cc1 %s -Rpass=inline -emit-llvm -o - 2>/dev/null | FileCheck %s
 
 // -Rpass should produce source location annotations, exclusively (just
@@ -26,16 +26,11 @@ float foz(int x, int y) { return x * y; }
 // twice.
 //
 int bar(int j) {
-#ifndef NDEBUG
-// expected-remark@+7 {{foz should never be inlined (cost=never)}}
-// expected-remark@+6 {{foz will not be inlined into bar}}
-// expected-remark@+5 {{foz should never be inlined}}
-// expected-remark@+4 {{foz will not be inlined into bar}}
-// expected-remark@+3 {{foo should always be inlined}}
-// expected-remark@+2 {{foo inlined into bar}}
-#endif
+// expected-remark@+6 {{foz should never be inlined (cost=never)}}
+// expected-remark@+5 {{foz will not be inlined into bar}}
+// expected-remark@+4 {{foz should never be inlined}}
+// expected-remark@+3 {{foz will not be inlined into bar}}
+// expected-remark@+2 {{foo should always be inlined}}
+// expected-remark@+1 {{foo inlined into bar}}
   return foo(j, j - 2) * foz(j - 2, j);
 }
-#ifdef NDEBUG
-// expected-remark@-3 {{foo inlined into bar}}
-#endif