Skip to content
This repository was archived by the owner on Nov 1, 2020. It is now read-only.

[armel tizen] Fixed issue #4626 unwinding support on arm#5249

Merged
jkotas merged 5 commits intodotnet:masterfrom
sergign60:arm_build
Jan 16, 2018
Merged

[armel tizen] Fixed issue #4626 unwinding support on arm#5249
jkotas merged 5 commits intodotnet:masterfrom
sergign60:arm_build

Conversation

@sergign60
Copy link
Contributor

This fix needs additional changes in CoreCLR that will be represented after this PR is approved. It fixed #4626, but there is another fail that is needed additional investigation.

@sergign60
Copy link
Contributor Author

@dotnet/arm32-corert-contrib
@adityamandaleeka
Please review

}

public void EmitCFICodes(int offset)
public void EmitCFICodes(int offset, NodeFactory factory)
Copy link
Member

Choose a reason for hiding this comment

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

Target platform is available in the _targetPlatform instance variable. This parameter seems unnecessary.

@@ -1,7 +1,7 @@
diff --git a/include/llvm/MC/MCObjectStreamer.h b/include/llvm/MC/MCObjectStreamer.h

Choose a reason for hiding this comment

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

Why a and b were changed to i and w? Could you undo this changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@alpencolt I got these diffs by the command git diff I'll look what I can do with this

assert((procInfo.start_ip <= controlPC) && (controlPC < procInfo.end_ip));

#if defined(_ARM_)
*lsda = *((UIntNative *)procInfo.lsda);

Choose a reason for hiding this comment

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

Please add comment about why there is difference.

{
EmitCFIStart(offset);
if (forArm)
EmitFnStart(_nativeObjectWriter);
Copy link
Member

Choose a reason for hiding this comment

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

Can this be just EmitFnStart() ?

{
EmitCFIEnd(offset);
if (forArm)
EmitFnEnd(_nativeObjectWriter);
Copy link
Member

Choose a reason for hiding this comment

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

Same here.

}

void
ObjectWriter::EmitFnStart() {
Copy link
Member

Choose a reason for hiding this comment

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

Should this be called EmiARMtFnStart ? It seems to be ARM specific looking at the implementation.

@jkotas
Copy link
Member

jkotas commented Jan 16, 2018

@alpencolt Does this look good to you?

@alpencolt
Copy link

@jkotas yes
LGTM

@jkotas jkotas merged commit e6075d8 into dotnet:master Jan 16, 2018
@jkotas
Copy link
Member

jkotas commented Jan 16, 2018

Thank you!

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[RyuJIT/ARM32] GC fails with FindProcInfo

4 participants