Cherry pick cheerp_typed_ptrcast

Author: DutChen18

clang/lib/CodeGen/CGExprScalar.cpp

@@ -2246,7 +2246,8 @@ Value *ScalarExprEmitter::VisitCastExpr(CastExpr *CE) {
     // space, an address space conversion may end up as a bitcast.
     return CGF.CGM.getTargetCodeGenInfo().performAddrSpaceCast(
         CGF, Visit(E), E->getType()->getPointeeType().getAddressSpace(),
-        DestTy->getPointeeType().getAddressSpace(), ConvertType(DestTy));
+        DestTy->getPointeeType().getAddressSpace(), ConvertType(DestTy),
+        false, ConvertType(DestTy->getPointeeType()));
   }
   case CK_AtomicToNonAtomic:
   case CK_NonAtomicToAtomic:

clang/lib/CodeGen/TargetInfo.cpp

@@ -522,11 +522,19 @@ LangAS TargetCodeGenInfo::getGlobalVarAddressSpace(CodeGenModule &CGM,
 
 llvm::Value *TargetCodeGenInfo::performAddrSpaceCast(
     CodeGen::CodeGenFunction &CGF, llvm::Value *Src, LangAS SrcAddr,
-    LangAS DestAddr, llvm::Type *DestTy, bool isNonNull) const {
+    LangAS DestAddr, llvm::Type *DestTy, bool isNonNull, llvm::Type* ElemTy) const {
   // Since target may map different address spaces in AST to the same address
   // space, an address space conversion may end up as a bitcast.
   if (auto *C = dyn_cast<llvm::Constant>(Src))
     return performAddrSpaceCast(CGF.CGM, C, SrcAddr, DestAddr, DestTy);
+  if (CGF.getLangOpts().Cheerp && ElemTy &&
+      (SrcAddr == LangAS::cheerp_bytelayout || SrcAddr == LangAS::cheerp_wasm) &&
+      DestAddr == LangAS::cheerp_genericjs) {
+    auto* F = CGF.CGM.getIntrinsic(llvm::Intrinsic::cheerp_typed_ptrcast, {DestTy, Src->getType()});
+    llvm::CallBase* CB = CGF.Builder.CreateCall(F, {Src}, Src->hasName()? Src->getName() + ".ascast" : "");
+    CB->addRetAttr(llvm::Attribute::get(CB->getContext(), llvm::Attribute::ElementType, ElemTy));
+    return CB;
+  }
   // Try to preserve the source's name to make IR more readable.
   return CGF.Builder.CreatePointerBitCastOrAddrSpaceCast(
       Src, DestTy, Src->hasName() ? Src->getName() + ".ascast" : "");

clang/lib/CodeGen/TargetInfo.h

@@ -290,7 +290,8 @@ class TargetCodeGenInfo {
   virtual llvm::Value *performAddrSpaceCast(CodeGen::CodeGenFunction &CGF,
                                             llvm::Value *V, LangAS SrcAddr,
                                             LangAS DestAddr, llvm::Type *DestTy,
-                                            bool IsNonNull = false) const;
+                                            bool IsNonNull = false,
+                                            llvm::Type* ElemTy = nullptr) const;
 
   /// Perform address space cast of a constant expression of pointer type.
   /// \param V is the LLVM constant to be casted to another address space.

llvm/include/llvm/Cheerp/Utility.h

@@ -262,6 +262,7 @@ inline bool isBitCast(const llvm::Value* v)
 		{
 			case llvm::Intrinsic::cheerp_cast_user:
 			case llvm::Intrinsic::cheerp_upcast_collapsed:
+			case llvm::Intrinsic::cheerp_typed_ptrcast:
 				return true;
 			default:
 				break;

llvm/include/llvm/IR/IntrinsicsCheerp.td

@@ -37,6 +37,11 @@ def int_cheerp_cast_user  : Intrinsic<[llvm_anyptr_ty],
                              [llvm_anyptr_ty],
                              []>;
 
+def int_cheerp_typed_ptrcast : Intrinsic<[llvm_anyptr_ty],
+                                      [llvm_anyptr_ty],
+                                      [IntrNoMem]>;
+
+
 // Type safe memory allocation
 def int_cheerp_allocate  : Intrinsic<[llvm_anyptr_ty],
                              [llvm_ptr_ty,llvm_i32_ty]>;

llvm/lib/CheerpUtils/PointerAnalyzer.cpp

@@ -642,6 +642,7 @@ PointerKindWrapper& PointerUsageVisitor::visitValue(PointerKindWrapper& ret, con
 		case Intrinsic::cheerp_downcast:
 		case Intrinsic::cheerp_upcast_collapsed:
 		case Intrinsic::cheerp_cast_user:
+		case Intrinsic::cheerp_typed_ptrcast:
 			break;
 		case Intrinsic::cheerp_allocate:
 		case Intrinsic::cheerp_allocate_array:
@@ -891,6 +892,8 @@ PointerKindWrapper& PointerUsageVisitor::visitUse(PointerKindWrapper& ret, const
 			return visitValue( ret, p, /*first*/ false );
 		case Intrinsic::cheerp_virtualcast:
 			return ret |= COMPLETE_OBJECT;
+		case Intrinsic::cheerp_typed_ptrcast:
+			return ret |= PointerKindWrapper(SPLIT_REGULAR, p);
 		case Intrinsic::cheerp_downcast:
 		{
 			// Behaves like a cast if the offset is constant 0

llvm/lib/CheerpUtils/TypeOptimizer.cpp

@@ -1107,6 +1107,7 @@ Function* TypeOptimizer::rewriteIntrinsic(Function* F, FunctionType* FT)
 		}
 		case Intrinsic::cheerp_upcast_collapsed:
 		case Intrinsic::cheerp_cast_user:
+		case Intrinsic::cheerp_typed_ptrcast:
 		case Intrinsic::cheerp_downcast:
 		case Intrinsic::cheerp_virtualcast:
 		case Intrinsic::cheerp_make_complete_object:

llvm/lib/CheerpUtils/Utility.cpp

@@ -331,6 +331,7 @@ bool InlineableCache::isInlineableImpl(const Instruction& I)
 		switch(II->getIntrinsicID())
 		{
 			case Intrinsic::cheerp_cast_user:
+			case Intrinsic::cheerp_typed_ptrcast:
 			case Intrinsic::cheerp_upcast_collapsed:
 			case Intrinsic::cheerp_make_regular:
 				return true;

llvm/lib/CheerpWriter/CheerpWriter.cpp

@@ -873,6 +873,14 @@ CheerpWriter::COMPILE_INSTRUCTION_FEEDBACK CheerpWriter::handleBuiltinCall(const
 		compileBitCast(&callV, PA.getPointerKindAssert(&callV), HIGHEST);
 		return COMPILE_OK;
 	}
+	else if(intrinsicId==Intrinsic::cheerp_typed_ptrcast)
+	{
+		if(callV.use_empty())
+			return COMPILE_EMPTY;
+
+		compileBitCast(&callV, PA.getPointerKindAssert(&callV), HIGHEST);
+		return COMPILE_OK;
+	}
 	else if(intrinsicId==Intrinsic::cheerp_pointer_base)
 	{
 		compilePointerBase(*it, true);
@@ -2008,6 +2016,7 @@ void CheerpWriter::compilePointerBaseTyped(const Value* p, Type* elementType, bo
 		switch(II->getIntrinsicID())
 		{
 			case Intrinsic::cheerp_upcast_collapsed:
+			case Intrinsic::cheerp_typed_ptrcast:
 			case Intrinsic::cheerp_cast_user:
 				return compilePointerBaseTyped(II->getOperand(0), II->getParamElementType(0));
 			case Intrinsic::cheerp_make_regular:
@@ -2213,6 +2222,7 @@ void CheerpWriter::compilePointerOffset(const Value* p, PARENT_PRIORITY parentPr
 		switch(II->getIntrinsicID())
 		{
 			case Intrinsic::cheerp_upcast_collapsed:
+			case Intrinsic::cheerp_typed_ptrcast:
 			case Intrinsic::cheerp_cast_user:
 				compilePointerOffset(II->getOperand(0), parentPrio);
 				return;
@@ -4575,7 +4585,7 @@ void CheerpWriter::compileLoadElem(const LoadInst& li, Type* Ty, StructType* STy
 		assert(!STy);
 		//Optimize loads of single values from unions
 		compilePointerBase(ptrOp);
-		assert(ptrOp->getType()== Ty->getPointerTo());
+		assert(ptrOp->getType()== Ty->getPointerTo(ptrOp->getType()->getPointerAddressSpace()));
 		if(Ty->isIntegerTy(8))
 			stream << ".getUint8(";
 		else if(Ty->isIntegerTy(16))