Fix optimizer error

src/Neo.Compiler.MSIL/NeoModule.cs

@@ -68,21 +68,6 @@ public string GenJson()
             json.ConvertToStringWithFormat(sb, 4);
             return sb.ToString();
         }
-
-        internal void ConvertFuncAddr()
-        {
-            foreach (var method in this.mapMethods.Values)
-            {
-                foreach (var code in method.body_Codes.Values)
-                {
-                    if (code.code != VM.OpCode.NOP)
-                    {
-                        method.funcaddr = code.addr;
-                        break;
-                    }
-                }
-            }
-        }
     }
 
     public class NeoMethod

src/Neo.Compiler.MSIL/Optimizer/NefOptimizer.cs

@@ -70,19 +70,19 @@ public void Optimize()
         /// <param name="entryPoints">Entry points</param>
         public void LoadNef(Stream stream, int[] entryPoints)
         {
-            //read all Instruction to listInst
+            // Read all Instruction to listInst.
             var listInst = new List<NefInstruction>();
-            //read all Address to listAddr
+            // Read all Address to listAddr.
             var mapLabel = new Dictionary<int, NefLabel>();
             int labelindex = 1;
 
-            //insert EntryPointLabel
+            // Insert EntryPoint Label.
             for (var i = 0; i < entryPoints.Length; i++)
             {
                 if (i > 0 && entryPoints[i - 1] == entryPoints[i])
                 {
-                    //不允许出现一样的EntryPoint
-                    throw new Exception("now allow same EntryPoint.");
+                    // Same EntryPoints are not allowed
+                    throw new Exception("Same EntryPoints are not allowed.");
                 }
                 if (!mapLabel.ContainsKey(entryPoints[i]))
                 {
@@ -116,16 +116,14 @@ public void LoadNef(Stream stream, int[] entryPoints)
                             labelindex++;
                             var label = new NefLabel(labelname, addr);
                             mapLabel.Add(addr, label);
-
                         }
 
                         inst.Labels[i] = mapLabel[addr].Name;
                     }
                 }
             } while (inst != null);
 
-
-            //Add Labels and split to Methods
+            // Add Labels and split to Methods
             Methods = new List<NefMethod>();
 
             var curMethod = new NefMethod();

src/Neo.Compiler.MSIL/Program.cs

@@ -167,7 +167,6 @@ public static int Compile(Options options)
                 Dictionary<int, int> addrConvTable = null;
                 if (options.Optimize)
                 {
-                    module.ConvertFuncAddr();
                     HashSet<int> entryPoints = new HashSet<int>();
                     foreach (var func in module.mapMethods)
                     {

tests/Neo.Compiler.MSIL.UnitTests/TestClasses/Contract_OptimizationTest.cs

@@ -0,0 +1,14 @@
+using Neo.SmartContract.Framework.Services.Neo;
+using Neo.SmartContract.Framework;
+
+namespace Neo.Compiler.MSIL.TestClasses
+{
+    public class Contract_OptimizationTest : SmartContract.Framework.SmartContract
+    {
+        private static byte[] Owner = "Ne9ipxm2sPUaetvh3ZvjhyCzRZqP355dTZ".ToScriptHash();
+        public static bool Verify()
+        {
+            return Runtime.CheckWitness(Owner);
+        }
+    }
+}

tests/Neo.Compiler.MSIL.UnitTests/UnitTest_NefOptimizer.cs

@@ -1,4 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Neo.Compiler.MSIL.UnitTests.Utils;
 using Neo.Compiler.Optimizer;
 using Neo.VM;
 using System;
@@ -10,6 +11,16 @@ namespace Neo.Compiler.MSIL
     [TestClass]
     public class UnitTest_NefOptimizer
     {
+        [TestMethod]
+        public void Test_OptimizerNopEntryPoint()
+        {
+            var testengine = new TestEngine();
+            var build = testengine.Build("./TestClasses/Contract_OptimizationTest.cs", false, true);
+
+            Assert.AreEqual(build.finalABI["methods"].AsList()[0].asDict()["name"].AsString(), "verify");
+            Assert.AreEqual(build.finalABI["methods"].AsList()[0].asDict()["offset"].AsString(), "0");
+        }
+
         [TestMethod]
         public void Test_Optimize_RemoveNOPS()
         {

tests/Neo.Compiler.MSIL.UnitTests/Utils/BuildScript.cs

@@ -55,7 +55,7 @@ public void Build(Stream fs, Stream fspdb, bool optimizer)
                     List<int> entryPoints = new List<int>();
                     foreach (var f in converterIL.outModule.mapMethods.Values)
                     {
-                        if (entryPoints.Contains(f.funcaddr) == false)
+                        if (!entryPoints.Contains(f.funcaddr))
                             entryPoints.Add(f.funcaddr);
                     }
                     var opbytes = NefOptimizeTool.Optimize(finalNEF, entryPoints.ToArray(), out addrConvTable);