libv8 6.0.286.54.3 → 6.2.414.42.0beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 042f077071506ee8e400826643fdc47bf3e90b60
-  data.tar.gz: 7fbdc8f3e990d758b5eaba80bd39d36e9e12e04a
+  metadata.gz: 24f1e27ffdebdfda185ee877d56047941a3b7743
+  data.tar.gz: 48beb24665420d51ff4485856d8c501a24e57168
 SHA512:
-  metadata.gz: bf0b69a46f67b05d06bfa7b1b9bd1791f044dc92c9d2c4bd92408c812981f51c795ac65aa7add281255895bbdfca034d9d6930b25e536a0bc3f6e709577682bf
-  data.tar.gz: 64aadde81a8f560cd2bc4fc96d8cd17fdcc17054359cc93ff9ac35ad970576f3d8d4b29da2c0740bf7f500dd91d4cdc208d9f2526d9c9ecf8d3e9721fd0f91c0
+  metadata.gz: 9b924dd26d7921729c5d61d4f86259efe30ee232af5be699b0898c9aa28bb27c51fa228ae352c019353e20008138fb6c66dae5be1903ad3a199bffa9dcbc2d7d
+  data.tar.gz: 79c9c625f18a36b69321ac7cbfd904457c43e46903e59f86f4ccbd261cc60d70f025cce60eac5fce9594baefc83a8ff331633cc663f52d3739510dd11dc39bd3

data/.travis.yml

@@ -12,8 +12,9 @@ matrix:
     - rvm: 2.4.0
       os: osx
       osx_image: xcode7.3
-    - rvm: 2.4.0
-      os: osx
+    - os: osx
+      osx_image: xcode6.4
+    - os: osx
       osx_image: xcode9.1
     - rvm: system
       os: osx
@@ -33,6 +34,8 @@ matrix:
   allow_failures:
     - rvm: 1.9.3
     - rvm: rbx
+    - os: osx
+      osx_image: xcode6.4
   fast_finish: true
 dist: trusty
 addons:
@@ -43,7 +46,6 @@ bundler_args: --jobs=4 --retry=3
 before_install:
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then gem update bundler; fi
   - if [ "$TRAVIS_OS_NAME" == "linux" ]; then gem update --system; fi
-  - if [ "$TRAVIS_OS_NAME" == "osx" -a "$TRAVIS_RUBY_VERSION" == "2.0.0" ]; then rvm rubygems current; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" -a "$TRAVIS_RUBY_VERSION" == "system" ]; then sudo gem install bundler; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" -a "$TRAVIS_RUBY_VERSION" != "system" ]; then gem update --system; fi
   - if [ "$TRAVIS_OS_NAME" == "osx" -a "$TRAVIS_RUBY_VERSION" != "system" ]; then gem update bundler; fi

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### Unreleased
+
+* Update upstream v8 version to 6.2.414.42
+
 ### v6.0.286.54.2, v6.0.286.54.3 - 2017-10-25
 
 * Fix regression when building from source gem #246

data/Rakefile

@@ -70,9 +70,9 @@ namespace :build do
       Dir.chdir(arch_dir) do
         ENV['RUBYLIB'] = nil # https://github.com/mitchellh/vagrant/issues/6158
         sh "vagrant up"
-        sh "vagrant ssh -c 'rm -rf ~/libv8'"
-        sh "vagrant ssh -c 'git clone /libv8/.git ~/libv8 --recursive'"
-        sh "vagrant ssh -c 'cd ~/libv8 && bundle install --path vendor/bundle'"
+        # sh "vagrant ssh -c 'rm -rf ~/libv8'"
+        # sh "vagrant ssh -c 'git clone /libv8/.git ~/libv8 --recursive'"
+        # sh "vagrant ssh -c 'cd ~/libv8 && bundle install --path vendor/bundle'"
         sh "vagrant ssh -c 'cd ~/libv8 && env MAKEFLAGS=-j4 bundle exec rake binary'"
         sh "vagrant status | grep scaleway" do |ok, res|
           if ok

data/lib/libv8/version.rb

@@ -1,3 +1,3 @@
 module Libv8
-  VERSION = "6.0.286.54.3"
+  VERSION = "6.2.414.42.0beta1"
 end

data/patches/0001-Build-a-standalone-static-library.patch

