--- a/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java	Sat May 12 10:26:42 2018 +0200
+++ b/test/hotspot/jtreg/serviceability/sa/ClhsdbCDSCore.java	Sat May 12 17:22:56 2018 +0530
@@ -166,6 +166,9 @@
                 "No suitable match for type of address"));
             expStrMap.put("printall", List.of(
                 "aload_0",
+                "_nofast_aload_0",
+                "_nofast_getfield",
+                "_nofast_putfield",
                 "Constant Pool of",
                 "public static void main(java.lang.String[])",
                 "Bytecode",
@@ -175,6 +178,8 @@
                 "invokedynamic"));
             unExpStrMap.put("printall", List.of(
                 "sun.jvm.hotspot.types.WrongTypeException",
+                "illegal code",
+                "Failure occurred at bci",
                 "No suitable match for type of address"));
             test.runOnCore(TEST_CDS_CORE_FILE_NAME, cmds, expStrMap, unExpStrMap);
         } catch (Exception ex) {