[clang] Fix tests for Emitting Single Inline Remark

lenary · lenary · commit 2307905561db · 2017-08-21T16:40:35.000Z
Summary: This change depends on https://reviews.llvm.org/D36054 and should be landed at the same time. Reviewers: anemet Reviewed By: anemet Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D36949 llvm-svn: 311347
diff --git a/clang/test/Frontend/optimization-remark-with-hotness.c b/clang/test/Frontend/optimization-remark-with-hotness.c
@@ -56,8 +56,7 @@ void bar(int x) {
   // THRESHOLD-NOT: hotness
   // NO_PGO: '-fdiagnostics-show-hotness' requires profile-guided optimization information
   // NO_PGO: '-fdiagnostics-hotness-threshold=' requires profile-guided optimization information
-  // expected-remark@+2 {{foo should always be inlined (cost=always) (hotness: 30)}}
-  // expected-remark@+1 {{foo inlined into bar (hotness: 30)}}
+  // expected-remark@+1 {{foo inlined into bar with cost=always}}
   sum += foo(x, x - 2);
 }
 
diff --git a/clang/test/Frontend/optimization-remark.c b/clang/test/Frontend/optimization-remark.c
@@ -42,9 +42,8 @@ float foz(int x, int y) { return x * y; }
 // twice.
 //
 int bar(int j) {
-// expected-remark@+4 {{foz not inlined into bar because it should never be inlined (cost=never)}}
 // expected-remark@+3 {{foz not inlined into bar because it should never be inlined (cost=never)}}
-// expected-remark@+2 {{foo should always be inlined}}
+// expected-remark@+2 {{foz not inlined into bar because it should never be inlined (cost=never)}}
 // expected-remark@+1 {{foo inlined into bar}}
   return foo(j, j - 2) * foz(j - 2, j);
 }

Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,7 @@ void bar(int x) {`
`56`	`56`	`// THRESHOLD-NOT: hotness`
`57`	`57`	`// NO_PGO: '-fdiagnostics-show-hotness' requires profile-guided optimization information`
`58`	`58`	`// NO_PGO: '-fdiagnostics-hotness-threshold=' requires profile-guided optimization information`
`59`		`- // expected-remark@+2 {{foo should always be inlined (cost=always) (hotness: 30)}}`
`60`		`- // expected-remark@+1 {{foo inlined into bar (hotness: 30)}}`
	`59`	`+ // expected-remark@+1 {{foo inlined into bar with cost=always}}`
`61`	`60`	`sum += foo(x, x - 2);`
`62`	`61`	`}`
`63`	`62`