Fix bug with exclusion classes failing

- Add commented code to help on debug.

Signed-off-by: José Simões <[email protected]>

Author: josesimoes

source/MetadataProcessor.Core/nanoSkeletonGenerator.cs

@@ -120,35 +120,40 @@ private void GenerateAssemblyLookup()
                 {
                     if (c.IncludeInStub())
                     {
-                        var className = NativeMethodsCrc.GetClassName(c);
-
-                        foreach (var m in nanoTablesContext.GetOrderedMethods(c.Methods))
+                        // don't include if it's on the exclude list
+                        if (!IsClassToExclude(c))
                         {
-                            var rva = _tablesContext.ByteCodeTable.GetMethodRva(m);
+                            var className = NativeMethodsCrc.GetClassName(c);
 
-                            // check method inclusion
-                            // method is not a native implementation (RVA 0xFFFF) and is not abstract
-                            if ((rva == 0xFFFF &&
-                                 !m.IsAbstract))
+                            foreach (var m in nanoTablesContext.GetOrderedMethods(c.Methods))
                             {
-                                assemblyLookup.LookupTable.Add(new Method()
-                                {
-                                    Declaration = $"Library_{_project}_{className}::{NativeMethodsCrc.GetMethodName(m)}"
-                                });
-                            }
-                            else
-                            {
-                                // method won't be included, still
-                                // need to add a NULL entry for it
-                                // unless it's on the exclude list
+                                var rva = _tablesContext.ByteCodeTable.GetMethodRva(m);
 
-                                if (!IsClassToExclude(c))
+                                // check method inclusion
+                                // method is not a native implementation (RVA 0xFFFF) and is not abstract
+                                if ((rva == 0xFFFF &&
+                                     !m.IsAbstract))
                                 {
                                     assemblyLookup.LookupTable.Add(new Method()
                                     {
-                                        Declaration = "NULL"
+                                        Declaration = $"Library_{_project}_{className}::{NativeMethodsCrc.GetMethodName(m)}"
                                     });
                                 }
+                                else
+                                {
+                                    // method won't be included, still
+                                    // need to add a NULL entry for it
+                                    // unless it's on the exclude list
+
+                                    if (!IsClassToExclude(c))
+                                    {
+                                        assemblyLookup.LookupTable.Add(new Method()
+                                        {
+                                            Declaration = "NULL"
+                                            //Declaration = $"**Library_{_project}_{NativeMethodsCrc.GetClassName(c)}::{NativeMethodsCrc.GetMethodName(m)}"
+                                        });
+                                    }
+                                }
                             }
                         }
                     }
@@ -160,11 +165,12 @@ private void GenerateAssemblyLookup()
 
                         if (!IsClassToExclude(c))
                         {
-                            for (int i = 0; i < c.Methods.Count; i++)
+                            foreach (var m in nanoTablesContext.GetOrderedMethods(c.Methods))
                             {
                                 assemblyLookup.LookupTable.Add(new Method()
                                 {
                                     Declaration = "NULL"
+                                    //Declaration = $"**Library_{_project}_{NativeMethodsCrc.GetClassName(c)}::{NativeMethodsCrc.GetMethodName(m)}"
                                 });
                             }
                         }

source/native/Tools.MetaDataProcessor/Info_Win32.cpp

@@ -463,7 +463,8 @@ static const CHAR c_Definition_Begin[] =
 "static const CLR_RT_MethodHandler method_lookup[] =\n"
 "{\n";
 
-static const CHAR c_Definition_Body[] = "    Library_%S_%s::%s,\n";
+static const CHAR c_Definition_Body[]			= "    Library_%S_%s::%s,\n";
+static const CHAR c_Definition_Body_Invalid[]	= "    **Library_%S_%s::%s,\n";
 
 static const CHAR c_Definition_End[] =
 
@@ -1777,6 +1778,14 @@ void CLR_RT_Assembly::GenerateSkeleton_NoInterop(LPCWSTR szFileName, LPCWSTR szP
 					}
 					else
 					{
+						////////////////////////////////////////////////////
+						////////////////////////////////////////////////////
+						// use when debugging to output invalid declaration
+						//BuildMethodName(md, name, mapMethods);
+						//Dump_Printf(c_Definition_Body_Invalid, szName, cls_name.c_str(), name.c_str());
+						////////////////////////////////////////////////////
+						////////////////////////////////////////////////////
+
 						Dump_Printf("    NULL,\n");
 					}
 				}

source/native/Tools.Parser/AssemblyParser.cpp

@@ -2711,7 +2711,11 @@ HRESULT MetaData::Parser::RemoveUnused()
 
         std::wstring str; TokenToString( tk, str );
 
-        if(m_setFilter_ExcludeClassByName.find( str ) != m_setFilter_ExcludeClassByName.end()) continue;
+		if (m_setFilter_ExcludeClassByName.find(str) != m_setFilter_ExcludeClassByName.end())
+		{
+			wprintf(L"Excluding %s\n", str.c_str());
+			continue;
+		}
 
         setNew.insert( tk );
     }