Skip to content

Commit 92b873d

Browse files
committed
Remove unnecessary usage of ArrayBuilderNode
1 parent fad0e74 commit 92b873d

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

src/main/java/org/truffleruby/core/regexp/TruffleRegexpNodes.java

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -419,23 +419,20 @@ protected <T> RubyArray fillinInstrumentData(Map<T, AtomicInteger> map, ArrayBui
419419
BuilderState state = arrayBuilderNode.start(arraySize);
420420
int n = 0;
421421
for (Entry<T, AtomicInteger> e : map.entrySet()) {
422-
arrayBuilderNode
423-
.appendValue(state, n++,
424-
StringOperations.createUTF8String(context, getLanguage(), e.getKey().toString()));
422+
arrayBuilderNode.appendValue(state, n++,
423+
StringOperations.createUTF8String(context, getLanguage(), e.getKey().toString()));
425424
arrayBuilderNode.appendValue(state, n++, e.getValue().get());
426425
}
427426
return createArray(arrayBuilderNode.finish(state, n), n);
428427
}
429428

430429
@TruffleBoundary
431-
protected <T> RubyArray fillinInstrumentData(Set<T> map, ArrayBuilderNode arrayBuilderNode,
432-
RubyContext context) {
430+
protected <T> RubyArray fillinInstrumentData(Set<T> map, ArrayBuilderNode arrayBuilderNode) {
433431
final int arraySize = (LITERAL_REGEXPS.size() + DYNAMIC_REGEXPS.size()) * 2;
434432
BuilderState state = arrayBuilderNode.start(arraySize);
435433
int n = 0;
436434
for (T e : map) {
437-
arrayBuilderNode
438-
.appendValue(state, n++, e);
435+
arrayBuilderNode.appendValue(state, n++, e);
439436
arrayBuilderNode.appendValue(state, n++, 1);
440437
}
441438
return createArray(arrayBuilderNode.finish(state, n), n);
@@ -480,8 +477,7 @@ protected Object buildStatsArray(boolean literalRegexps,
480477
@Cached ArrayBuilderNode arrayBuilderNode) {
481478
return fillinInstrumentData(
482479
literalRegexps ? LITERAL_REGEXPS : DYNAMIC_REGEXPS,
483-
arrayBuilderNode,
484-
getContext());
480+
arrayBuilderNode);
485481
}
486482
}
487483

@@ -503,23 +499,20 @@ public abstract static class UnusedRegexpsArray extends RegexpStatsNode {
503499

504500
@TruffleBoundary
505501
@Specialization
506-
protected Object buildUnusedRegexpsArray(
507-
@Cached ArrayBuilderNode arrayBuilderNode) {
502+
protected Object buildUnusedRegexpsArray() {
508503
final Set<RubyRegexp> compiledRegexps = allCompiledRegexps();
509504
final Set<RubyRegexp> matchedRegexps = allMatchedRegexps();
510505

511506
final Set<RubyRegexp> unusedRegexps = new HashSet<>(compiledRegexps);
512507
unusedRegexps.removeAll(matchedRegexps);
513508

514-
final BuilderState state = arrayBuilderNode.start(unusedRegexps.size());
509+
Object[] array = new Object[unusedRegexps.size()];
515510
int n = 0;
516511
for (RubyRegexp entry : unusedRegexps) {
517-
arrayBuilderNode
518-
.appendValue(state, n++,
519-
StringOperations.createUTF8String(getContext(), getLanguage(), entry.toString()));
512+
array[n++] = StringOperations.createUTF8String(getContext(), getLanguage(), entry.toString());
520513
}
521514

522-
return createArray(arrayBuilderNode.finish(state, n), n);
515+
return createArray(array);
523516
}
524517
}
525518

0 commit comments

Comments
 (0)