diff --git a/Source/JavaScriptCore/dfg/DFGOperations.cpp b/Source/JavaScriptCore/dfg/DFGOperations.cpp
index dd5e71c..02077c5 100644
--- a/Source/JavaScriptCore/dfg/DFGOperations.cpp
+++ b/Source/JavaScriptCore/dfg/DFGOperations.cpp
@@ -111,7 +111,7 @@
     }
 
     // Don't put to an object if toString throws an exception.
-    PropertyName propertyName = property.toPropertyKey(exec);
+    auto propertyName = property.toPropertyKey(exec);
     if (!vm->exception()) {
         PutPropertySlot slot(baseValue, strict);
         if (direct) {
@@ -296,7 +296,7 @@
         }
     }
 
-    PropertyName propertyName = property.toPropertyKey(exec);
+    auto propertyName = property.toPropertyKey(exec);
     return JSValue::encode(baseValue.get(exec, propertyName));
 }
 
@@ -324,7 +324,7 @@
         }
     }
 
-    PropertyName propertyName = property.toPropertyKey(exec);
+    auto propertyName = property.toPropertyKey(exec);
     return JSValue::encode(JSValue(base).get(exec, propertyName));
 }
 