@@ -1,4 +1,4 @@
-From 6c28fb0319c5e2e7afad4b5731fc0ded86e1f7e7 Mon Sep 17 00:00:00 2001
+From cbe264bb5c231d06f64b48413f3f268ca490e00a Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <bordjukov@gmail.com>
 Date: Mon, 25 Jul 2016 00:00:19 +0300
 Subject: [PATCH 1/5] Build a standalone static library
@@ -8,10 +8,10 @@ Subject: [PATCH 1/5] Build a standalone static library
  1 file changed, 3 insertions(+)
 
 diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi
-index 4c805bf643..6a72a23cfb 100644
+index 63930d8aef..d0d00d3f67 100644
 --- a/gypfiles/standalone.gypi
 +++ b/gypfiles/standalone.gypi
-@@ -522,6 +522,9 @@
+@@ -517,6 +517,9 @@
        }],  # fastbuild!=0
      ],
      'target_conditions': [
@@ -22,5 +22,5 @@ index 4c805bf643..6a72a23cfb 100644
          'defines!': [
            'DEBUG',
 -- 
-2.13.3
+2.14.3
 

data/patches/0002-Don-t-compile-unnecessary-stuff.patch

@@ -1,36 +1,34 @@
-From 31d199f67ff88be5576869abcc23ecf219fa1e6f Mon Sep 17 00:00:00 2001
+From 96075b7eeeef64063186d743d1fa36e6de494a6e Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <bordjukov@gmail.com>
 Date: Fri, 28 Jul 2017 11:11:08 +0300
 Subject: [PATCH 2/5] Don't compile unnecessary stuff
 
 ---
- Makefile         | 12 +++---------
+ Makefile         |  9 ++-------
  gypfiles/all.gyp | 33 ---------------------------------
- 2 files changed, 3 insertions(+), 42 deletions(-)
+ 2 files changed, 2 insertions(+), 40 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index ed5b3a7fab..04eddb5e8a 100644
+index eb146ac244..902832af48 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -265,15 +265,9 @@ ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64 \
- 		 android_mipsel android_x87
+@@ -268,14 +268,9 @@ ANDROID_ARCHES = android_ia32 android_x64 android_arm android_arm64 \
+ 		 android_mipsel
  
  # List of files that trigger Makefile regeneration:
 -GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
 -	   gypfiles/shim_headers.gypi gypfiles/features.gypi \
 -           gypfiles/standalone.gypi \
--	   gypfiles/toolchain.gypi gypfiles/all.gyp gypfiles/mac/asan.gyp \
++GYPFILES = gypfiles/features.gypi gypfiles/standalone.gypi \
+ 	   gypfiles/toolchain.gypi gypfiles/all.gyp gypfiles/mac/asan.gyp \
 -	   test/cctest/cctest.gyp test/fuzzer/fuzzer.gyp \
 -	   test/unittests/unittests.gyp src/v8.gyp \
 -	   tools/parser-shell.gyp testing/gmock.gyp testing/gtest.gyp \
--	   buildtools/third_party/libc++abi/libc++abi.gyp \
--	   buildtools/third_party/libc++/libc++.gyp samples/samples.gyp \
-+GYPFILES = gypfiles/shim_headers.gypi gypfiles/features.gypi \
-+           gypfiles/standalone.gypi gypfiles/all.gyp \
-+	   gypfiles/mac/asan.gyp src/v8.gyp tools/parser-shell.gyp \
- 	   src/third_party/vtune/v8vtune.gyp src/d8.gyp
+-	   samples/samples.gyp src/third_party/vtune/v8vtune.gyp src/d8.gyp
++	   src/v8.gyp src/d8.gyp
  
  # If vtunejit=on, the v8vtune.gyp will be appended.
+ ifeq ($(vtunejit), on)
 diff --git a/gypfiles/all.gyp b/gypfiles/all.gyp
 index bc9d9650eb..96820a0ecc 100644
 --- a/gypfiles/all.gyp
@@ -83,5 +81,5 @@ index bc9d9650eb..96820a0ecc 100644
      }
    ]
 -- 
-2.13.3
+2.14.3
 

data/patches/0003-Use-the-fPIC-flag-for-the-static-library.patch

@@ -1,4 +1,4 @@
-From fe76837b00357250a01ad71c4cce4b7524dd765f Mon Sep 17 00:00:00 2001
+From 97bb118756e30cea60216d3e74ba352d76001637 Mon Sep 17 00:00:00 2001
 From: Petko Bordjukov <bordjukov@gmail.com>
 Date: Mon, 25 Jul 2016 00:05:47 +0300
 Subject: [PATCH 3/5] Use the -fPIC flag for the static library
