pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

When conditional does not have any common reachable nodes, create only 'true' body. 'False' body is then implicitly the code after the conditional.

pull/1/head^2
David Srbecký 18 years ago
parent
a455a6be02
commit
cefcba99d1
2 changed files with 65 additions and 89 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 104
      bin/Debug/output.cs
  2. 2
      src/ControlFlow/Node-Optimize.cs

104
bin/Debug/output.cs
Unescape View File

@ -285,22 +285,19 @@ namespace Reversi @@ -285,22 +285,19 @@ namespace Reversi
}
if (!((@this.squares).Get(row, k) != (IL__ldsfld(Empty)))) {
V_3 = 1;
goto BasicBlock_401;
}
else {
if (!((@this.squares).Get(row, k) != i)) {
if (!((@this.safeDiscs).Get(row, k))) {
goto BasicBlock_400;
}
}
else {
goto BasicBlock_400;
goto BasicBlock_401;
}
}
V_5 = 1;
}
BasicBlock_401:
k = (k + 1);
continue;
BasicBlock_400:
V_5 = 1;
goto BasicBlock_401;
}
else {
break;
@ -314,22 +311,19 @@ namespace Reversi @@ -314,22 +311,19 @@ namespace Reversi
}
if (!((@this.squares).Get(row, k) != (IL__ldsfld(Empty)))) {
V_4 = 1;
goto BasicBlock_410;
}
else {
if (!((@this.squares).Get(row, k) != i)) {
if (!((@this.safeDiscs).Get(row, k))) {
goto BasicBlock_409;
}
}
else {
goto BasicBlock_409;
goto BasicBlock_410;
}
}
V_6 = 1;
}
BasicBlock_410:
k = (k + 1);
continue;
BasicBlock_409:
V_6 = 1;
goto BasicBlock_410;
}
else {
break;
@ -366,22 +360,19 @@ namespace Reversi @@ -366,22 +360,19 @@ namespace Reversi
}
if (!((@this.squares).Get(j, col) != (IL__ldsfld(Empty)))) {
V_3 = 1;
goto BasicBlock_426;
}
else {
if (!((@this.squares).Get(j, col) != i)) {
if (!((@this.safeDiscs).Get(j, col))) {
goto BasicBlock_425;
}
}
else {
goto BasicBlock_425;
goto BasicBlock_426;
}
}
V_5 = 1;
}
BasicBlock_426:
j = (j + 1);
continue;
BasicBlock_425:
V_5 = 1;
goto BasicBlock_426;
}
else {
break;
@ -395,22 +386,19 @@ namespace Reversi @@ -395,22 +386,19 @@ namespace Reversi
}
if (!((@this.squares).Get(j, col) != (IL__ldsfld(Empty)))) {
V_4 = 1;
goto BasicBlock_435;
}
else {
if (!((@this.squares).Get(j, col) != i)) {
if (!((@this.safeDiscs).Get(j, col))) {
goto BasicBlock_434;
}
}
else {
goto BasicBlock_434;
goto BasicBlock_435;
}
}
V_6 = 1;
}
BasicBlock_435:
j = (j + 1);
continue;
BasicBlock_434:
V_6 = 1;
goto BasicBlock_435;
}
else {
break;
@ -450,23 +438,20 @@ namespace Reversi @@ -450,23 +438,20 @@ namespace Reversi
}
if (!((@this.squares).Get(j, k) != (IL__ldsfld(Empty)))) {
V_3 = 1;
goto BasicBlock_451;
}
else {
if (!((@this.squares).Get(j, k) != i)) {
if (!((@this.safeDiscs).Get(j, k))) {
goto BasicBlock_450;
}
}
else {
goto BasicBlock_450;
goto BasicBlock_451;
}
}
V_5 = 1;
}
BasicBlock_451:
j = (j - 1);
k = (k - 1);
continue;
BasicBlock_450:
V_5 = 1;
goto BasicBlock_451;
}
else {
break;
@ -486,23 +471,20 @@ namespace Reversi @@ -486,23 +471,20 @@ namespace Reversi
}
if (!((@this.squares).Get(j, k) != (IL__ldsfld(Empty)))) {
V_4 = 1;
goto BasicBlock_461;
}
else {
if (!((@this.squares).Get(j, k) != i)) {
if (!((@this.safeDiscs).Get(j, k))) {
goto BasicBlock_460;
}
}
else {
goto BasicBlock_460;
goto BasicBlock_461;
}
}
V_6 = 1;
}
BasicBlock_461:
j = (j + 1);
k = (k + 1);
continue;
BasicBlock_460:
V_6 = 1;
goto BasicBlock_461;
}
else {
break;
@ -546,23 +528,20 @@ namespace Reversi @@ -546,23 +528,20 @@ namespace Reversi
}
if (!((@this.squares).Get(j, k) != (IL__ldsfld(Empty)))) {
V_3 = 1;
goto BasicBlock_478;
}
else {
if (!((@this.squares).Get(j, k) != i)) {
if (!((@this.safeDiscs).Get(j, k))) {
goto BasicBlock_477;
}
}
else {
goto BasicBlock_477;
goto BasicBlock_478;
}
}
V_5 = 1;
}
BasicBlock_478:
j = (j - 1);
k = (k + 1);
continue;
BasicBlock_477:
V_5 = 1;
goto BasicBlock_478;
}
else {
break;
@ -582,23 +561,20 @@ namespace Reversi @@ -582,23 +561,20 @@ namespace Reversi
}
if (!((@this.squares).Get(j, k) != (IL__ldsfld(Empty)))) {
V_4 = 1;
goto BasicBlock_488;
}
else {
if (!((@this.squares).Get(j, k) != i)) {
if (!((@this.safeDiscs).Get(j, k))) {
goto BasicBlock_487;
}
}
else {
goto BasicBlock_487;
goto BasicBlock_488;
}
}
V_6 = 1;
}
BasicBlock_488:
j = (j + 1);
k = (k - 1);
continue;
BasicBlock_487:
V_6 = 1;
goto BasicBlock_488;
}
else {
break;

2
src/ControlFlow/Node-Optimize.cs
Unescape View File

@ -112,7 +112,7 @@ namespace Decompiler.ControlFlow @@ -112,7 +112,7 @@ namespace Decompiler.ControlFlow
trueNodes.MoveTo(conditionalNode.TrueBody);
// We can exit the 'true' part of Loop or MethodBody conviently using 'break' or 'return'
if (commonReachable.Count > 0 && (conditionalNode.Parent is Loop || conditionalNode.Parent is MethodBodyGraph)) {
if (commonReachable.Count > 0) {
Options.NotifyReducingGraph();
falseNodes.MoveTo(conditionalNode.FalseBody);
}

Write Preview
Loading…
Cancel
Save