Skip to content
Open
Show file tree
Hide file tree
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
15 changes: 11 additions & 4 deletions clang/lib/CodeGen/CGObjCGNU.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,16 @@ class CGObjCGNU : public CGObjCRuntime {
(R.getVersion() >= VersionTuple(major, minor));
}

std::string ManglePublicSymbol(StringRef Name) {
return (StringRef(CGM.getTriple().isOSBinFormatCOFF() ? "$_" : "._") + Name).str();
const std::string ManglePublicSymbol(StringRef Name) {
StringRef prefix = "._";

// Exported symbols in Emscripten must be a valid Javascript identifier.
auto triple = CGM.getTriple();
if (triple.isOSBinFormatCOFF() || triple.isOSBinFormatWasm()) {
prefix = "$_";
}

return (prefix + Name).str();
}

std::string SymbolForProtocol(Twine Name) {
Expand Down Expand Up @@ -4106,8 +4114,7 @@ llvm::Function *CGObjCGNU::ModuleInitFunction() {
if (!ClassAliases.empty()) {
llvm::Type *ArgTypes[2] = {PtrTy, PtrToInt8Ty};
llvm::FunctionType *RegisterAliasTy =
llvm::FunctionType::get(Builder.getVoidTy(),
ArgTypes, false);
llvm::FunctionType::get(BoolTy, ArgTypes, false);
llvm::Function *RegisterAlias = llvm::Function::Create(
RegisterAliasTy,
llvm::GlobalValue::ExternalWeakLinkage, "class_registerAlias_np",
Expand Down
3 changes: 2 additions & 1 deletion clang/lib/Driver/ToolChains/Clang.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8001,7 +8001,8 @@ ObjCRuntime Clang::AddObjCRuntimeArgs(const ArgList &args,
if ((runtime.getKind() == ObjCRuntime::GNUstep) &&
(runtime.getVersion() >= VersionTuple(2, 0)))
if (!getToolChain().getTriple().isOSBinFormatELF() &&
!getToolChain().getTriple().isOSBinFormatCOFF()) {
!getToolChain().getTriple().isOSBinFormatCOFF() &&
!getToolChain().getTriple().isOSBinFormatWasm()) {
getToolChain().getDriver().Diag(
diag::err_drv_gnustep_objc_runtime_incompatible_binary)
<< runtime.getVersion().getMajor();
Expand Down
23 changes: 23 additions & 0 deletions clang/test/CodeGenObjC/gnustep2-wasm32-symbols.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// RUN: %clang_cc1 -triple wasm32-unknown-emscripten -emit-llvm -fobjc-runtime=gnustep-2.2 -o - %s | FileCheck %s

@class NSString;

@protocol AProtocol
- (void) meth;
@end

@interface AClass <AProtocol>
@end

@implementation AClass
- (void) meth {}
@end

// Make sure that all public symbols are mangled correctly. All exported symbols
// must be valid Javascript identifiers in Emscripten.
// CHECK: $"$_OBJC_PROTOCOL_AProtocol" = comdat any
// CHECK: @"$_OBJC_METACLASS_AClass"
// CHECK: @"$_OBJC_PROTOCOL_AProtocol"
// CHECK: @"$_OBJC_CLASS_AClass"
// CHECK: @"$_OBJC_REF_CLASS_AClass"
// CHECK: @"$_OBJC_INIT_CLASS_AClass"