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

Migrate J9 specific Linkages to appropriate J9 namespace #7768

Merged
merged 17 commits into from
Nov 21, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Migrate ARM64JNILinkage from TR namespace to J9::ARM64
Rename to `JNILinkage` as ARM64 prefix is redundant.

Signed-off-by: Daryl Maier <[email protected]>
  • Loading branch information
0xdaryl committed Nov 20, 2019
commit b6a06915543e92c484cd65c246cd2cf618bf7495
2 changes: 1 addition & 1 deletion runtime/compiler/aarch64/codegen/ARM64JNILinkage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "codegen/ARM64JNILinkage.hpp"
#include "codegen/Linkage_inlines.hpp"

TR::ARM64JNILinkage::ARM64JNILinkage(TR::CodeGenerator *cg)
J9::ARM64::JNILinkage::JNILinkage(TR::CodeGenerator *cg)
: J9::ARM64PrivateLinkage(cg)
{
TR_UNIMPLEMENTED();
Expand Down
11 changes: 8 additions & 3 deletions runtime/compiler/aarch64/codegen/ARM64JNILinkage.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,21 @@

#include "codegen/ARM64PrivateLinkage.hpp"

namespace TR
namespace J9
{

class ARM64JNILinkage : public J9::ARM64PrivateLinkage
namespace ARM64
{

class JNILinkage : public J9::ARM64PrivateLinkage
{
public:

ARM64JNILinkage(TR::CodeGenerator *cg);
JNILinkage(TR::CodeGenerator *cg);
};

}

}

#endif
2 changes: 1 addition & 1 deletion runtime/compiler/aarch64/codegen/J9CodeGenerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ J9::ARM64::CodeGenerator::createLinkage(TR_LinkageConventions lc)
linkage = new (self()->trHeapMemory()) TR::ARM64HelperLinkage(self(), lc);
break;
case TR_J9JNILinkage:
linkage = new (self()->trHeapMemory()) TR::ARM64JNILinkage(self());
linkage = new (self()->trHeapMemory()) J9::ARM64::JNILinkage(self());
break;
default :
linkage = new (self()->trHeapMemory()) TR::ARM64SystemLinkage(self());
Expand Down