Index: llvm/test/Other/ChangePrinters/DotCfg/print-changed-dot-cfg.ll =================================================================== --- llvm/test/Other/ChangePrinters/DotCfg/print-changed-dot-cfg.ll +++ llvm/test/Other/ChangePrinters/DotCfg/print-changed-dot-cfg.ll @@ -131,17 +131,17 @@ ; CHECK-DOT-CFG-SIMPLE-NEXT:
; CHECK-DOT-CFG-SIMPLE-NEXT: 1. Pass InstSimplifyPass on g
; CHECK-DOT-CFG-SIMPLE-NEXT:

-; CHECK-DOT-CFG-SIMPLE-NEXT: 2. PassManager<llvm::Function> on g ignored
+; CHECK-DOT-CFG-SIMPLE-NEXT: 2. PassManager{{.*}} on g ignored
; CHECK-DOT-CFG-SIMPLE-NEXT: 3. Pass InstSimplifyPass on f
; CHECK-DOT-CFG-SIMPLE-NEXT:

-; CHECK-DOT-CFG-SIMPLE-NEXT: 4. PassManager<llvm::Function> on f ignored
+; CHECK-DOT-CFG-SIMPLE-NEXT: 4. PassManager{{.*}} on f ignored
; CHECK-DOT-CFG-SIMPLE-NEXT: 5. ModuleToFunctionPassAdaptor on [module] ignored
; CHECK-DOT-CFG-SIMPLE-NEXT: 6. Pass PrintModulePass on [module] omitted because no change
; CHECK-DOT-CFG-SIMPLE-NEXT: ; CHECK-DOT-CFG-FUNC-FILTER: passes.html ; CHECK-DOT-CFG-FUNC-FILTER-NEXT: 0. Pass InstSimplifyPass on g filtered out
-; CHECK-DOT-CFG-FUNC-FILTER-NEXT: 1. PassManager<llvm::Function> on g ignored
+; CHECK-DOT-CFG-FUNC-FILTER-NEXT: 1. PassManager{{.*}} on g ignored
; CHECK-DOT-CFG-FUNC-FILTER-NEXT: ; CHECK-DOT-CFG-FUNC-FILTER-NEXT:
; CHECK-DOT-CFG-FUNC-FILTER-NEXT:

@@ -150,7 +150,7 @@ ; CHECK-DOT-CFG-FUNC-FILTER-NEXT:


; CHECK-DOT-CFG-FUNC-FILTER-NEXT: 3. Pass InstSimplifyPass on f
; CHECK-DOT-CFG-FUNC-FILTER-NEXT:

-; CHECK-DOT-CFG-FUNC-FILTER-NEXT: 4. PassManager<llvm::Function> on f ignored
+; CHECK-DOT-CFG-FUNC-FILTER-NEXT: 4. PassManager{{.*}} on f ignored
; CHECK-DOT-CFG-FUNC-FILTER-NEXT: 5. ModuleToFunctionPassAdaptor on [module] ignored
; CHECK-DOT-CFG-FUNC-FILTER-NEXT: 6. Pass PrintModulePass on [module] omitted because no change
; CHECK-DOT-CFG-FUNC-FILTER-NEXT: @@ -164,10 +164,10 @@ ; CHECK-DOT-CFG-PRINT-MOD-SCOPE-NEXT:
; CHECK-DOT-CFG-PRINT-MOD-SCOPE-NEXT: 1. Pass InstSimplifyPass on g
; CHECK-DOT-CFG-PRINT-MOD-SCOPE-NEXT:

-; CHECK-DOT-CFG-PRINT-MOD-SCOPE-NEXT: 2. PassManager<llvm::Function> on g ignored
+; CHECK-DOT-CFG-PRINT-MOD-SCOPE-NEXT: 2. PassManager{{.*}} on g ignored
; CHECK-DOT-CFG-PRINT-MOD-SCOPE-NEXT: 3. Pass InstSimplifyPass on f
; CHECK-DOT-CFG-PRINT-MOD-SCOPE-NEXT:

-; CHECK-DOT-CFG-PRINT-MOD-SCOPE-NEXT: 4. PassManager<llvm::Function> on f ignored
+; CHECK-DOT-CFG-PRINT-MOD-SCOPE-NEXT: 4. PassManager{{.*}} on f ignored
; CHECK-DOT-CFG-PRINT-MOD-SCOPE-NEXT: 5. ModuleToFunctionPassAdaptor on [module] ignored
; CHECK-DOT-CFG-PRINT-MOD-SCOPE-NEXT: 6. Pass PrintModulePass on [module] omitted because no change
; CHECK-DOT-CFG-PRINT-MOD-SCOPE-NEXT: @@ -181,10 +181,10 @@ ; CHECK-DOT-CFG-FILTER-MULT-FUNC-NEXT:
; CHECK-DOT-CFG-FILTER-MULT-FUNC-NEXT: 1. Pass InstSimplifyPass on g
; CHECK-DOT-CFG-FILTER-MULT-FUNC-NEXT:

-; CHECK-DOT-CFG-FILTER-MULT-FUNC-NEXT: 2. PassManager<llvm::Function> on g ignored
+; CHECK-DOT-CFG-FILTER-MULT-FUNC-NEXT: 2. PassManager{{.*}} on g ignored
; CHECK-DOT-CFG-FILTER-MULT-FUNC-NEXT: 3. Pass InstSimplifyPass on f
; CHECK-DOT-CFG-FILTER-MULT-FUNC-NEXT:

