Skip to content

Commit 9cf8459

Browse files
committed
Revert "Introduce via-ir option for syntax tests"
This reverts commit 35299b4.
1 parent 35299b4 commit 9cf8459

11 files changed

+4
-16
lines changed

Diff for: test/libsolidity/SyntaxTest.cpp

+4-6
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ SyntaxTest::SyntaxTest(
4646
m_minSeverity(_minSeverity)
4747
{
4848
m_optimiseYul = m_reader.boolSetting("optimize-yul", true);
49-
m_viaIr = m_reader.boolSetting("via-ir", false);
5049
}
5150

5251
void SyntaxTest::setupCompiler(CompilerStack& _compiler)
@@ -59,7 +58,6 @@ void SyntaxTest::setupCompiler(CompilerStack& _compiler)
5958
OptimiserSettings::full() :
6059
OptimiserSettings::minimal()
6160
);
62-
_compiler.setViaIR(m_viaIr);
6361
_compiler.setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
6462
_compiler.setMetadataHash(CompilerStack::MetadataHash::None);
6563
}
@@ -69,13 +67,13 @@ void SyntaxTest::parseAndAnalyze()
6967
try
7068
{
7169
runFramework(withPreamble(m_sources.sources), PipelineStage::Compilation);
72-
if (!pipelineSuccessful() && stageSuccessful(PipelineStage::Analysis))
70+
if (!pipelineSuccessful() && stageSuccessful(PipelineStage::Analysis) && !compiler().isExperimentalAnalysis())
7371
{
74-
ErrorList const &errors = compiler().errors();
75-
auto codeGeneretionErrorCount = count_if(errors.cbegin(), errors.cend(), [](auto const &error) {
72+
ErrorList const& errors = compiler().errors();
73+
auto codeGeneretionErrorCount = count_if(errors.cbegin(), errors.cend(), [](auto const& error) {
7674
return error->type() == Error::Type::CodeGenerationError;
7775
});
78-
auto errorCount = count_if(errors.cbegin(), errors.cend(), [](auto const &error) {
76+
auto errorCount = count_if(errors.cbegin(), errors.cend(), [](auto const& error) {
7977
return Error::isError(error->type());
8078
});
8179
// failing compilation after successful analysis is a rare case,

Diff for: test/libsolidity/SyntaxTest.h

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ class SyntaxTest: public AnalysisFramework, public solidity::test::CommonSyntaxT
5353
virtual void filterObtainedErrors();
5454

5555
bool m_optimiseYul{};
56-
bool m_viaIr{};
5756
langutil::Error::Severity m_minSeverity{};
5857
};
5958

Diff for: test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ contract C {
3131
}
3232
// ====
3333
// EVMVersion: >=constantinople
34-
// via-ir: true
3534
// ----
3635
// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
3736
// Info 4164: (31-61): Inferred type: void

Diff for: test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition_duplicate.sol

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ type fun1(T, U) = __builtin("fun");
1010
type fun2(T, U) = __builtin("fun");
1111
// ====
1212
// EVMVersion: >=constantinople
13-
// via-ir: true
1413
// ----
1514
// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
1615
// TypeError 9609: (63-94): Duplicate builtin type definition.

Diff for: test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition_unknown.sol

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ pragma experimental solidity;
33
type someUnknownType = __builtin("someUnknownType");
44
// ====
55
// EVMVersion: >=constantinople
6-
// via-ir: true
76
// ----
87
// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
98
// TypeError 7758: (31-81): Expected the name of a built-in primitive type.
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
pragma experimental solidity;
22
// ====
33
// EVMVersion: >=constantinople
4-
// via-ir: true
54
// ----
65
// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.

Diff for: test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_1.sol

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ pragma experimental solidity;
33
import std.stub;
44
// ====
55
// EVMVersion: >=constantinople
6-
// via-ir: true
76
// ----
87
// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
98
// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.

Diff for: test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_2.sol

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ pragma experimental solidity;
33
import std.stub as stub;
44
// ====
55
// EVMVersion: >=constantinople
6-
// via-ir: true
76
// ----
87
// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
98
// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.

Diff for: test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_3.sol

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ pragma experimental solidity;
33
import { identity } from std.stub;
44
// ====
55
// EVMVersion: >=constantinople
6-
// via-ir: true
76
// ----
87
// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
98
// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.

Diff for: test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_4.sol

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ pragma experimental solidity;
33
import * as stub from std.stub;
44
// ====
55
// EVMVersion: >=constantinople
6-
// via-ir: true
76
// ----
87
// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
98
// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.

Diff for: test/libsolidity/syntaxTests/experimental/inference/import_and_call_stdlib_function.sol

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ contract C
1212

1313
// ====
1414
// EVMVersion: >=constantinople
15-
// via-ir: true
1615
// ----
1716
// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
1817
// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.

0 commit comments

Comments
 (0)