Skip to content

swift-remote-test: correct the location of the ABI marker #21984

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

Merged
merged 1 commit into from
Jan 18, 2019
Merged
Changes from all commits
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
20 changes: 10 additions & 10 deletions tools/swift-remoteast-test/swift-remoteast-test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ static ASTContext *Context = nullptr;

// FIXME: swiftcall
/// func printType(forMetadata: Any.Type)
LLVM_ATTRIBUTE_USED SWIFT_REMOTEAST_TEST_ABI
extern "C" void printMetadataType(const Metadata *typeMetadata) {
LLVM_ATTRIBUTE_USED extern "C" void SWIFT_REMOTEAST_TEST_ABI
printMetadataType(const Metadata *typeMetadata) {
assert(Context && "context was not set");

std::shared_ptr<MemoryReader> reader(new InProcessMemoryReader());
Expand All @@ -64,8 +64,8 @@ extern "C" void printMetadataType(const Metadata *typeMetadata) {

// FIXME: swiftcall
/// func printDynamicType(_: AnyObject)
LLVM_ATTRIBUTE_USED SWIFT_REMOTEAST_TEST_ABI
extern "C" void printHeapMetadataType(void *object) {
LLVM_ATTRIBUTE_USED extern "C" void SWIFT_REMOTEAST_TEST_ABI
printHeapMetadataType(void *object) {
assert(Context && "context was not set");

std::shared_ptr<MemoryReader> reader(new InProcessMemoryReader());
Expand Down Expand Up @@ -127,24 +127,24 @@ static void printMemberOffset(const Metadata *typeMetadata,

// FIXME: swiftcall
/// func printTypeMemberOffset(forType: Any.Type, memberName: StaticString)
LLVM_ATTRIBUTE_USED SWIFT_REMOTEAST_TEST_ABI
extern "C" void printTypeMemberOffset(const Metadata *typeMetadata,
LLVM_ATTRIBUTE_USED extern "C" void SWIFT_REMOTEAST_TEST_ABI
printTypeMemberOffset(const Metadata *typeMetadata,
const char *memberName) {
printMemberOffset(typeMetadata, memberName, /*pass metadata*/ false);
}

// FIXME: swiftcall
/// func printTypeMetadataMemberOffset(forType: Any.Type,
/// memberName: StaticString)
LLVM_ATTRIBUTE_USED SWIFT_REMOTEAST_TEST_ABI
extern "C" void printTypeMetadataMemberOffset(const Metadata *typeMetadata,
const char *memberName) {
LLVM_ATTRIBUTE_USED extern "C" void SWIFT_REMOTEAST_TEST_ABI
printTypeMetadataMemberOffset(const Metadata *typeMetadata,
const char *memberName) {
printMemberOffset(typeMetadata, memberName, /*pass metadata*/ true);
}

// FIXME: swiftcall
/// func printDynamicTypeAndAddressForExistential<T>(_: T)
LLVM_ATTRIBUTE_USED SWIFT_REMOTEAST_TEST_ABI extern "C" void
LLVM_ATTRIBUTE_USED extern "C" void SWIFT_REMOTEAST_TEST_ABI
printDynamicTypeAndAddressForExistential(void *object,
const Metadata *typeMetadata) {
assert(Context && "context was not set");
Expand Down