Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-10 12:32:20 +02:00
Code Activity

Fixed conv operator invocation of params value

Browse source
This commit is contained in:
Brian Fiete 2022-02-02 08:35:25 -05:00
parent 438394099a
commit 1f5a56488b
2 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -12659,6 +12659,11 @@ BfIRValue BfModule::CastToValue(BfAstNode* srcNode, BfTypedValue typedVal, BfTyp
SizedArray<BfResolvedArg, 1> args; SizedArray<BfResolvedArg, 1> args;
BfResolvedArg resolvedArg; BfResolvedArg resolvedArg;
resolvedArg.mTypedValue = typedVal; resolvedArg.mTypedValue = typedVal;
if (resolvedArg.mTypedValue.IsParams())
{
resolvedArg.mTypedValue = LoadOrAggregateValue(resolvedArg.mTypedValue);
resolvedArg.mTypedValue.mKind = BfTypedValueKind_Value;
}
args.push_back(resolvedArg); args.push_back(resolvedArg);
BfMethodMatcher methodMatcher(srcNode, this, "", args, NULL); BfMethodMatcher methodMatcher(srcNode, this, "", args, NULL);
methodMatcher.mCheckReturnType = toType; methodMatcher.mCheckReturnType = toType;
@ -12891,7 +12896,7 @@ BfIRValue BfModule::CastToValue(BfAstNode* srcNode, BfTypedValue typedVal, BfTyp
if (doCall) if (doCall)
{ {
if (!silentFail) //if (!silentFail)
methodMatcher.FlushAmbiguityError(); methodMatcher.FlushAmbiguityError();
auto wantType = paramType; auto wantType = paramType;
@ -12921,22 +12926,30 @@ BfIRValue BfModule::CastToValue(BfAstNode* srcNode, BfTypedValue typedVal, BfTyp
if (doCall) if (doCall)
{ {
result = exprEvaluator.CreateCall(&methodMatcher, BfTypedValue()); if ((castFlags & BfCastFlags_IsCastCheck) != 0)
if (resultFlags != NULL)
{ {
if (result.IsAddr()) // We've already verified that we can cast from the return type to toType in MethodMatcher.CheckMethod
*resultFlags = (BfCastResultFlags)(*resultFlags | BfCastResultFlags_IsAddr); return mBfIRBuilder->GetFakeVal();
if (result.mKind == BfTypedValueKind_TempAddr)
*resultFlags = (BfCastResultFlags)(*resultFlags | BfCastResultFlags_IsTemp);
} }
else if (result.IsAddr())
result = LoadValue(result); result = exprEvaluator.CreateCall(&methodMatcher, BfTypedValue());
if (result.mType != toType) if (result.mType != toType)
return CastToValue(srcNode, result, toType, (BfCastFlags)(castFlags | BfCastFlags_Explicit | BfCastFlags_NoConversionOperator), resultFlags); return CastToValue(srcNode, result, toType, (BfCastFlags)(castFlags | BfCastFlags_Explicit | BfCastFlags_NoConversionOperator), resultFlags);
if (result) if (result)
{
if (resultFlags != NULL)
{
if (result.IsAddr())
*resultFlags = (BfCastResultFlags)(*resultFlags | BfCastResultFlags_IsAddr);
if (result.mKind == BfTypedValueKind_TempAddr)
*resultFlags = (BfCastResultFlags)(*resultFlags | BfCastResultFlags_IsTemp);
}
else if (result.IsAddr())
result = LoadValue(result);
return result.mValue; return result.mValue;
}
} }
} }
} }

16
IDEHelper/Tests/src/MethodCalls.bf
View file

@ -121,6 +121,19 @@ namespace Tests
{ {
} }
public static int ParamsA(int a, params Span<int> ints)
{
int result = a;
for (var i in ints)
result += i;
return result;
}
public static int ParamsB(int a, params int[] ints)
{
return ParamsA(a, params ints);
}
[Test] [Test]
public static void TestBasics() public static void TestBasics()
{ {
@ -149,6 +162,9 @@ namespace Tests
InCallObj("Hey"); InCallObj("Hey");
Valueless valueless; Valueless valueless;
InCallValueless(valueless); InCallValueless(valueless);
Test.Assert(ParamsA(100, 20, 3) == 123);
Test.Assert(ParamsB(100, 20, 3) == 123);
} }
} }
} }