@@ -8,10 +8,10 @@ Subject: [PATCH 3/5] Use the -fPIC flag for the static library
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi
-index 6a72a23cfb..fdf27226ad 100644
+index d0d00d3f67..f01bd48596 100644
 --- a/gypfiles/standalone.gypi
 +++ b/gypfiles/standalone.gypi
-@@ -800,7 +800,7 @@
+@@ -797,7 +797,7 @@
            [ 'visibility=="hidden" and v8_enable_backtrace==0', {
              'cflags': [ '-fvisibility=hidden' ],
            }],
@@ -21,5 +21,5 @@ index 6a72a23cfb..fdf27226ad 100644
            }],
            [ 'clang==0 and coverage==1', {
 -- 
-2.13.3
+2.14.3
 

data/patches/0004-Do-not-embed-debug-symbols-in-macOS-libraries.patch

@@ -1,4 +1,4 @@
-From 7b00cf7c2c13d4c528bccd3bc4a91426f4e35145 Mon Sep 17 00:00:00 2001
+From b06fb098489c375a4499fb6a62c92a32a0b282d8 Mon Sep 17 00:00:00 2001
 From: Jb Aviat <jb@sqreen.io>
 Date: Mon, 27 Feb 2017 11:14:42 +0200
 Subject: [PATCH 4/5] Do not embed debug symbols in macOS libraries
@@ -9,10 +9,10 @@ This lowers dramatically the produced binary size
  1 file changed, 1 insertion(+)
 
 diff --git a/gypfiles/standalone.gypi b/gypfiles/standalone.gypi
-index fdf27226ad..8c2972fe54 100644
+index f01bd48596..25ca6b8606 100644
 --- a/gypfiles/standalone.gypi
 +++ b/gypfiles/standalone.gypi
-@@ -1059,6 +1059,7 @@
+@@ -1056,6 +1056,7 @@
            'GCC_ENABLE_CPP_EXCEPTIONS': 'NO',        # -fno-exceptions
            'GCC_ENABLE_CPP_RTTI': 'NO',              # -fno-rtti
            'GCC_ENABLE_PASCAL_STRINGS': 'NO',        # No -mpascal-strings
@@ -21,5 +21,5 @@ index fdf27226ad..8c2972fe54 100644
            'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
            'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',      # -fvisibility=hidden
 -- 
-2.13.3
+2.14.3
 

data/patches/0005-avoid-constructor-inheritance-due-to-compilation-iss.patch

@@ -0,0 +1,81 @@
+From dae2970a6e2f4ac30a1deee21562ac00cce3794a Mon Sep 17 00:00:00 2001
+From: Tobias Tebbi <tebbi@chromium.org>
+Date: Tue, 10 Oct 2017 22:39:41 +0200
+Subject: [PATCH 5/5] avoid constructor inheritance due to compilation issues
+
+Constructor inheritance of a templated constructor is causing compilation issues for node.js:
+
+https: //github.com/nodejs/node/pull/15362#issue-257007421
+Change-Id: I7d099ff5a1a2fd5b19c11112ddef8fe824e509f7
+Reviewed-on: https://chromium-review.googlesource.com/707008
+Commit-Queue: Tobias Tebbi <tebbi@chromium.org>
+Commit-Queue: Benedikt Meurer <bmeurer@chromium.org>
+Reviewed-by: Benedikt Meurer <bmeurer@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#48445}
+---
+ src/compiler/common-operator.cc |  4 ++--
+ src/compiler/common-operator.h  | 12 ++++++++----
+ 2 files changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/src/compiler/common-operator.cc b/src/compiler/common-operator.cc
+index c48773920d..d92722f701 100644
+--- a/src/compiler/common-operator.cc
++++ b/src/compiler/common-operator.cc
+@@ -1255,7 +1255,7 @@ bool IsRestOf(Operator const* op) {
+   return OpParameter<bool>(op);
+ }
+ 
+-const Operator* CommonOperatorBuilder::ObjectState(int object_id,
++const Operator* CommonOperatorBuilder::ObjectState(uint32_t object_id,
+                                                    int pointer_slots) {
+   return new (zone()) Operator1<ObjectStateInfo>(  // --
+       IrOpcode::kObjectState, Operator::kPure,     // opcode
+@@ -1265,7 +1265,7 @@ const Operator* CommonOperatorBuilder::ObjectState(int object_id,
+ }
+ 
+ const Operator* CommonOperatorBuilder::TypedObjectState(
+-    int object_id, const ZoneVector<MachineType>* types) {
++    uint32_t object_id, const ZoneVector<MachineType>* types) {
+   return new (zone()) Operator1<TypedObjectStateInfo>(  // --
+       IrOpcode::kTypedObjectState, Operator::kPure,     // opcode
+       "TypedObjectState",                               // name
+diff --git a/src/compiler/common-operator.h b/src/compiler/common-operator.h
+index f7638a3cca..9dfb059518 100644
+--- a/src/compiler/common-operator.h
++++ b/src/compiler/common-operator.h
+@@ -125,7 +125,8 @@ V8_EXPORT_PRIVATE int ParameterIndexOf(const Operator* const);
+ const ParameterInfo& ParameterInfoOf(const Operator* const);
+ 
+ struct ObjectStateInfo final : std::pair<uint32_t, int> {
+-  using std::pair<uint32_t, int>::pair;
++  ObjectStateInfo(uint32_t object_id, int size)
++      : std::pair<uint32_t, int>(object_id, size) {}
+   uint32_t object_id() const { return first; }
+   int size() const { return second; }
+ };
+@@ -134,7 +135,10 @@ size_t hash_value(ObjectStateInfo const& p);
+ 
+ struct TypedObjectStateInfo final
+     : std::pair<uint32_t, const ZoneVector<MachineType>*> {
+-  using std::pair<uint32_t, const ZoneVector<MachineType>*>::pair;
++  TypedObjectStateInfo(uint32_t object_id,
++                       const ZoneVector<MachineType>* machine_types)
++      : std::pair<uint32_t, const ZoneVector<MachineType>*>(object_id,
++                                                            machine_types) {}
+   uint32_t object_id() const { return first; }
+   const ZoneVector<MachineType>* machine_types() const { return second; }
+ };
+@@ -385,8 +389,8 @@ class V8_EXPORT_PRIVATE CommonOperatorBuilder final
+                                    SparseInputMask bitmask);
+   const Operator* ArgumentsElementsState(bool is_rest);
+   const Operator* ArgumentsLengthState(bool is_rest);
+-  const Operator* ObjectState(int object_id, int pointer_slots);
+-  const Operator* TypedObjectState(int object_id,
++  const Operator* ObjectState(uint32_t object_id, int pointer_slots);
++  const Operator* TypedObjectState(uint32_t object_id,
+                                    const ZoneVector<MachineType>* types);
+   const Operator* FrameState(BailoutId bailout_id,
+                              OutputFrameStateCombine state_combine,
+-- 
+2.14.3
+

data/patches/9001-Arm64-Fix-host-architecture-detection.patch

@@ -0,0 +1,37 @@
+From f7b393110c0bc58f4fde7589397b5f931a18ea4b Mon Sep 17 00:00:00 2001
+From: Pierre Langlois <pierre.langlois@arm.com>
+Date: Tue, 07 Nov 2017 14:26:17 +0000
+Subject: [PATCH] Arm64: Fix host architecture detection
+
+This allows the install-sysroot.py script to run as a hook on an Arm64
+platform. This was tested in v8 and allows us to run `gclient sync` natively.
+
+Bug: v8:5075
+Change-Id: Ie2f11a5a6e30973be7ab4ef032abb8c3c7e9591b
+Reviewed-on: https://chromium-review.googlesource.com/756704
+Reviewed-by: John Budorick <jbudorick@chromium.org>
+Commit-Queue: John Budorick <jbudorick@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#514463}
+---
+
+diff --git a/build/detect_host_arch.py b/build/detect_host_arch.py
+index 8d6a1ba..0e491bc 100755
+--- a/build/detect_host_arch.py
++++ b/build/detect_host_arch.py
+@@ -21,6 +21,8 @@
+     host_arch = 'x64'
+   elif host_arch.startswith('arm'):
+     host_arch = 'arm'
++  elif host_arch.startswith('aarch64'):
++    host_arch = 'arm64'
+   elif host_arch.startswith('mips'):
+     host_arch = 'mips'
+   elif host_arch.startswith('ppc'):
+@@ -35,6 +37,8 @@
+   # the python binary.
+   if host_arch == 'x64' and platform.architecture()[0] == '32bit':
+     host_arch = 'ia32'
++  if host_arch == 'arm64' and platform.architecture()[0] == '32bit':
++    host_arch = 'arm'
+
+   return host_arch

data/vendor/depot_tools/.gitignore

@@ -44,6 +44,7 @@
 /win_toolchain/*.timestamps
 /win_toolchain/.vspro
 /win_toolchain/data.json
+/win_toolchain/vs_files.ciopfs
 
 # Ignore ctags/cscope index files
 /TAGS

data/vendor/depot_tools/OWNERS

@@ -8,7 +8,6 @@ jochen@chromium.org
 maruel@chromium.org
 nodir@chromium.org
 petermayo@chromium.org
-phajdan.jr@chromium.org
 tandrii@chromium.org
 
 per-file ninja*=thakis@chromium.org

data/vendor/depot_tools/auth.py

@@ -16,6 +16,7 @@ import os
 import socket
 import sys
 import threading
+import time
 import urllib
 import urlparse
 import webbrowser
@@ -102,6 +103,125 @@ class LoginRequiredError(AuthenticationError):
     super(LoginRequiredError, self).__init__(msg)
 
 
+class LuciContextAuthError(Exception):
+  """Raised on errors related to unsuccessful attempts to load LUCI_CONTEXT"""
+
+
+def get_luci_context_access_token():
+  """Returns a valid AccessToken from the local LUCI context auth server.
+
+  Adapted from
+  https://chromium.googlesource.com/infra/luci/luci-py/+/master/client/libs/luci_context/luci_context.py
+  See the link above for more details.
+
+  Returns:
+    AccessToken if LUCI_CONTEXT is present and attempt to load it is successful.
+    None if LUCI_CONTEXT is absent.
+
+  Raises:
+    LuciContextAuthError if the attempt to load LUCI_CONTEXT
+        and request its access token is unsuccessful.
+  """
+  return _get_luci_context_access_token(os.environ, datetime.datetime.utcnow())
+
+
+def _get_luci_context_access_token(env, now):
+  ctx_path = env.get('LUCI_CONTEXT')
+  if not ctx_path:
+    return None
+  ctx_path = ctx_path.decode(sys.getfilesystemencoding())
+  logging.debug('Loading LUCI_CONTEXT: %r', ctx_path)
+
+  def authErr(msg, *args):
+    error_msg = msg % args
+    ex = sys.exc_info()[1]
+    if not ex:
+      logging.error(error_msg)
+      raise LuciContextAuthError(error_msg)
+    logging.exception(error_msg)
+    raise LuciContextAuthError('%s: %s' % (error_msg, ex))
+
+  try:
+    loaded = _load_luci_context(ctx_path)
+  except (OSError, IOError, ValueError):
+    authErr('Failed to open, read or decode LUCI_CONTEXT')
+  try:
+    local_auth = loaded.get('local_auth')
+  except AttributeError:
+    authErr('LUCI_CONTEXT not in proper format')
+  # failed to grab local_auth from LUCI context
+  if not local_auth:
+    logging.debug('local_auth: no local auth found')
+    return None
+  try:
+    account_id = local_auth.get('default_account_id')
+    secret = local_auth.get('secret')
+    rpc_port = int(local_auth.get('rpc_port'))
+  except (AttributeError, ValueError):
+    authErr('local_auth: unexpected local auth format')
+
+  if not secret:
+    authErr('local_auth: no secret returned')
+  # if account_id not specified, LUCI_CONTEXT should not be picked up
+  if not account_id:
+    return None
+
+  logging.debug('local_auth: requesting an access token for account "%s"',
+      account_id)
+  http = httplib2.Http()
+  host = '127.0.0.1:%d' % rpc_port
+  resp, content = http.request(
+      uri='http://%s/rpc/LuciLocalAuthService.GetOAuthToken' % host,
+      method='POST',
+      body=json.dumps({
+        'account_id': account_id,
+        'scopes': OAUTH_SCOPES.split(' '),
+        'secret': secret,
+      }),
+      headers={'Content-Type': 'application/json'})
+  if resp.status != 200:
+    err = ('local_auth: Failed to grab access token from '
+           'LUCI context server with status %d: %r')
+    authErr(err, resp.status, content)
+  try:
+    token = json.loads(content)
+    error_code = token.get('error_code')
+    error_message = token.get('error_message')
+    access_token = token.get('access_token')
+    expiry = token.get('expiry')
+  except (AttributeError, ValueError):
+    authErr('local_auth: Unexpected access token response format')
+  if error_code:
+    authErr('local_auth: Error %d in retrieving access token: %s',
+        error_code, error_message)
+  if not access_token:
+    authErr('local_auth: No access token returned from LUCI context server')
+  expiry_dt = None
+  if expiry:
+    try:
+      expiry_dt = datetime.datetime.utcfromtimestamp(expiry)
+      logging.debug(
+        'local_auth: got an access token for '
+        'account "%s" that expires in %d sec',
+        account_id, (expiry_dt - now).total_seconds())
+    except (TypeError, ValueError):
+      authErr('Invalid expiry in returned token')
+  else:
+    logging.debug(
+        'local auth: got an access token for '
+        'account "%s" that does not expire',
+        account_id)
+  access_token = AccessToken(access_token, expiry_dt)
+  if _needs_refresh(access_token, now=now):
+    authErr('local_auth: the returned access token needs to be refreshed')
+  return access_token
+
+
+def _load_luci_context(ctx_path):
+  with open(ctx_path) as f:
+    return json.load(f)
+
+
 def make_auth_config(
     use_oauth2=None,
     save_cookies=None,
@@ -219,6 +339,9 @@ def get_authenticator_for_host(hostname, config):
 
   Returns:
     Authenticator object.
+
+  Raises:
+    AuthenticationError if hostname is invalid.
   """
   hostname = hostname.lower().rstrip('/')
   # Append some scheme, otherwise urlparse puts hostname into parsed.path.
@@ -303,23 +426,43 @@ class Authenticator(object):
     with self._lock:
       return bool(self._get_cached_credentials())
 
-  def get_access_token(self, force_refresh=False, allow_user_interaction=False):
+  def get_access_token(self, force_refresh=False, allow_user_interaction=False,
+                       use_local_auth=True):
     """Returns AccessToken, refreshing it if necessary.
 
     Args:
       force_refresh: forcefully refresh access token even if it is not expired.
       allow_user_interaction: True to enable blocking for user input if needed.
+      use_local_auth: default to local auth if needed.
 
     Raises:
       AuthenticationError on error or if authentication flow was interrupted.
       LoginRequiredError if user interaction is required, but
           allow_user_interaction is False.
     """
+    def get_loc_auth_tkn():
+      exi = sys.exc_info()
+      if not use_local_auth:
+        logging.error('Failed to create access token')
+        raise
+      try:
+        self._access_token = get_luci_context_access_token()
+        if not self._access_token:
+          logging.error('Failed to create access token')
+          raise
+        return self._access_token
+      except LuciContextAuthError:
+        logging.exception('Failed to use local auth')
+        raise exi[0], exi[1], exi[2]
+
     with self._lock:
       if force_refresh:
         logging.debug('Forcing access token refresh')
-        self._access_token = self._create_access_token(allow_user_interaction)
-        return self._access_token
+        try:
+          self._access_token = self._create_access_token(allow_user_interaction)
+          return self._access_token
+        except LoginRequiredError:
+          return get_loc_auth_tkn()
 
       # Load from on-disk cache on a first access.
       if not self._access_token:
@@ -331,7 +474,11 @@ class Authenticator(object):
         self._access_token = self._load_access_token()
         # Nope, still expired, need to run the refresh flow.
         if not self._access_token or _needs_refresh(self._access_token):
-          self._access_token = self._create_access_token(allow_user_interaction)
+          try:
+            self._access_token = self._create_access_token(
+                allow_user_interaction)
+          except LoginRequiredError:
+            get_loc_auth_tkn()
 
       return self._access_token
 
@@ -548,11 +695,12 @@ def _read_refresh_token_json(path):
         'Failed to read refresh token from %s: missing key %s' % (path, e))
 
 
-def _needs_refresh(access_token):
+def _needs_refresh(access_token, now=None):
   """True if AccessToken should be refreshed."""
   if access_token.expires_at is not None:
+    now = now or datetime.datetime.utcnow()
     # Allow 5 min of clock skew between client and backend.
-    now = datetime.datetime.utcnow() + datetime.timedelta(seconds=300)
+    now += datetime.timedelta(seconds=300)
     return now >= access_token.expires_at
   # Token without expiration time never expires.
   return False