--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java	Mon Oct 23 11:33:16 2017 +0200
+++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/WithObject.java	Mon Oct 23 13:03:01 2017 +0200
@@ -138,9 +138,9 @@
             find = expression.findProperty(fallBack, true);
             if (find != null) {
                 if (NO_SUCH_METHOD_NAME.equals(fallBack)) {
-                    link = expression.noSuchMethod(desc, request);
+                    link = expression.noSuchMethod(desc, request).addSwitchPoint(getProtoSwitchPoint(name));
                 } else if (NO_SUCH_PROPERTY_NAME.equals(fallBack)) {
-                    link = expression.noSuchProperty(desc, request);
+                    link = expression.noSuchProperty(desc, request).addSwitchPoint(getProtoSwitchPoint(name));
                 }
             }
         }