Linker: Track the mangled entry-point name along with the non-mangled one.

glslang/Include/revision.h

@@ -2,5 +2,5 @@
 // For the version, it uses the latest git tag followed by the number of commits.
 // For the date, it uses the current date (when then script is run).
 
-#define GLSLANG_REVISION "Overload400-PrecQual.1686"
+#define GLSLANG_REVISION "Overload400-PrecQual.1687"
 #define GLSLANG_DATE "09-Dec-2016"

glslang/MachineIndependent/linkValidate.cpp

@@ -85,11 +85,13 @@ void TIntermediate::merge(TInfoSink& infoSink, TIntermediate& unit)
     if (unit.getNumEntryPoints() > 0) {
         if (getNumEntryPoints() > 0)
             error(infoSink, "can't handle multiple entry points per stage");
-        else
-            entryPointName = unit.entryPointName;
+        else {
+            entryPointName = unit.getEntryPointName();
+            entryPointMangledName = unit.getEntryPointMangledName();
+        }
     }
-    numEntryPoints += unit.numEntryPoints;
-    numErrors += unit.numErrors;
+    numEntryPoints += unit.getNumEntryPoints();
+    numErrors += unit.getNumErrors();
     numPushConstants += unit.numPushConstants;
     callGraph.insert(callGraph.end(), unit.callGraph.begin(), unit.callGraph.end());