Skip to content

Commit f5e89bd

Browse files
committed
KeywordsStorage: fix merge conflict
1 parent 7d05fc7 commit f5e89bd

File tree

1 file changed

+0
-12
lines changed
  • graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common

1 file changed

+0
-12
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/KeywordsStorage.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -229,18 +229,6 @@ static Object generic(KeywordsStorage self, ForEachNode<Object> node, Object arg
229229
result = node.execute(entry.getName(), result);
230230
}
231231
return result;
232-
static Object generic(KeywordsStorage self, ForEachNode<Object> node, Object arg, @Shared("gil") @Cached GilNode gil) {
233-
boolean mustRelease = gil.acquire();
234-
try {
235-
Object result = arg;
236-
for (int i = 0; i < self.length(); i++) {
237-
PKeyword entry = self.keywords[i];
238-
result = node.execute(entry.getName(), result);
239-
}
240-
return result;
241-
} finally {
242-
gil.release(mustRelease);
243-
}
244232
}
245233
}
246234

0 commit comments

Comments
 (0)