@@ -3863,31 +3863,6 @@ int main() {
3863
3863
expressions[744] = BinaryenConst(the_module, BinaryenLiteralInt32(2449));
3864
3864
{
3865
3865
BinaryenExpressionRef operands[] = { expressions[14], expressions[15], expressions[16], expressions[17] };
3866
- <<<<<<< HEAD
3867
- expressions[743] = BinaryenCallIndirect(the_module, expressions[742], operands, 4, "iiIfF");
3868
- }
3869
- expressions[744] = BinaryenUnary(the_module, 20, expressions[743]);
3870
- expressions[745] = BinaryenLocalGet(the_module, 0, 2);
3871
- expressions[746] = BinaryenDrop(the_module, expressions[745]);
3872
- expressions[747] = BinaryenConst(the_module, BinaryenLiteralInt32(101));
3873
- expressions[748] = BinaryenLocalSet(the_module, 0, expressions[747]);
3874
- expressions[749] = BinaryenConst(the_module, BinaryenLiteralInt32(102));
3875
- expressions[750] = BinaryenLocalTee(the_module, 0, expressions[749], 2);
3876
- expressions[751] = BinaryenDrop(the_module, expressions[750]);
3877
- expressions[752] = BinaryenConst(the_module, BinaryenLiteralInt32(1));
3878
- expressions[753] = BinaryenLoad(the_module, 4, 0, 0, 0, 2, expressions[752]);
3879
- expressions[754] = BinaryenConst(the_module, BinaryenLiteralInt32(8));
3880
- expressions[755] = BinaryenLoad(the_module, 2, 1, 2, 1, 3, expressions[754]);
3881
- expressions[756] = BinaryenConst(the_module, BinaryenLiteralInt32(2));
3882
- expressions[757] = BinaryenLoad(the_module, 4, 0, 0, 0, 4, expressions[756]);
3883
- expressions[758] = BinaryenConst(the_module, BinaryenLiteralInt32(9));
3884
- expressions[759] = BinaryenLoad(the_module, 8, 0, 2, 8, 5, expressions[758]);
3885
- expressions[760] = BinaryenStore(the_module, 4, 0, 0, expressions[30], expressions[31], 2);
3886
- expressions[761] = BinaryenStore(the_module, 8, 2, 4, expressions[32], expressions[33], 3);
3887
- expressions[762] = BinaryenSelect(the_module, expressions[27], expressions[28], expressions[29]);
3888
- expressions[763] = BinaryenConst(the_module, BinaryenLiteralInt32(1337));
3889
- expressions[764] = BinaryenReturn(the_module, expressions[763]);
3890
- =======
3891
3866
expressions[745] = BinaryenCallIndirect(the_module, expressions[744], operands, 4, "iiIfF");
3892
3867
}
3893
3868
expressions[746] = BinaryenUnary(the_module, 20, expressions[745]);
@@ -3896,7 +3871,7 @@ int main() {
3896
3871
expressions[749] = BinaryenConst(the_module, BinaryenLiteralInt32(101));
3897
3872
expressions[750] = BinaryenLocalSet(the_module, 0, expressions[749]);
3898
3873
expressions[751] = BinaryenConst(the_module, BinaryenLiteralInt32(102));
3899
- expressions[752] = BinaryenLocalTee(the_module, 0, expressions[751]);
3874
+ expressions[752] = BinaryenLocalTee(the_module, 0, expressions[751], 2 );
3900
3875
expressions[753] = BinaryenDrop(the_module, expressions[752]);
3901
3876
expressions[754] = BinaryenConst(the_module, BinaryenLiteralInt32(1));
3902
3877
expressions[755] = BinaryenLoad(the_module, 4, 0, 0, 0, 2, expressions[754]);
@@ -3911,7 +3886,6 @@ int main() {
3911
3886
expressions[764] = BinaryenSelect(the_module, expressions[27], expressions[28], expressions[29], BinaryenTypeAuto());
3912
3887
expressions[765] = BinaryenConst(the_module, BinaryenLiteralInt32(1337));
3913
3888
expressions[766] = BinaryenReturn(the_module, expressions[765]);
3914
- >>>>>>> Add support for reference types proposal
3915
3889
{
3916
3890
BinaryenExpressionRef operands[] = { expressions[10], expressions[11], expressions[12], expressions[13] };
3917
3891
expressions[767] = BinaryenReturnCall(the_module, "kitchen()sinker", operands, 4, 2);
0 commit comments