Skip to content

Commit 5686f67

Browse files
committed
unused parameters removed
1 parent 8f85d8c commit 5686f67

File tree

1 file changed

+20
-24
lines changed

1 file changed

+20
-24
lines changed

visualvm/heapviewer.truffle/src/org/graalvm/visualvm/heapviewer/truffle/TruffleStackTraces.java

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,7 @@ public Collection<StackTrace> getStackTraces() {
7171
public abstract static class StackTrace {
7272

7373
private final Instance thread;
74-
final Heap heap;
75-
76-
private StackTrace(Heap h, Instance t) {
77-
heap = h;
74+
private StackTrace(Instance t) {
7875
thread = t;
7976
}
8077

@@ -90,13 +87,13 @@ public static class Frame {
9087
private final String name;
9188
private final List<FieldValue> fieldValues;
9289

93-
private Frame(Heap heap, Instance callTarget, TruffleFrame localFrame) {
94-
name = getFrameName(callTarget, heap);
90+
private Frame(Instance callTarget, TruffleFrame localFrame) {
91+
name = getFrameName(callTarget);
9592
fieldValues = localFrame.getFieldValues();
9693
}
9794

98-
private Frame(Heap heap, Instance callTarget, Instance localFrame) {
99-
name = getFrameName(callTarget, heap);
95+
private Frame(Instance callTarget, Instance localFrame) {
96+
name = getFrameName(callTarget);
10097
fieldValues = new TruffleFrame(localFrame).getFieldValues();
10198
}
10299

@@ -108,7 +105,7 @@ public List<FieldValue> getFieldValues() {
108105
return fieldValues;
109106
}
110107

111-
private static String getFrameName(Instance callTarget, Heap heap) {
108+
private static String getFrameName(Instance callTarget) {
112109
Instance rootNode = (Instance) callTarget.getValueOfField("rootNode"); // NOI18N
113110

114111
if (rootNode != null) {
@@ -117,7 +114,7 @@ private static String getFrameName(Instance callTarget, Heap heap) {
117114
if (sourceSection != null) {
118115
Instance source = (Instance) sourceSection.getValueOfField("source"); // NOI18N
119116
if (source != null) {
120-
String fileName = getFileName(source, heap);
117+
String fileName = getFileName(source);
121118
return name+" ("+fileName+":"+getLineNumber(sourceSection, source)+")"; // NOI18N
122119
}
123120
}
@@ -127,7 +124,7 @@ private static String getFrameName(Instance callTarget, Heap heap) {
127124
}
128125
}
129126

130-
private static String getFileName(Instance source, Heap heap) {
127+
private static String getFileName(Instance source) {
131128
Object key = source.getValueOfField("key"); // NOI18N
132129
if (key instanceof Instance) {
133130
source = (Instance) key;
@@ -251,7 +248,7 @@ private Collection<StackTrace> getStackTraces(Heap heap, Instance stackTraces) {
251248
Instance topFrame = getTruffleFrameInstance(thread, stackTraces);
252249

253250
if (topFrame != null) {
254-
traces.add(new DefaultStackTrace(heap, thread, topFrame));
251+
traces.add(new DefaultStackTrace(thread, topFrame));
255252
}
256253
}
257254
}
@@ -297,8 +294,8 @@ private static class DefaultStackTrace extends StackTrace {
297294
private final Instance topFrame;
298295
private List<Frame> frames;
299296

300-
private DefaultStackTrace(Heap h, Instance t, Instance f) {
301-
super(h, t);
297+
private DefaultStackTrace(Instance t, Instance f) {
298+
super(t);
302299
topFrame = f;
303300
}
304301

@@ -308,7 +305,7 @@ public synchronized List<Frame> getFrames() {
308305
frames = new ArrayList();
309306

310307
do {
311-
frames.add(new DefaultFrame(heap, frame));
308+
frames.add(new DefaultFrame(frame));
312309
frame = (Instance) frame.getValueOfField("callerFrame"); // NOI18N
313310
} while (frame != null);
314311
}
@@ -318,10 +315,9 @@ public synchronized List<Frame> getFrames() {
318315

319316
private static class DefaultFrame extends Frame {
320317

321-
private DefaultFrame(Heap heap, Instance frame) {
322-
super(heap,
323-
(Instance) frame.getValueOfField("target"), // NOI18N
324-
(Instance) frame.getValueOfField("frame") // NOI18N
318+
private DefaultFrame(Instance frame) {
319+
super((Instance) frame.getValueOfField("target"), // NOI18N
320+
(Instance) frame.getValueOfField("frame") // NOI18N
325321
);
326322
}
327323
}
@@ -369,7 +365,7 @@ private void computeStackTrace(Heap heap, FrameVisitor visitor) {
369365
Map<Integer, List<JavaFrameGCRoot>> localsMap = javaFrameMap.get(threadRoot);
370366

371367
if (localsMap != null) {
372-
HotSpotStackTrace hsStackTrace = new HotSpotStackTrace(heap, threadInstance);
368+
HotSpotStackTrace hsStackTrace = new HotSpotStackTrace(threadInstance);
373369
for (int i = 0; i < stack.length; i++) {
374370
StackTraceElement stackElement = stack[i];
375371
List<JavaFrameGCRoot> locals = localsMap.get(Integer.valueOf(i));
@@ -454,14 +450,14 @@ private Frame visitFrame(List<JavaFrameGCRoot> callTargetFrame, List<JavaFrameGC
454450
localFrame = findLocalFrame(callNodeFrame);
455451

456452
if (callTarget != null && localFrame != null) {
457-
return new Frame(heap, callTarget, localFrame);
453+
return new Frame(callTarget, localFrame);
458454
}
459455
callTarget = findLocalInstance(callNodeFrame,
460456
DEFAULT_CALL_TARGET_FQN, OPTIMIZED_CALL_TARGET_FQN, ENT_OPTIMIZED_CALL_TARGET_FQN,
461457
OPTIMIZED_CALL_TARGET1_FQN, OPTIMIZED_CALL_TARGET2_FQN);
462458
localFrame = findLocalFrame(callTargetFrame);
463459
if (callTarget != null && localFrame != null) {
464-
return new Frame(heap, callTarget, localFrame);
460+
return new Frame(callTarget, localFrame);
465461
}
466462
return null;
467463
}
@@ -483,8 +479,8 @@ private static class HotSpotStackTrace extends StackTrace {
483479

484480
List<Frame> frames;
485481

486-
HotSpotStackTrace(Heap h, Instance t) {
487-
super(h, t);
482+
HotSpotStackTrace(Instance t) {
483+
super(t);
488484
frames = new ArrayList();
489485
}
490486

0 commit comments

Comments
 (0)