-; CHECK-DOT-CFG-FILTER-MULT-FUNC-NEXT: 4. PassManager<llvm::Function> on f ignored
+; CHECK-DOT-CFG-FILTER-MULT-FUNC-NEXT: 4. PassManager{{.*}} on f ignored
; CHECK-DOT-CFG-FILTER-MULT-FUNC-NEXT: 5. ModuleToFunctionPassAdaptor on [module] ignored
; CHECK-DOT-CFG-FILTER-MULT-FUNC-NEXT: 6. Pass PrintModulePass on [module] omitted because no change
; CHECK-DOT-CFG-FILTER-MULT-FUNC-NEXT: @@ -198,10 +198,10 @@ ; CHECK-DOT-CFG-FILTER-PASSES-NEXT:

; CHECK-DOT-CFG-FILTER-PASSES-NEXT:
; CHECK-DOT-CFG-FILTER-PASSES-NEXT: 2. Pass NoOpFunctionPass on g omitted because no change
-; CHECK-DOT-CFG-FILTER-PASSES-NEXT: 3. PassManager<llvm::Function> on g ignored
+; CHECK-DOT-CFG-FILTER-PASSES-NEXT: 3. PassManager{{.*}} on g ignored
; CHECK-DOT-CFG-FILTER-PASSES-NEXT: 4. Pass InstSimplifyPass on f filtered out
; CHECK-DOT-CFG-FILTER-PASSES-NEXT: 5. Pass NoOpFunctionPass on f omitted because no change
-; CHECK-DOT-CFG-FILTER-PASSES-NEXT: 6. PassManager<llvm::Function> on f ignored
+; CHECK-DOT-CFG-FILTER-PASSES-NEXT: 6. PassManager{{.*}} on f ignored
; CHECK-DOT-CFG-FILTER-PASSES-NEXT: 7. ModuleToFunctionPassAdaptor on [module] ignored
; CHECK-DOT-CFG-FILTER-PASSES-NEXT: 8. Pass PrintModulePass on [module] filtered out
; CHECK-DOT-CFG-FILTER-PASSES-NEXT: @@ -218,11 +218,11 @@ ; CHECK-DOT-CFG-FILTER-MULT-PASSES-NEXT: 1. Pass InstSimplifyPass on g
; CHECK-DOT-CFG-FILTER-MULT-PASSES-NEXT:

; CHECK-DOT-CFG-FILTER-MULT-PASSES-NEXT: 2. Pass NoOpFunctionPass on g omitted because no change
-; CHECK-DOT-CFG-FILTER-MULT-PASSES-NEXT: 3. PassManager<llvm::Function> on g ignored
+; CHECK-DOT-CFG-FILTER-MULT-PASSES-NEXT: 3. PassManager{{.*}} on g ignored
; CHECK-DOT-CFG-FILTER-MULT-PASSES-NEXT: 4. Pass InstSimplifyPass on f
; CHECK-DOT-CFG-FILTER-MULT-PASSES-NEXT:

; CHECK-DOT-CFG-FILTER-MULT-PASSES-NEXT: 5. Pass NoOpFunctionPass on f omitted because no change
-; CHECK-DOT-CFG-FILTER-MULT-PASSES-NEXT: 6. PassManager<llvm::Function> on f ignored
+; CHECK-DOT-CFG-FILTER-MULT-PASSES-NEXT: 6. PassManager{{.*}} on f ignored
; CHECK-DOT-CFG-FILTER-MULT-PASSES-NEXT: 7. ModuleToFunctionPassAdaptor on [module] ignored
; CHECK-DOT-CFG-FILTER-MULT-PASSES-NEXT: 8. Pass PrintModulePass on [module] filtered out
; CHECK-DOT-CFG-FILTER-MULT-PASSES-NEXT: @@ -230,7 +230,7 @@ ; CHECK-DOT-CFG-FILTER-FUNC-PASSES: passes.html ; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT: 0. Pass InstSimplifyPass on g filtered out
; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT: 1. Pass NoOpFunctionPass on g filtered out
-; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT: 2. PassManager<llvm::Function> on g ignored
+; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT: 2. PassManager{{.*}} on g ignored
; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT: ; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT:
; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT:

@@ -240,7 +240,7 @@ ; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT: 4. Pass InstSimplifyPass on f
; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT:

; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT: 5. Pass NoOpFunctionPass on f omitted because no change
-; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT: 6. PassManager<llvm::Function> on f ignored
+; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT: 6. PassManager{{.*}} on f ignored
; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT: 7. ModuleToFunctionPassAdaptor on [module] ignored
; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT: 8. Pass PrintModulePass on [module] filtered out
; CHECK-DOT-CFG-FILTER-FUNC-PASSES-NEXT: @@ -249,7 +249,7 @@ ; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC: passes.html ; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT: 0. Pass InstSimplifyPass on g filtered out
; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT: 1. Pass InstSimplifyPass on g filtered out
-; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT: 2. PassManager<llvm::Function> on g ignored
+; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT: 2. PassManager{{.*}} on g ignored
; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT: ; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT:
; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT:

@@ -259,7 +259,7 @@ ; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT: 4. Pass InstSimplifyPass on f
; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT:

; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT: 5. Pass InstSimplifyPass on f omitted because no change
-; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT: 6. PassManager<llvm::Function> on f ignored
+; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT: 6. PassManager{{.*}} on f ignored
; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT: 7. ModuleToFunctionPassAdaptor on [module] ignored
; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT: 8. Pass PrintModulePass on [module] omitted because no change
; CHECK-DOT-CFG-MULT-PASSES-FILTER-FUNC-NEXT: