Post rebase fixes

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/StringBuiltins.java

@@ -25,6 +25,12 @@
  */
 package com.oracle.graal.python.builtins.objects.str;
 
+import static com.oracle.graal.python.nodes.BuiltinNames.ENCODE;
+import static com.oracle.graal.python.nodes.BuiltinNames.FORMAT;
+import static com.oracle.graal.python.nodes.BuiltinNames.FORMAT_MAP;
+import static com.oracle.graal.python.nodes.ErrorMessages.ENCODER_RETURNED_P_INSTEAD_OF_BYTES;
+import static com.oracle.graal.python.nodes.ErrorMessages.OBJ_NOT_SUBSCRIPTABLE;
+import static com.oracle.graal.python.nodes.ErrorMessages.TAKES_EXACTLY_S_ARGUMENTS_D_GIVEN;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ADD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__CONTAINS__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__EQ__;
@@ -83,6 +89,7 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceNodesFactory.GetObjectArrayNodeGen;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.dict.PDict;
+import com.oracle.graal.python.builtins.objects.function.PKeyword;
 import com.oracle.graal.python.builtins.objects.iterator.PStringIterator;
 import com.oracle.graal.python.builtins.objects.list.ListBuiltins.ListReverseNode;
 import com.oracle.graal.python.builtins.objects.list.PList;
@@ -100,17 +107,10 @@
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.tuple.TupleBuiltins;
 import com.oracle.graal.python.builtins.objects.type.TypeNodes.IsSameTypeNode;
-import com.oracle.graal.python.builtins.objects.function.PKeyword;
-import com.oracle.graal.python.builtins.objects.object.PythonObjectLibrary;
+import com.oracle.graal.python.lib.PyMappingCheckNode;
 import com.oracle.graal.python.lib.PyNumberAsSizeNode;
 import com.oracle.graal.python.lib.PyObjectHashNode;
-import static com.oracle.graal.python.nodes.BuiltinNames.ENCODE;
-import static com.oracle.graal.python.nodes.BuiltinNames.FORMAT;
-import static com.oracle.graal.python.nodes.BuiltinNames.FORMAT_MAP;
 import com.oracle.graal.python.nodes.ErrorMessages;
-import static com.oracle.graal.python.nodes.ErrorMessages.ENCODER_RETURNED_P_INSTEAD_OF_BYTES;
-import static com.oracle.graal.python.nodes.ErrorMessages.OBJ_NOT_SUBSCRIPTABLE;
-import static com.oracle.graal.python.nodes.ErrorMessages.TAKES_EXACTLY_S_ARGUMENTS_D_GIVEN;
 import com.oracle.graal.python.nodes.PGuards;
 import com.oracle.graal.python.nodes.PRaiseNode;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
@@ -270,11 +270,11 @@ protected ArgumentClinicProvider getArgumentClinic() {
             return StringBuiltinsClinicProviders.FormatMapNodeClinicProviderGen.INSTANCE;
         }
 
-        @Specialization(guards = "lib.isMapping(mapping)", limit = "1")
+        @Specialization(guards = "checkMapping.execute(mapping)", limit = "1")
         String format(VirtualFrame frame, String self, Object mapping,
                         @Cached BuiltinFunctions.FormatNode format,
                         @Cached OperatorModuleBuiltins.GetItemNode getItem,
-                        @SuppressWarnings("unused") @CachedLibrary("mapping") PythonObjectLibrary lib) {
+                        @SuppressWarnings("unused") @Cached PyMappingCheckNode checkMapping) {
 
             TemplateFormatter template = new TemplateFormatter(self);
 
@@ -289,9 +289,9 @@ String format(VirtualFrame frame, String self, Object mapping,
         }
 
         @SuppressWarnings("unused")
-        @Specialization(guards = {"!lib.isMapping(obj)", "!isNone(obj)"}, limit = "1")
+        @Specialization(guards = {"!checkMapping.execute(obj)", "!isNone(obj)"}, limit = "1")
         String format(String self, Object obj,
-                        @SuppressWarnings("unused") @CachedLibrary("obj") PythonObjectLibrary lib) {
+                        @SuppressWarnings("unused") @Cached PyMappingCheckNode checkMapping) {
             throw raise(TypeError, OBJ_NOT_SUBSCRIPTABLE, obj);
         }