Skip to content
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

Fix jit build break #32927

Merged
merged 2 commits into from
Feb 27, 2020
Merged

Fix jit build break #32927

merged 2 commits into from
Feb 27, 2020

Conversation

AndyAyersMS
Copy link
Member

Two changes to codegencommon.cpp were merged in short order, and
git/github did not spot the merge conflict.

Fixes #32926.

Two changes to codegencommon.cpp were merged in short order, and
git/github did not spot the merge conflict.

Fixes dotnet#32926.
@AndyAyersMS
Copy link
Member Author

cc @kunalspathak @dotnet/jit-contrib @benaadams

Copy link
Member

@kunalspathak kunalspathak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@AndyAyersMS
Copy link
Member Author

Will eagerly merge once a few builds pass.

@kunalspathak
Copy link
Member

Probably I will add a note in Contributing.md to rebase to master and build locally to spot these kind of issues before merging the PR.

@AndyAyersMS
Copy link
Member Author

(Building locally too, but it takes forever...)

@AndyAyersMS
Copy link
Member Author

Needs a tweak...

@AndyAyersMS AndyAyersMS added area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI and removed area-CodeGen labels Feb 27, 2020
@AndyAyersMS
Copy link
Member Author

Think this is far enough along to merge.

@AndyAyersMS AndyAyersMS merged commit 4cb74ae into dotnet:master Feb 27, 2020
@AndyAyersMS AndyAyersMS deleted the FixBuildBreak branch February 27, 2020 20:41
@joperezr
Copy link
Member

We have started seeing some build breaks on OSX that look like:

[ 67%] Building CXX object src/vm/CMakeFiles/cee_dac.dir/stackwalk.cpp.o
/Users/runner/runners/2.165.0/work/1/s/src/coreclr/src/jit/codegencommon.cpp:11307:31: error: too few arguments to function call, single argument 'compMethodID' was not specified
    m_StartEmitLocation.Print();
    ~~~~~~~~~~~~~~~~~~~~~~~~~ ^
/Users/runner/runners/2.165.0/work/1/s/src/coreclr/src/jit/emit.h:197:5: note: 'Print' declared here
    void Print(LONG compMethodID) const;
    ^
/Users/runner/runners/2.165.0/work/1/s/src/coreclr/src/jit/codegencommon.cpp:11311:33: error: too few arguments to function call, single argument 'compMethodID' was not specified
        m_EndEmitLocation.Print();
        ~~~~~~~~~~~~~~~~~~~~~~~ ^
/Users/runner/runners/2.165.0/work/1/s/src/coreclr/src/jit/emit.h:197:5: note: 'Print' declared here
    void Print(LONG compMethodID) const;
    ^
2 errors generated.
make[2]: *** [src/jit/standalone/CMakeFiles/clrjit.dir/__/codegencommon.cpp.o] Error 1
make[1]: *** [src/jit/standalone/CMakeFiles/clrjit.dir/all] Error 2
make[1]: *** Waiting for unfinished jobs....

@AndyAyersMS Would that be related to this PR?

cc: @layomia

@AndyAyersMS
Copy link
Member Author

Yes, that error should be fixed by this PR.

@joperezr
Copy link
Member

Yeah I thought this was causing that issue because we were seeing this in PR #32006 when re-running the checks about 1 hour ago, but looks like the reason for that is that it wasn't yet picking up this change, so we needed to close and then re-open the PR or to push a new commit to it in order to get the changes from here in order to fix that issue.

@ghost ghost locked as resolved and limited conversation to collaborators Dec 10, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Jit currently doesn't compile
4 participants