Add builtin for thread setup rejection

The previous builtin for the thread setup resolve is changed to now return an object, like the new one for thread setup rejection.

Author: Maqrkk

clang/include/clang/Basic/BuiltinsCheerp.def

@@ -41,9 +41,10 @@ BUILTIN(__builtin_cheerp_get_threading_object, "", "B")
 BUILTIN(__builtin_cheerp_get_threading_blob, "", "B")
 BUILTIN(__builtin_cheerp_set_thread_pointer, "vUi", "")
 BUILTIN(__builtin_cheerp_get_thread_pointer, "Ui", "")
+BUILTIN(__builtin_cheerp_get_thread_setup_resolve, "", "B")
+BUILTIN(__builtin_cheerp_get_thread_setup_reject, "", "B")
 BUILTIN(__builtin_cheerp_atomic_wait, "iv*iLLi", "")
 BUILTIN(__builtin_cheerp_atomic_notify, "iv*i", "")
-BUILTIN(__builtin_cheerp_thread_setup_resolve, "v", "")
 
 // SIMD builtins
 TARGET_BUILTIN(__builtin_wasm_swizzle_i8x16, "V16ScV16ScV16Sc", "nc", "simd128")

clang/lib/CodeGen/CGBuiltin.cpp

@@ -12568,6 +12568,16 @@ Value *CodeGenFunction::EmitCheerpBuiltinExpr(unsigned BuiltinID,
     Function *F = CGM.getIntrinsic(Intrinsic::cheerp_get_threading_blob, Tys);
     return Builder.CreateCall(F, Ops);
   }
+  else if (BuiltinID == Cheerp::BI__builtin_cheerp_get_thread_setup_resolve) {
+    llvm::Type *Tys[] = { ConvertType(E->getType()) };
+    Function *F = CGM.getIntrinsic(Intrinsic::cheerp_get_thread_setup_resolve, Tys);
+    return Builder.CreateCall(F, Ops);
+  }
+  else if (BuiltinID == Cheerp::BI__builtin_cheerp_get_thread_setup_reject) {
+    llvm::Type *Tys[] = { ConvertType(E->getType()) };
+    Function *F = CGM.getIntrinsic(Intrinsic::cheerp_get_thread_setup_reject, Tys);
+    return Builder.CreateCall(F, Ops);
+  }
   else if (BuiltinID == Cheerp::BI__builtin_cheerp_stack_save) {
     Function *F = CGM.getIntrinsic(Intrinsic::stacksave);
     return Builder.CreateCall(F, Ops);

llvm/include/llvm/Cheerp/NameGenerator.h

@@ -84,6 +84,7 @@ class NameGenerator
 		BLOBNAME,
 		THREADSETUPPROMISE,
 		THREADSETUPRESOLVE,
+		THREADSETUPREJECT,
 		MEMORY,
 		HEAP8,
 		HEAP16,

llvm/include/llvm/IR/IntrinsicsCheerp.td

@@ -108,6 +108,10 @@ def int_cheerp_set_thread_pointer : Intrinsic<[],
 def int_cheerp_get_threadlocal_offset : Intrinsic<[llvm_i32_ty],
                                           [llvm_anyptr_ty]>;
 
+def int_cheerp_get_thread_setup_resolve : Intrinsic<[llvm_anyptr_ty]>;
+
+def int_cheerp_get_thread_setup_reject : Intrinsic<[llvm_anyptr_ty]>;
+
 def int_cheerp_atomic_wait : Intrinsic<[llvm_i32_ty],
                               [llvm_ptr_ty, llvm_i32_ty, llvm_i64_ty]>,
                               ClangBuiltin<"__builtin_cheerp_atomic_wait">;
@@ -116,10 +120,6 @@ def int_cheerp_atomic_notify : Intrinsic<[llvm_i32_ty],
                                 [llvm_ptr_ty, llvm_i32_ty]>,
                                 ClangBuiltin<"__builtin_cheerp_atomic_notify">;
 
-def int_cheerp_thread_setup_resolve : Intrinsic<[],
-                                      []>,
-                                      ClangBuiltin<"__builtin_cheerp_thread_setup_resolve">;
-
 def int_cheerp_environ : Intrinsic<[llvm_anyptr_ty]>;
 
 def int_cheerp_argv : Intrinsic<[llvm_anyptr_ty]>;

llvm/lib/CheerpWriter/CheerpWriter.cpp

@@ -977,10 +977,16 @@ CheerpWriter::COMPILE_INSTRUCTION_FEEDBACK CheerpWriter::handleBuiltinCall(const
 		stream << "new Blob([" << threadingObject << "." << blobText << "])";
 		return COMPILE_OK;
 	}
-	else if(intrinsicId==Intrinsic::cheerp_thread_setup_resolve)
+	else if(intrinsicId==Intrinsic::cheerp_get_thread_setup_resolve)
 	{
 		StringRef threadSetupResolve = namegen.getBuiltinName(NameGenerator::Builtin::THREADSETUPRESOLVE);
-		stream << threadSetupResolve << "();" << NewLine;
+		stream << threadSetupResolve;
+		return COMPILE_OK;
+	}
+	else if(intrinsicId==Intrinsic::cheerp_get_thread_setup_reject)
+	{
+		StringRef threadSetupReject = namegen.getBuiltinName(NameGenerator::Builtin::THREADSETUPREJECT);
+		stream << threadSetupReject;
 		return COMPILE_OK;
 	}
 	else if(intrinsicId==Intrinsic::abs)
@@ -7153,8 +7159,10 @@ void CheerpWriter::compileThreadingObject()
 		// First create the promise and resolve variables for threading setup.
 		StringRef threadPromise = namegen.getBuiltinName(NameGenerator::Builtin::THREADSETUPPROMISE);
 		StringRef threadResolve = namegen.getBuiltinName(NameGenerator::Builtin::THREADSETUPRESOLVE);
+		StringRef threadReject = namegen.getBuiltinName(NameGenerator::Builtin::THREADSETUPREJECT);
 		stream << "var " << threadResolve << "=null;" << NewLine;
-		stream << "var " << threadPromise << "=new Promise((r)=>{" << threadResolve << "=r;});" << NewLine;
+		stream << "var " << threadReject << "=null;" << NewLine;
+		stream << "var " << threadPromise << "=new Promise((f,r)=>{" << threadResolve << "=f;" << threadReject << "=r});" << NewLine;
 
 		// Then create the rest of the threading variables.
 		StringRef threadObject = namegen.getBuiltinName(NameGenerator::Builtin::THREADINGOBJECT);

llvm/lib/CheerpWriter/NameGenerator.cpp

@@ -697,6 +697,7 @@ void NameGenerator::generateReadableNames(const Module& M, const GlobalDepsAnaly
 	builtins[BLOBNAME] = "blobText";
 	builtins[THREADSETUPPROMISE] = "__threadSetupPromise";
 	builtins[THREADSETUPRESOLVE] = "__threadSetupResolve";
+	builtins[THREADSETUPREJECT] = "__threadSetupReject";
 	builtins[HEAP8] = "HEAP8";
 	builtins[HEAP16] = "HEAP16";
 	builtins[HEAP32] = "HEAP32";