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.

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

Remove GenASM #4814

Merged
merged 1 commit into from Oct 29, 2015

Conversation

Projects
None yet
5 participants
@soc
Member

soc commented Oct 23, 2015

No description provided.

@scala-jenkins scala-jenkins added this to the 2.12.0-M4 milestone Oct 23, 2015

@soc

This comment has been minimized.

Show comment
Hide comment
@soc

soc Oct 23, 2015

Member
/home/jenkins/workspace/scala-2.12.x-validate-test/build-ant-macros.xml:776: Test suite finished with 1 case failing:
fail - run/t7008-scala-defined  [compilation failed]% scalac t7008-scala-defined/ScalaClassWithCheckedExceptions_1.scala
error: Error while emitting ScalaClassWithCheckedExceptions_1.scala
assertion failed: Cannot create ClassBType from non-class symbol type E1
one error found
Member

soc commented Oct 23, 2015

/home/jenkins/workspace/scala-2.12.x-validate-test/build-ant-macros.xml:776: Test suite finished with 1 case failing:
fail - run/t7008-scala-defined  [compilation failed]% scalac t7008-scala-defined/ScalaClassWithCheckedExceptions_1.scala
error: Error while emitting ScalaClassWithCheckedExceptions_1.scala
assertion failed: Cannot create ClassBType from non-class symbol type E1
one error found
@lrytz

This comment has been minimized.

Show comment
Hide comment
@lrytz

lrytz Oct 23, 2015

Member

great! will take a look at it begin of next week.

Member

lrytz commented Oct 23, 2015

great! will take a look at it begin of next week.

@soc

This comment has been minimized.

Show comment
Hide comment
@soc

soc Oct 24, 2015

Member

The failure is right, in the sense that we would generate invalid class files otherwise:

class C[E1 <: Exception] {
  @throws[E1]("") def bar() {}
}

I think the E1 type needs to be erased to a concrete type (the upper bound).

Member

soc commented Oct 24, 2015

The failure is right, in the sense that we would generate invalid class files otherwise:

class C[E1 <: Exception] {
  @throws[E1]("") def bar() {}
}

I think the E1 type needs to be erased to a concrete type (the upper bound).

@lrytz

This comment has been minimized.

Show comment
Hide comment
@lrytz

lrytz Oct 26, 2015

Member

@soc i submitted a fix in #4820, the test of this PR passes after applying it.

Member

lrytz commented Oct 26, 2015

@soc i submitted a fix in #4820, the test of this PR passes after applying it.

@SethTisue

This comment has been minimized.

Show comment
Hide comment
@SethTisue

SethTisue Oct 26, 2015

Member

We discussed this at the Scala team meeting just now, and everyone is comfortable with going ahead with the removal for M4.

Member

SethTisue commented Oct 26, 2015

We discussed this at the Scala team meeting just now, and everyone is comfortable with going ahead with the removal for M4.

@soc

This comment has been minimized.

Show comment
Hide comment
@soc

soc Oct 27, 2015

Member

@lrytz, @SethTisue thanks, great!

Member

soc commented Oct 27, 2015

@lrytz, @SethTisue thanks, great!

@soc

This comment has been minimized.

Show comment
Hide comment
@soc

soc Oct 27, 2015

Member

Rebased!

Member

soc commented Oct 27, 2015

Rebased!

@lrytz

This comment has been minimized.

Show comment
Hide comment
@lrytz

lrytz Oct 27, 2015

Member

fingers crossed!

Member

lrytz commented Oct 27, 2015

fingers crossed!

@soc

This comment has been minimized.

Show comment
Hide comment
@soc

soc Oct 27, 2015

Member

@lrytz Did you/could you review it?

Member

soc commented Oct 27, 2015

@lrytz Did you/could you review it?

@lrytz

This comment has been minimized.

Show comment
Hide comment
@lrytz

lrytz Oct 27, 2015

Member

sure, i will!

Member

