Revert "[NFC] Pass a reference to CodeGenFunction to methods of LValue and" (9f37c0e7) · Commits · llvm-doe / llvm-project

clang/lib/CodeGen/CGAtomic.cpp

+14 −12

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ namespace {
		const LValue &getAtomicLValue() const { return LVal; }
		llvm::Value *getAtomicPointer() const {
		if (LVal.isSimple())
		return LVal.getPointer(CGF);
		return LVal.getPointer();
		else if (LVal.isBitField())
		return LVal.getBitFieldPointer();
		else if (LVal.isVectorElt())
		@@ -343,7 +343,7 @@ bool AtomicInfo::requiresMemSetZero(llvm::Type *type) const {

		bool AtomicInfo::emitMemSetZeroIfNecessary() const {
		assert(LVal.isSimple());
		llvm::Value *addr = LVal.getPointer(CGF);
		llvm::Value *addr = LVal.getPointer();
		if (!requiresMemSetZero(addr->getType()->getPointerElementType()))
		return false;

		@@ -1628,7 +1628,7 @@ Address AtomicInfo::materializeRValue(RValue rvalue) const {
		LValue TempLV = CGF.MakeAddrLValue(CreateTempAlloca(), getAtomicType());
		AtomicInfo Atomics(CGF, TempLV);
		Atomics.emitCopyIntoMemory(rvalue);
		return TempLV.getAddress(CGF);
		return TempLV.getAddress();
		}

		llvm::Value *AtomicInfo::convertRValueToInt(RValue RVal) const {
		@@ -1975,8 +1975,8 @@ void CodeGenFunction::EmitAtomicStore(RValue rvalue, LValue dest,
		// If this is an aggregate r-value, it should agree in type except
		// maybe for address-space qualification.
		assert(!rvalue.isAggregate() \|\|
		rvalue.getAggregateAddress().getElementType() ==
		dest.getAddress(*this).getElementType());
		rvalue.getAggregateAddress().getElementType()
		== dest.getAddress().getElementType());

		AtomicInfo atomics(*this, dest);
		LValue LVal = atomics.getAtomicLValue();
		@@ -2043,10 +2043,10 @@ std::pair<RValue, llvm::Value *> CodeGenFunction::EmitAtomicCompareExchange(
		// maybe for address-space qualification.
		assert(!Expected.isAggregate() \|\|
		Expected.getAggregateAddress().getElementType() ==
		Obj.getAddress(*this).getElementType());
		Obj.getAddress().getElementType());
		assert(!Desired.isAggregate() \|\|
		Desired.getAggregateAddress().getElementType() ==
		Obj.getAddress(*this).getElementType());
		Obj.getAddress().getElementType());
		AtomicInfo Atomics(*this, Obj);

		return Atomics.EmitAtomicCompareExchange(Expected, Desired, Success, Failure,
		@@ -2086,11 +2086,13 @@ void CodeGenFunction::EmitAtomicInit(Expr *init, LValue dest) {
		}

		// Evaluate the expression directly into the destination.
		AggValueSlot slot = AggValueSlot::forLValue(
		dest, *this, AggValueSlot::IsNotDestructed,
		AggValueSlot::DoesNotNeedGCBarriers, AggValueSlot::IsNotAliased,
		AggValueSlot slot = AggValueSlot::forLValue(dest,
		AggValueSlot::IsNotDestructed,
		AggValueSlot::DoesNotNeedGCBarriers,
		AggValueSlot::IsNotAliased,
		AggValueSlot::DoesNotOverlap,
		Zeroed ? AggValueSlot::IsZeroed : AggValueSlot::IsNotZeroed);
		Zeroed ? AggValueSlot::IsZeroed :
		AggValueSlot::IsNotZeroed);

		EmitAggExpr(init, slot);
		return;

clang/lib/CodeGen/CGBlocks.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -1076,7 +1076,7 @@ llvm::Value *CodeGenFunction::EmitBlockLiteral(const CGBlockInfo &blockInfo) {
		/RefersToEnclosingVariableOrCapture/ CI.isNested(),
		type.getNonReferenceType(), VK_LValue,
		SourceLocation());
		src = EmitDeclRefLValue(&declRef).getAddress(*this);
		src = EmitDeclRefLValue(&declRef).getAddress();
		};

		// For byrefs, we just write the pointer to the byref struct into

clang/lib/CodeGen/CGBuiltin.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -3367,7 +3367,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
		return RValue::get(Carry);
		}
		case Builtin::BI__builtin_addressof:
		return RValue::get(EmitLValue(E->getArg(0)).getPointer(*this));
		return RValue::get(EmitLValue(E->getArg(0)).getPointer());
		case Builtin::BI__builtin_operator_new:
		return EmitBuiltinNewDeleteCall(
		E->getCallee()->getType()->castAs<FunctionProtoType>(), E, false);
		@@ -3750,8 +3750,8 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
		llvm::Value *Queue = EmitScalarExpr(E->getArg(0));
		llvm::Value *Flags = EmitScalarExpr(E->getArg(1));
		LValue NDRangeL = EmitAggExprToLValue(E->getArg(2));
		llvm::Value Range = NDRangeL.getAddress(this).getPointer();
		llvm::Type RangeTy = NDRangeL.getAddress(this).getType();
		llvm::Value *Range = NDRangeL.getAddress().getPointer();
		llvm::Type *RangeTy = NDRangeL.getAddress().getType();

		if (NumArgs == 4) {
		// The most basic form of the call with parameters:
		@@ -3770,7 +3770,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
		Builder.CreatePointerCast(Info.BlockArg, GenericVoidPtrTy);

		AttrBuilder B;
		B.addByValAttr(NDRangeL.getAddress(*this).getElementType());
		B.addByValAttr(NDRangeL.getAddress().getElementType());
		llvm::AttributeList ByValAttrSet =
		llvm::AttributeList::get(CGM.getModule().getContext(), 3U, B);

		@@ -3955,7 +3955,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const GlobalDecl GD, unsigned BuiltinID,
		llvm::Type *GenericVoidPtrTy = Builder.getInt8PtrTy(
		getContext().getTargetAddressSpace(LangAS::opencl_generic));
		LValue NDRangeL = EmitAggExprToLValue(E->getArg(0));
		llvm::Value NDRange = NDRangeL.getAddress(this).getPointer();
		llvm::Value *NDRange = NDRangeL.getAddress().getPointer();
		auto Info =
		CGM.getOpenCLRuntime().emitOpenCLEnqueuedBlock(*this, E->getArg(1));
		Value *Kernel = Builder.CreatePointerCast(Info.Kernel, GenericVoidPtrTy);
		@@ -9470,14 +9470,14 @@ Value *CodeGenFunction::EmitBPFBuiltinExpr(unsigned BuiltinID,
		if (!getDebugInfo()) {
		CGM.Error(E->getExprLoc(), "using builtin_preserve_field_info() without -g");
		return IsBitField ? EmitLValue(Arg).getBitFieldPointer()
		: EmitLValue(Arg).getPointer(*this);
		: EmitLValue(Arg).getPointer();
		}

		// Enable underlying preserve_*_access_index() generation.
		bool OldIsInPreservedAIRegion = IsInPreservedAIRegion;
		IsInPreservedAIRegion = true;
		Value *FieldAddr = IsBitField ? EmitLValue(Arg).getBitFieldPointer()
		: EmitLValue(Arg).getPointer(*this);
		: EmitLValue(Arg).getPointer();
		IsInPreservedAIRegion = OldIsInPreservedAIRegion;

		ConstantInt *C = cast<ConstantInt>(EmitScalarExpr(E->getArg(1)));

clang/lib/CodeGen/CGCall.cpp

+17 −17

Original line number	Diff line number	Diff line
		@@ -1020,13 +1020,13 @@ void CodeGenFunction::ExpandTypeFromArgs(

		auto Exp = getTypeExpansion(Ty, getContext());
		if (auto CAExp = dyn_cast<ConstantArrayExpansion>(Exp.get())) {
		forConstantArrayExpansion(
		this, CAExp, LV.getAddress(this), [&](Address EltAddr) {
		forConstantArrayExpansion(*this, CAExp, LV.getAddress(),
		[&](Address EltAddr) {
		LValue LV = MakeAddrLValue(EltAddr, CAExp->EltTy);
		ExpandTypeFromArgs(CAExp->EltTy, LV, AI);
		});
		} else if (auto RExp = dyn_cast<RecordExpansion>(Exp.get())) {
		Address This = LV.getAddress(*this);
		Address This = LV.getAddress();
		for (const CXXBaseSpecifier *BS : RExp->Bases) {
		// Perform a single step derived-to-base conversion.
		Address Base =
		@@ -1057,7 +1057,7 @@ void CodeGenFunction::ExpandTypeToArgs(
		SmallVectorImpl<llvm::Value *> &IRCallArgs, unsigned &IRCallArgPos) {
		auto Exp = getTypeExpansion(Ty, getContext());
		if (auto CAExp = dyn_cast<ConstantArrayExpansion>(Exp.get())) {
		Address Addr = Arg.hasLValue() ? Arg.getKnownLValue().getAddress(*this)
		Address Addr = Arg.hasLValue() ? Arg.getKnownLValue().getAddress()
		: Arg.getKnownRValue().getAggregateAddress();
		forConstantArrayExpansion(
		*this, CAExp, Addr, [&](Address EltAddr) {
		@@ -1068,7 +1068,7 @@ void CodeGenFunction::ExpandTypeToArgs(
		IRCallArgPos);
		});
		} else if (auto RExp = dyn_cast<RecordExpansion>(Exp.get())) {
		Address This = Arg.hasLValue() ? Arg.getKnownLValue().getAddress(*this)
		Address This = Arg.hasLValue() ? Arg.getKnownLValue().getAddress()
		: Arg.getKnownRValue().getAggregateAddress();
		for (const CXXBaseSpecifier *BS : RExp->Bases) {
		// Perform a single step derived-to-base conversion.
		@@ -3138,7 +3138,7 @@ static bool isProvablyNull(llvm::Value *addr) {
		static void emitWriteback(CodeGenFunction &CGF,
		const CallArgList::Writeback &writeback) {
		const LValue &srcLV = writeback.Source;
		Address srcAddr = srcLV.getAddress(CGF);
		Address srcAddr = srcLV.getAddress();
		assert(!isProvablyNull(srcAddr.getPointer()) &&
		"shouldn't have writeback for provably null argument");

		@@ -3246,7 +3246,7 @@ static void emitWritebackArg(CodeGenFunction &CGF, CallArgList &args,
		CRE->getSubExpr()->getType()->castAs<PointerType>()->getPointeeType();
		srcLV = CGF.MakeAddrLValue(srcAddr, srcAddrType);
		}
		Address srcAddr = srcLV.getAddress(CGF);
		Address srcAddr = srcLV.getAddress();

		// The dest and src types don't necessarily match in LLVM terms
		// because of the crazy ObjC compatibility rules.
		@@ -3560,7 +3560,7 @@ RValue CallArg::getRValue(CodeGenFunction &CGF) const {
		CGF.EmitAggregateCopy(Copy, LV, Ty, AggValueSlot::DoesNotOverlap,
		LV.isVolatile());
		IsUsed = true;
		return RValue::getAggregate(Copy.getAddress(CGF));
		return RValue::getAggregate(Copy.getAddress());
		}

		void CallArg::copyInto(CodeGenFunction &CGF, Address Addr) const {
		@@ -3570,7 +3570,7 @@ void CallArg::copyInto(CodeGenFunction &CGF, Address Addr) const {
		else if (!HasLV && RV.isComplex())
		CGF.EmitStoreOfComplex(RV.getComplexVal(), Dst, /init=/true);
		else {
		auto Addr = HasLV ? LV.getAddress(CGF) : RV.getAggregateAddress();
		auto Addr = HasLV ? LV.getAddress() : RV.getAggregateAddress();
		LValue SrcLV = CGF.MakeAddrLValue(Addr, Ty);
		// We assume that call args are never copied into subobjects.
		CGF.EmitAggregateCopy(Dst, SrcLV, Ty, AggValueSlot::DoesNotOverlap,
		@@ -3933,7 +3933,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
		if (I->isAggregate()) {
		// Replace the placeholder with the appropriate argument slot GEP.
		Address Addr = I->hasLValue()
		? I->getKnownLValue().getAddress(*this)
		? I->getKnownLValue().getAddress()
		: I->getKnownRValue().getAggregateAddress();
		llvm::Instruction *Placeholder =
		cast<llvm::Instruction>(Addr.getPointer());
		@@ -3978,7 +3978,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
		// 3. If the argument is byval, but RV is not located in default
		// or alloca address space.
		Address Addr = I->hasLValue()
		? I->getKnownLValue().getAddress(*this)
		? I->getKnownLValue().getAddress()
		: I->getKnownRValue().getAggregateAddress();
		llvm::Value *V = Addr.getPointer();
		CharUnits Align = ArgInfo.getIndirectAlign();
		@@ -4065,7 +4065,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
		V = I->getKnownRValue().getScalarVal();
		else
		V = Builder.CreateLoad(
		I->hasLValue() ? I->getKnownLValue().getAddress(*this)
		I->hasLValue() ? I->getKnownLValue().getAddress()
		: I->getKnownRValue().getAggregateAddress());

		// Implement swifterror by copying into a new swifterror argument.
		@@ -4108,7 +4108,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
		Src = CreateMemTemp(I->Ty, "coerce");
		I->copyInto(*this, Src);
		} else {
		Src = I->hasLValue() ? I->getKnownLValue().getAddress(*this)
		Src = I->hasLValue() ? I->getKnownLValue().getAddress()
		: I->getKnownRValue().getAggregateAddress();
		}

		@@ -4163,7 +4163,7 @@ RValue CodeGenFunction::EmitCall(const CGFunctionInfo &CallInfo,
		Address addr = Address::invalid();
		Address AllocaAddr = Address::invalid();
		if (I->isAggregate()) {
		addr = I->hasLValue() ? I->getKnownLValue().getAddress(*this)
		addr = I->hasLValue() ? I->getKnownLValue().getAddress()
		: I->getKnownRValue().getAggregateAddress();

		} else {

clang/lib/CodeGen/CGClass.cpp

+17 −14

Original line number	Diff line number	Diff line
		@@ -657,7 +657,7 @@ static void EmitMemberInitializer(CodeGenFunction &CGF,
		// the constructor.
		QualType::DestructionKind dtorKind = FieldType.isDestructedType();
		if (CGF.needsEHCleanup(dtorKind))
		CGF.pushEHDestroy(dtorKind, LHS.getAddress(CGF), FieldType);
		CGF.pushEHDestroy(dtorKind, LHS.getAddress(), FieldType);
		return;
		}
		}
		@@ -681,10 +681,14 @@ void CodeGenFunction::EmitInitializerForField(FieldDecl *Field, LValue LHS,
		EmitComplexExprIntoLValue(Init, LHS, /isInit/ true);
		break;
		case TEK_Aggregate: {
		AggValueSlot Slot = AggValueSlot::forLValue(
		LHS, *this, AggValueSlot::IsDestructed,
		AggValueSlot::DoesNotNeedGCBarriers, AggValueSlot::IsNotAliased,
		getOverlapForFieldInit(Field), AggValueSlot::IsNotZeroed,
		AggValueSlot Slot =
		AggValueSlot::forLValue(
		LHS,
		AggValueSlot::IsDestructed,
		AggValueSlot::DoesNotNeedGCBarriers,
		AggValueSlot::IsNotAliased,
		getOverlapForFieldInit(Field),
		AggValueSlot::IsNotZeroed,
		// Checks are made by the code that calls constructor.
		AggValueSlot::IsSanitizerChecked);
		EmitAggExpr(Init, Slot);
		@@ -696,7 +700,7 @@ void CodeGenFunction::EmitInitializerForField(FieldDecl *Field, LValue LHS,
		// later in the constructor.
		QualType::DestructionKind dtorKind = FieldType.isDestructedType();
		if (needsEHCleanup(dtorKind))
		pushEHDestroy(dtorKind, LHS.getAddress(*this), FieldType);
		pushEHDestroy(dtorKind, LHS.getAddress(), FieldType);
		}

		/// Checks whether the given constructor is a valid subject for the
		@@ -959,9 +963,8 @@ namespace {
		LValue SrcLV = CGF.MakeNaturalAlignAddrLValue(SrcPtr, RecordTy);
		LValue Src = CGF.EmitLValueForFieldInitialization(SrcLV, FirstField);

		emitMemcpyIR(
		Dest.isBitField() ? Dest.getBitFieldAddress() : Dest.getAddress(CGF),
		Src.isBitField() ? Src.getBitFieldAddress() : Src.getAddress(CGF),
		emitMemcpyIR(Dest.isBitField() ? Dest.getBitFieldAddress() : Dest.getAddress(),
		Src.isBitField() ? Src.getBitFieldAddress() : Src.getAddress(),
		MemcpySize);
		reset();
		}
		@@ -1116,7 +1119,7 @@ namespace {
		continue;
		LValue FieldLHS = LHS;
		EmitLValueForAnyFieldInitialization(CGF, MemberInit, FieldLHS);
		CGF.pushEHDestroy(dtorKind, FieldLHS.getAddress(CGF), FieldType);
		CGF.pushEHDestroy(dtorKind, FieldLHS.getAddress(), FieldType);
		}
		}

		@@ -1626,7 +1629,7 @@ namespace {
		LValue LV = CGF.EmitLValueForField(ThisLV, field);
		assert(LV.isSimple());

		CGF.emitDestroy(LV.getAddress(CGF), field->getType(), destroyer,
		CGF.emitDestroy(LV.getAddress(), field->getType(), destroyer,
		flags.isForNormalCleanup() && useEHCleanupForArray);
		}
		};