r293493 - Adjust tests after folding inlining analysis into missed remarks

[Adam Nemet via cfe-commits]

Author: anemet
Date: Mon Jan 30 10:22:50 2017
New Revision: 293493

URL: http://llvm.org/viewvc/llvm-project?rev=293493&view=rev
Log:
Adjust tests after folding inlining analysis into missed remarks

Modified:
    cfe/trunk/test/Frontend/optimization-remark-with-hotness.c
    cfe/trunk/test/Frontend/optimization-remark.c

Modified: cfe/trunk/test/Frontend/optimization-remark-with-hotness.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/optimization-remark-with-hotness.c?rev=293493&r1=293492&r2=293493&view=diff
==============================================================================
--- cfe/trunk/test/Frontend/optimization-remark-with-hotness.c (original)
+++ cfe/trunk/test/Frontend/optimization-remark-with-hotness.c Mon Jan 30 10:22:50 2017
@@ -4,11 +4,13 @@
 // RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name \
 // RUN:     optimization-remark-with-hotness.c %s -emit-llvm-only \
 // RUN:     -fprofile-instrument-use-path=%t.profdata -Rpass=inline \
-// RUN:     -Rpass-analysis=inline -fdiagnostics-show-hotness -verify
+// RUN:     -Rpass-analysis=inline -Rpass-missed=inline \
+// RUN:     -fdiagnostics-show-hotness -verify
 // The clang version of the previous test.
 // RUN: %clang -target x86_64-apple-macosx10.9 %s -c -emit-llvm -o /dev/null \
 // RUN:     -fprofile-instr-use=%t.profdata -Rpass=inline \
-// RUN:     -Rpass-analysis=inline -fdiagnostics-show-hotness -Xclang -verify
+// RUN:     -Rpass-analysis=inline -Rpass-missed=inline \
+// RUN:     -fdiagnostics-show-hotness -Xclang -verify
 // RUN: %clang_cc1 -triple x86_64-apple-macosx10.9 -main-file-name \
 // RUN:     optimization-remark-with-hotness.c %s -emit-llvm-only \
 // RUN:     -fprofile-instrument-use-path=%t.profdata -Rpass=inline \
@@ -39,7 +41,7 @@ void bar(int x) {
 
 int main(int argc, const char *argv[]) {
   for (int i = 0; i < 30; i++)
-    // expected-remark at +1 {{bar should never be inlined}}
+    // expected-remark at +1 {{bar not inlined into main because it should never be inlined}}
     bar(argc);
   return sum;
 }

Modified: cfe/trunk/test/Frontend/optimization-remark.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Frontend/optimization-remark.c?rev=293493&r1=293492&r2=293493&view=diff
==============================================================================
--- cfe/trunk/test/Frontend/optimization-remark.c (original)
+++ cfe/trunk/test/Frontend/optimization-remark.c Mon Jan 30 10:22:50 2017
@@ -42,10 +42,8 @@ float foz(int x, int y) { return x * y;
 // twice.
 //
 int bar(int j) {
-// expected-remark at +6 {{foz should never be inlined (cost=never)}}
-// expected-remark at +5 {{foz will not be inlined into bar}}
-// expected-remark at +4 {{foz should never be inlined}}
-// expected-remark at +3 {{foz will not be inlined into bar}}
+// expected-remark at +4 {{foz not inlined into bar because it should never be inlined (cost=never)}}
+// expected-remark at +3 {{foz not inlined into bar because it should never be inlined (cost=never)}}
 // expected-remark at +2 {{foo should always be inlined}}
 // expected-remark at +1 {{foo inlined into bar}}
   return foo(j, j - 2) * foz(j - 2, j);