lrytz commented Oct 27, 2015

sure, i will!

@lrytz

This comment has been minimized.

Show comment
Hide comment
@lrytz

lrytz Oct 27, 2015

Member

otherwise it looks all good to me!

Member

lrytz commented Oct 27, 2015

otherwise it looks all good to me!

@lrytz

This comment has been minimized.

Show comment
Hide comment
@lrytz
Member

lrytz commented Oct 27, 2015

Remove GenASM, merge remaining common code snippets
With GenBCode being the default and only supported backend for Java 8,
we can get rid of GenASM.

This commit also fixes/migrates/moves to pending/deletes tests which
depended on GenASM before.
@soc

This comment has been minimized.

Show comment
Hide comment
@soc

soc Oct 27, 2015

Member

Moved the test to pending for now...

Member

soc commented Oct 27, 2015

Moved the test to pending for now...

@soc

This comment has been minimized.

Show comment
Hide comment
@soc

soc Oct 28, 2015

Member

@lrytz Is this good to go? I have trouble understanding "link to the google doc summarizing test changes:". Did you just note it, or wanted to say that I should include the link in the commit message?

Member

soc commented Oct 28, 2015

@lrytz Is this good to go? I have trouble understanding "link to the google doc summarizing test changes:". Did you just note it, or wanted to say that I should include the link in the commit message?

@lrytz

This comment has been minimized.

Show comment
Hide comment
@lrytz

lrytz Oct 29, 2015

Member

LGTM 🚮!

Member

lrytz commented Oct 29, 2015

LGTM 🚮!

lrytz added a commit that referenced this pull request Oct 29, 2015

@lrytz lrytz merged commit 72538aa into scala:2.12.x Oct 29, 2015

5 checks passed

cla @soc signed the Scala CLA. Thanks!
Details
integrate-ide [538] SUCCESS. Took 3 s.
Details
validate-main [642] SUCCESS. Took 153 min.
Details
validate-publish-core [628] SUCCESS. Took 11 min.
Details
validate-test [519] SUCCESS. Took 122 min.
Details
@SethTisue

This comment has been minimized.

Show comment
Hide comment
@SethTisue

SethTisue Oct 29, 2015

Member

🎉, thanks @soc! nothing feels better than deleting code

Member

SethTisue commented Oct 29, 2015

🎉, thanks @soc! nothing feels better than deleting code

@lrytz lrytz referenced this pull request Nov 9, 2015

Merged

Remove ICode (re-submission) #4838

lrytz added a commit to lrytz/scala that referenced this pull request Jan 24, 2016

SI-8601 Don't treat newarray as dead code
Otherwise we lose the side effect of a `NegativeArraySizeException`.

A test for this case already exists (run/t8601b.scala), but it currently
enforces `-optimize -Ybackend:GenASM`, so it didn't trigger on the new
backend. However, PR #4814 was merged into 2.12.x and moved that test
over to the new backend and optimizer.  After merging the 2.12.x into
the current optimizer branch (push-pop elimination), the test started
failing.

Also disable the optimizer for `jvm/bytecode-test-example`: it counts
the number of null checks in a method, the optimizer (rightly) eliminates
one of the two.

lrytz added a commit to lrytz/scala that referenced this pull request Jan 24, 2016

SI-8601 Don't treat newarray as dead code
Otherwise we lose the side effect of a `NegativeArraySizeException`.

A test for this case already exists (run/t8601b.scala), but it currently
enforces `-optimize -Ybackend:GenASM`, so it didn't trigger on the new
backend. However, PR #4814 was merged into 2.12.x and moved that test
over to the new backend and optimizer.  After merging the 2.12.x into
the current optimizer branch (push-pop elimination), the test started
failing.

Also disable the optimizer for `jvm/bytecode-test-example`: it counts
the number of null checks in a method, the optimizer (rightly) eliminates
one of the two.

@adriaanm adriaanm added 2.12.0 and removed 2.12 labels Oct 29, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment