Merge pull request #9479 from haberman/sync-stage-2

Integrate from Piper for C++, Java, and Python

Author: haberman

commonjs/export.js

@@ -15,15 +15,16 @@ goog.require('jspb.ExtensionFieldInfo');
 goog.require('jspb.Message');
 goog.require('jspb.Map');
 
-if ( typeof exports === 'object' ) {
+if (typeof exports === 'object') {
   exports.Map = jspb.Map;
   exports.Message = jspb.Message;
   exports.BinaryReader = jspb.BinaryReader;
   exports.BinaryWriter = jspb.BinaryWriter;
   exports.ExtensionFieldInfo = jspb.ExtensionFieldInfo;
   exports.ExtensionFieldBinaryInfo = jspb.ExtensionFieldBinaryInfo;
 
-  // These are used by generated code but should not be used directly by clients.
+  // These are used by generated code but should not be used directly by
+  // clients.
   exports.exportSymbol = goog.exportSymbol;
   exports.inherits = goog.inherits;
   exports.object = {extend: goog.object.extend};

src/google/protobuf/compiler/js/js_generator.cc

@@ -3625,23 +3625,19 @@ void Generator::GenerateFile(const GeneratorOptions& options,
     if (options.import_style == GeneratorOptions::kImportCommonJsStrict) {
       printer->Print("var proto = {};\n\n");
     } else {
-      // To get the global object we call a function with .call(null), this will set "this" inside the
-      // function to the global object.
-      // This does not work if we are running in strict mode ("use strict"),
-      // so we fallback to the following things (in order from first to last):
+      // To get the global object we call a function with .call(null), this will
+      // set "this" inside the function to the global object. This does not work
+      // if we are running in strict mode ("use strict"), so we fallback to the
+      // following things (in order from first to last):
       // - window: defined in browsers
       // - global: defined in most server side environments like NodeJS
       // - self: defined inside Web Workers (WorkerGlobalScope)
-      // - Function('return this')(): this will work on most platforms, but it may be blocked by things like CSP.
+      // - Function('return this')(): this will work on most platforms, but it
+      // may be blocked by things like CSP.
       //   Function('') is almost the same as eval('')
       printer->Print(
-          "var global = (function() {\n"
-          "  if (this) { return this; }\n"
-          "  if (typeof window !== 'undefined') { return window; }\n"
-          "  if (typeof global !== 'undefined') { return global; }\n"
-          "  if (typeof self !== 'undefined') { return self; }\n"
-          "  return Function('return this')();\n"
-          "}.call(null));\n\n");
+          "var global = (function() { return this || window || global || self "
+          "|| Function('return this')(); }).call(null);\n\n");
     }
 
     for (int i = 0; i < file->dependency_count(); i++) {