Skip to content

version updates #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 25, 2025
Merged

version updates #124

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5189977
gha
lrytz Sep 25, 2025
268928c
update sbt to 1.11.6
lrytz Sep 25, 2025
11e8a05
update sbt-jmh
lrytz Sep 25, 2025
d594c59
2.13 by default, update junit-interface
lrytz Sep 25, 2025
9c5c24e
remove dotty support
lrytz Sep 25, 2025
d3089a0
adjust to https://github.com/openjdk/jmh/pull/115
lrytz Sep 25, 2025
f1ba865
remove bad symlikn
lrytz Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adjust to openjdk/jmh#115
  • Loading branch information
@lrytz
lrytz committed Sep 25, 2025
commit d3089a0367488d5ca7b0e501d825a4d1c2a00dcc
4 changes: 2 additions & 2 deletions compilation/src/main/scala/scala/tools/nsc/ThreadCpuTimeProfiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ static class NormTimeResult extends Result<NormTimeResult> {
private final long ops;

public NormTimeResult(String prefix, long cycles, long instructions) {
super(ResultRole.SECONDARY, Defaults.PREFIX + prefix, of(Double.NaN), "---", AggregationPolicy.AVG);
super(ResultRole.SECONDARY, prefix, of(Double.NaN), "---", AggregationPolicy.AVG);
this.prefix = prefix;
this.scalar = cycles;
this.ops = instructions;
Expand All @@ -111,7 +111,7 @@ public NormTimeResult aggregate(Collection<NormTimeResult> results) {

@Override
protected Aggregator<NormTimeResult> getIterationAggregator() {
NormTimeResultAggregator normTimeResultAggregator = new NormTimeResultAggregator(Defaults.PREFIX + prefix);
NormTimeResultAggregator normTimeResultAggregator = new NormTimeResultAggregator(prefix);
return (Aggregator<NormTimeResult>) (Object) normTimeResultAggregator;
}

Expand Down