Add PA functions for load/store instructions

Author: DutChen18

llvm/include/llvm/Cheerp/PointerAnalyzer.h

@@ -281,13 +281,15 @@ class PointerAnalyzer
 	POINTER_KIND getPointerKindForStoredType( llvm::Type * pointerType ) const;
 	POINTER_KIND getPointerKindForMemberPointer( const TypeAndIndex& baseAndIndex ) const;
 	POINTER_KIND getPointerKindForMember( const TypeAndIndex& baseAndIndex ) const;
+	POINTER_KIND getPointerKindForLoadStore(const llvm::Value* v) const;
 	POINTER_KIND getPointerKindForArgumentTypeAndIndex( const TypeAndIndex& argTypeAndIndex ) const;
 	POINTER_KIND getPointerKindForArgument( const llvm::Argument* A ) const;
 	POINTER_KIND getPointerKindForJSExportedType (llvm::Type* pointerType) const;
 	const PointerKindWrapper& getFinalPointerKindWrapper(const llvm::Value* v ) const;
 	static TypeAndIndex getBaseStructAndIndexFromGEP( const llvm::Value* v );
 	const llvm::ConstantInt* getConstantOffsetForPointer( const llvm::Value* ) const;
 	const llvm::ConstantInt* getConstantOffsetForMember( const TypeAndIndex& baseAndIndex ) const;
+	const llvm::ConstantInt* getConstantOffsetForLoadStore(const llvm::Value* v) const;
 
 	/**
 	 * Functions to manually invalidate the cache

llvm/lib/CheerpUtils/PointerAnalyzer.cpp

@@ -1723,6 +1723,11 @@ POINTER_KIND PointerAnalyzer::getPointerKindForMember(const TypeAndIndex& baseAn
 	return getPointerKindForMemberImpl(baseAndIndex, PACache);
 }
 
+POINTER_KIND PointerAnalyzer::getPointerKindForLoadStore(const llvm::Value* v) const
+{
+	return getPointerKind(v);
+}
+
 TypeAndIndex PointerAnalyzer::getBaseStructAndIndexFromGEP(const Value* p)
 {
 	if(!isGEP(p))
@@ -1826,6 +1831,11 @@ const llvm::ConstantInt* PointerAnalyzer::getConstantOffsetForMember( const Type
 	return ret.getPointerOffset();
 }
 
+const llvm::ConstantInt* PointerAnalyzer::getConstantOffsetForLoadStore(const llvm::Value* v) const
+{
+	return getConstantOffsetForPointer(v);
+}
+
 void PointerAnalyzer::invalidate(const Value * v)
 {
 	assert(status == MODIFIABLE);

llvm/lib/CheerpUtils/Utility.cpp

@@ -1478,6 +1478,10 @@ bool InstElemIterator::isTwoElems(const llvm::Instruction* I, llvm::Type* Ty, in
 {
 	if(!Ty->isStructTy())
 	{
+		// avoid calling getPointerKind for store instruction
+		if (isa<StoreInst>(I))
+			return Ty->isPointerTy() && PA.getPointerKindForLoadStore(I) == SPLIT_REGULAR && !PA.getConstantOffsetForLoadStore(I);
+
 		return Ty->isPointerTy() && PA.getPointerKind(I) == SPLIT_REGULAR && !PA.getConstantOffsetForPointer(I);
 	}
 	auto* STy = llvm::cast<llvm::StructType>(Ty);

llvm/lib/CheerpWriter/CheerpWriter.cpp

@@ -4557,7 +4557,7 @@ void CheerpWriter::compileLoad(const LoadInst& li, PARENT_PRIORITY parentPrio)
 		}
 		else if(Ty->isPointerTy())
 		{
-			elemPtrKind = PA.getPointerKind(&li);
+			elemPtrKind = PA.getPointerKindForLoadStore(&li);
 		}
 		bool isOffset = ie.ptrIdx == 1;
 		compileLoadElem(li, Ty, STy, ptrKind, elemPtrKind, isOffset, elemRegKind, ie.structIdx, asmjs, parentPrio);
@@ -4755,7 +4755,7 @@ void CheerpWriter::compileStore(const StoreInst& si)
 		}
 		else if(Ty->isPointerTy())
 		{
-			elemPtrKind = PA.getPointerKind(&si);
+			elemPtrKind = PA.getPointerKindForLoadStore(&si);
 		}
 		bool isOffset = ie.ptrIdx == 1;
 		compileStoreElem(si, Ty, STy, ptrKind, elemPtrKind, isOffset, elemRegKind, ie.totalIdx, ie.structIdx, asmjs);