Index: lld/trunk/test/ELF/lto/opt-remarks.ll
===================================================================
--- lld/trunk/test/ELF/lto/opt-remarks.ll
+++ lld/trunk/test/ELF/lto/opt-remarks.ll
@@ -15,13 +15,13 @@
 ; CHECK-NEXT:  ret i32 %a.i
 ; CHECK-NEXT: }
 
-; YAML: --- !Analysis
+; YAML:      --- !Passed
 ; YAML-NEXT: Pass:            inline
-; YAML-NEXT: Name:            CanBeInlined
+; YAML-NEXT: Name:            Inlined
 ; YAML-NEXT: Function:        main
 ; YAML-NEXT: Args:
 ; YAML-NEXT:   - Callee:          tinkywinky
-; YAML-NEXT:   - String:          ' can be inlined into '
+; YAML-NEXT:   - String:          ' inlined into '
 ; YAML-NEXT:   - Caller:          main
 ; YAML-NEXT:   - String:          ' with cost='
 ; YAML-NEXT:   - Cost:            '0'
@@ -29,19 +29,9 @@
 ; YAML-NEXT:   - Threshold:       '337'
 ; YAML-NEXT:   - String:          ')'
 ; YAML-NEXT: ...
-; YAML-NEXT: --- !Passed
-; YAML-NEXT: Pass:            inline
-; YAML-NEXT: Name:            Inlined
-; YAML-NEXT: Function:        main
-; YAML-NEXT: Args:
-; YAML-NEXT:   - Callee:          tinkywinky
-; YAML-NEXT:   - String:          ' inlined into '
-; YAML-NEXT:   - Caller:          main
-; YAML-NEXT: ...
 
-; YAML-HOT: ...
-; YAML-HOT: --- !Passed
-; YAML-HOT: Pass:            inline
+; YAML-HOT:      --- !Passed
+; YAML-HOT-NEXT: Pass:            inline
 ; YAML-HOT-NEXT: Name:            Inlined
 ; YAML-HOT-NEXT: Function:        main
 ; YAML-HOT-NEXT: Hotness:         300
@@ -49,6 +39,11 @@
 ; YAML-HOT-NEXT:   - Callee:          tinkywinky
 ; YAML-HOT-NEXT:   - String:          ' inlined into '
 ; YAML-HOT-NEXT:   - Caller:          main
+; YAML-HOT-NEXT:   - String:          ' with cost='
+; YAML-HOT-NEXT:   - Cost:            '0'
+; YAML-HOT-NEXT:   - String:          ' (threshold='
+; YAML-HOT-NEXT:   - Threshold:       '337'
+; YAML-HOT-NEXT:   - String:          ')'
 ; YAML-HOT-NEXT: ...
 
 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"