From ecddfcd08d8c44009a54813577def3307e0db173 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Wed, 4 Jul 2018 10:12:52 -0400
Subject: [PATCH] Use binding behavior of buildmessage.markBoundary in more
 places.

This functionality was introduced in 7b6fd0ee10b8eabd2e5c599bc5f79a396ee80542.
---
 tools/isobuild/bundler.js         | 7 ++++---
 tools/isobuild/compiler-plugin.js | 7 ++++---
 tools/isobuild/compiler.js        | 7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js
index f0bb169789..cd55dbf9a3 100644
--- a/tools/isobuild/bundler.js
+++ b/tools/isobuild/bundler.js
@@ -1320,12 +1320,13 @@ class Target {
       }
     });
 
-    var minifier = minifierDef.userPlugin.processFilesForBundle
-      .bind(minifierDef.userPlugin);
+    var markedMinifier = buildmessage.markBoundary(
+      minifierDef.userPlugin.processFilesForBundle,
+      minifierDef.userPlugin
+    );
 
     buildmessage.enterJob('minifying app code', function () {
       try {
-        var markedMinifier = buildmessage.markBoundary(minifier);
         Promise.all([
           markedMinifier(staticFiles, { minifyMode }),
           ...dynamicFiles.map(
diff --git a/tools/isobuild/compiler-plugin.js b/tools/isobuild/compiler-plugin.js
index 1aeaf4aa97..78de964b8d 100644
--- a/tools/isobuild/compiler-plugin.js
+++ b/tools/isobuild/compiler-plugin.js
@@ -189,9 +189,10 @@ export class CompilerPluginProcessor {
             return new InputFile(resourceSlot);
           });
 
-          var markedMethod = buildmessage.markBoundary(
-            sourceProcessor.userPlugin.processFilesForTarget.bind(
-              sourceProcessor.userPlugin));
+          const markedMethod = buildmessage.markBoundary(
+            sourceProcessor.userPlugin.processFilesForTarget,
+            sourceProcessor.userPlugin
+          );
 
           try {
             Promise.await(markedMethod(inputFiles));
diff --git a/tools/isobuild/compiler.js b/tools/isobuild/compiler.js
index c40383e18d..0d1daecceb 100644
--- a/tools/isobuild/compiler.js
+++ b/tools/isobuild/compiler.js
@@ -820,7 +820,10 @@ function runLinters({inputSourceArch, isopackCache, sources,
       wrappedSource => new linterPluginModule.LintingFile(wrappedSource)
     );
 
-    const linter = sourceProcessor.userPlugin.processFilesForPackage;
+    const markedLinter = buildmessage.markBoundary(
+      sourceProcessor.userPlugin.processFilesForPackage,
+      sourceProcessor.userPlugin
+    );
 
     function archToString(arch) {
       if (arch.match(/web\.cordova/)) {
@@ -843,8 +846,6 @@ function runLinters({inputSourceArch, isopackCache, sources,
         " (" + archToString(inputSourceArch.arch) + ")"
     }, () => {
       try {
-        var markedLinter = buildmessage.markBoundary(linter.bind(
-          sourceProcessor.userPlugin));
         Promise.await(markedLinter(sourcesToLint, {
           globals: globalImports
         }));