libv8 4.5.95.5 → 5.0.71.48.0beta2

data/patches/build-standalone-static-library.patch

@@ -0,0 +1,14 @@
+diff --git a/build/standalone.gypi b/build/standalone.gypi
+index a71ed95..308a7e3 100644
+--- a/build/standalone.gypi
++++ b/build/standalone.gypi
+@@ -476,6 +476,9 @@
+       }],  # fastbuild!=0
+     ],
+     'target_conditions': [
++      ['_type=="static_library"', {
++        'standalone_static_library': 1,
++      }],
+       ['v8_code == 0', {
+         'defines!': [
+           'DEBUG',

data/patches/disable-building-tests.patch

@@ -1,27 +1,65 @@
 diff --git a/Makefile b/Makefile
-index 9761265..80169b2 100644
+index 4fb6ee0..549ae58 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -248,8 +248,6 @@ NACL_ARCHES = nacl_ia32 nacl_x64
+@@ -251,11 +251,9 @@ NACL_ARCHES = nacl_ia32 nacl_x64
  GYPFILES = third_party/icu/icu.gypi third_party/icu/icu.gyp \
  	   build/shim_headers.gypi build/features.gypi build/standalone.gypi \
  	   build/toolchain.gypi build/all.gyp build/mac/asan.gyp \
--	   test/cctest/cctest.gyp \
+-	   test/cctest/cctest.gyp test/fuzzer/fuzzer.gyp \
 -	   test/unittests/unittests.gyp tools/gyp/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 \
+-	   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 \
++	   tools/gyp/v8.gyp tools/parser-shell.gyp \
++           buildtools/third_party/libc++abi/libc++abi.gyp \
++	   buildtools/third_party/libc++/libc++.gyp \
+ 	   src/third_party/vtune/v8vtune.gyp src/d8.gyp
+ 
+ # If vtunejit=on, the v8vtune.gyp will be appended.
 diff --git a/build/all.gyp b/build/all.gyp
-index 4aeb507..1ff2c7a 100644
+index feaf4fe..96820a0 100644
 --- a/build/all.gyp
 +++ b/build/all.gyp
-@@ -10,8 +10,6 @@
+@@ -8,11 +8,7 @@
+       'target_name': 'All',
+       'type': 'none',
        'dependencies': [
-         '../samples/samples.gyp:*',
+-        '../samples/samples.gyp:*',
          '../src/d8.gyp:d8',
 -        '../test/cctest/cctest.gyp:*',
+-        '../test/fuzzer/fuzzer.gyp:*',
 -        '../test/unittests/unittests.gyp:*',
        ],
        'conditions': [
          ['component!="shared_library"', {
-
+@@ -20,29 +16,6 @@
+             '../tools/parser-shell.gyp:parser-shell',
+           ],
+         }],
+-        ['test_isolation_mode != "noop"', {
+-          'dependencies': [
+-            '../test/bot_default.gyp:*',
+-            '../test/benchmarks/benchmarks.gyp:*',
+-            '../test/default.gyp:*',
+-            '../test/ignition.gyp:*',
+-            '../test/intl/intl.gyp:*',
+-            '../test/message/message.gyp:*',
+-            '../test/mjsunit/mjsunit.gyp:*',
+-            '../test/mozilla/mozilla.gyp:*',
+-            '../test/optimize_for_size.gyp:*',
+-            '../test/perf.gyp:*',
+-            '../test/preparser/preparser.gyp:*',
+-            '../test/simdjs/simdjs.gyp:*',
+-            '../test/test262/test262.gyp:*',
+-            '../test/webkit/webkit.gyp:*',
+-            '../tools/check-static-initializers.gyp:*',
+-            '../tools/gcmole/run_gcmole.gyp:*',
+-            '../tools/jsfunfuzz/jsfunfuzz.gyp:*',
+-            '../tools/run-deopt-fuzzer.gyp:*',
+-            '../tools/run-valgrind.gyp:*',
+-          ],
+-        }],
+       ]
+     }
+   ]

data/patches/fPIC-for-static.patch

@@ -1,8 +1,8 @@
 diff --git a/build/standalone.gypi b/build/standalone.gypi
-index 7670e5b..230518c 100644
+index 1252094..308a7e3 100644
 --- a/build/standalone.gypi
 +++ b/build/standalone.gypi
-@@ -205,7 +205,7 @@
+@@ -733,7 +733,7 @@
            [ 'visibility=="hidden" and v8_enable_backtrace==0', {
              'cflags': [ '-fvisibility=hidden' ],
            }],
@@ -10,4 +10,4 @@ index 7670e5b..230518c 100644
 +          [ 'component=="shared_library" or component=="static_library" and (v8_target_arch=="x64" or v8_target_arch=="arm64")', {
              'cflags': [ '-fPIC', ],
            }],
-         ],
+           [ 'coverage==1', {

data/release/x86-linux/Vagrantfile

@@ -13,7 +13,7 @@ Vagrant.configure(2) do |config|
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
   # https://atlas.hashicorp.com/boxcutter/boxes/debian80-i386
-  config.vm.box = "boxcutter/debian80-i386"
+  config.vm.box = "ubuntu/trusty32"
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
@@ -54,6 +54,12 @@ Vagrant.configure(2) do |config|
   #
   # View the documentation for the provider you are using for more
   # information on available options.
+  config.vm.provider :virtualbox do |vb|
+    vb.memory = "2048"
+    vb.customize ["modifyvm", :id, "--hwvirtex", "on"]
+    vb.customize ["modifyvm", :id, "--audio", "none"]
+    vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
+  end
 
   # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
   # such as FTP and Heroku are also available. See the documentation at
@@ -67,9 +73,7 @@ Vagrant.configure(2) do |config|
   # documentation for more information about their specific syntax and use.
   config.vm.provision "shell", inline: <<-SHELL
     sudo apt-get update
-    sudo apt-get install -y gcc-4.8 g++-4.8 build-essential git git-svn python ruby ruby-dev
-    sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.8
-    sudo update-alternatives --config gcc
+    sudo apt-get install -y build-essential git python ruby ruby-dev
     gem install bundler
   SHELL
 end

data/release/x86_64-freebsd10/Vagrantfile

@@ -0,0 +1,86 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure(2) do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://atlas.hashicorp.com/search.
+  config.vm.box = "freebsd/FreeBSD-10.3-RELEASE"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+  config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  config.vm.synced_folder ".", "/vagrant", nfs: true
+  config.vm.synced_folder "../..", "/libv8", nfs: true
+
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+  # Various settings as suggested by the FreeBSD community
+  config.ssh.shell = "sh"
+  config.vm.base_mac = "080027D14C66"
+  config.vm.provider :virtualbox do |vb|
+    vb.customize ["modifyvm", :id, "--hwvirtex", "on"]
+    vb.customize ["modifyvm", :id, "--audio", "none"]
+    vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
+    vb.customize ["modifyvm", :id, "--nictype2", "virtio"]
+  end
+
+  # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
+  # such as FTP and Heroku are also available. See the documentation at
+  # https://docs.vagrantup.com/v2/push/atlas.html for more information.
+  # config.push.define "atlas" do |push|
+  #   push.app = "YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME"
+  # end
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline: <<-SHELL
+  #   sudo apt-get update
+  #   sudo apt-get install -y apache2
+  # SHELL
+  config.vm.provision "shell", inline: <<-SHELL
+    pkg install -y bash gmake ruby rubygem-bundler git-subversion python2
+  SHELL
+end

data/release/x86_64-linux/Vagrantfile

@@ -13,7 +13,7 @@ Vagrant.configure(2) do |config|
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
   # https://atlas.hashicorp.com/quarkslab/boxes/debian-8.0-amd64
-  config.vm.box = "quarkslab/debian-8.0-amd64"
+  config.vm.box = "ubuntu/trusty64"
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
@@ -54,6 +54,12 @@ Vagrant.configure(2) do |config|
   #
   # View the documentation for the provider you are using for more
   # information on available options.
+  config.vm.provider :virtualbox do |vb|
+    vb.memory = "2048"
+    vb.customize ["modifyvm", :id, "--hwvirtex", "on"]
+    vb.customize ["modifyvm", :id, "--audio", "none"]
+    vb.customize ["modifyvm", :id, "--nictype1", "virtio"]
+  end
 
   # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies
   # such as FTP and Heroku are also available. See the documentation at
@@ -67,9 +73,7 @@ Vagrant.configure(2) do |config|
   # documentation for more information about their specific syntax and use.
   config.vm.provision "shell", inline: <<-SHELL
     sudo apt-get update
-    sudo apt-get install -y gcc-4.8 g++-4.8 build-essential git git-svn python ruby ruby-dev
-    sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.8
-    sudo update-alternatives --config gcc
+    sudo apt-get install -y build-essential git python ruby ruby-dev
     gem install bundler
   SHELL
 end

data/spec/compiler_spec.rb

@@ -6,35 +6,23 @@ module Libv8
     describe '::type_of' do
       it 'recognises correctly GCC' do
         stub_as_available 'c++', :gcc, '4.9.0'
-        expect(Compiler.available_compilers('c++').first).to be_a Compiler::GCC
+        expect(Compiler.type_of('c++').new('c++')).to be_a Compiler::GCC
 
         stub_as_available 'g++', :gcc, '4.2.1-freebsd'
-        expect(Compiler.available_compilers('g++').first).to be_a Compiler::GCC
+        expect(Compiler.type_of('g++').new('g++')).to be_a Compiler::GCC
       end
 
       it 'recognises correctly Clang' do
         stub_as_available 'c++', :clang, '3.4.1'
-        expect(Compiler.available_compilers('c++').first).to be_a Compiler::Clang
+        expect(Compiler.type_of('c++').new('c++')).to be_a Compiler::Clang
 
         stub_as_available 'freebsd-clang++', :clang, '3.3-freebsd'
-        expect(Compiler.available_compilers('freebsd-clang++').first).to be_a Compiler::Clang
+        expect(Compiler.type_of('freebsd-clang++').new('freebsd-clang++')).to be_a Compiler::Clang
       end
 
       it 'recognises correctly Apple\'s LLVM' do
         stub_as_available 'c++', :apple_llvm, '5.1'
-        expect(Compiler.available_compilers('c++').first).to be_a Compiler::AppleLLVM
-      end
-    end
-
-    describe '::available_compilers' do
-      it 'returns instances of the available compilers' do
-        stub_as_available 'c++', :clang, '3.4.1'
-        stub_as_unavailable 'g++'
-        stub_as_available 'clang++', :clang, '3.4.1'
-
-        available_compilers = Compiler.available_compilers 'c++', 'g++', 'clang++'
-        expect(available_compilers.map(&:class).count).to eq 2
-        available_compilers.all? { |compiler| expect(compiler).to be_a Compiler::Clang }
+        expect(Compiler.type_of('c++').new('c++')).to be_a Compiler::AppleLLVM
       end
     end
 
@@ -53,17 +41,5 @@ module Libv8
         end
       end
     end
-
-    describe '::available?' do
-      it 'returns true when the command is available' do
-        stub_as_available 'c++', :clang, '3.4.1'
-        expect(Compiler::available?('c++')).to be true
-      end
-
-      it 'returns false when the command cannot be found ' do
-        stub_as_unavailable 'c++'
-        expect(Compiler::available?('c++')).to be false
-      end
-    end
   end
 end

data/spec/support/compiler_helpers.rb

@@ -32,13 +32,11 @@ module CompilerHelpers
   end
 
   def stub_as_available(command, name, version)
-    stub_shell_command "which #{command} 2>&1", '', success_status
-    stub_shell_command "#{command} -v 2>&1", version_output_of(name, version), success_status
+    stub_shell_command "env LC_ALL=C LANG=C #{command} -v 2>&1", version_output_of(name, version), success_status
   end
 
   def stub_as_unavailable(command)
-    stub_shell_command "which #{command} 2>&1", '', failure_status
-    stub_shell_command(/^#{Regexp.escape(command)}/, '', failure_status)
+    stub_shell_command(/^env LC_ALL=C LANG=C #{Regexp.escape(command)}/, '', failure_status)
   end
 end
 

data/vendor/depot_tools/.gitignore

@@ -2,9 +2,11 @@
 *.pyc
 
 # Ignore the batch files produced by the Windows bootstrapping.
+/git-bash
 /git.bat
 /gitk.bat
 /pylint.bat
+/.pylint.d/
 /python
 /python.bat
 /ssh.bat
@@ -14,6 +16,7 @@
 /svnversion.bat
 /.codereview_upload_cookies
 /.gitconfig
+/.git_bleeding_edge
 /.git_cl_description_backup
 /.last_codereview_email_address
 /.ssh
@@ -26,7 +29,8 @@
 /svn_bin
 /external_bin
 /win_toolchain/vs2013_files
-/win_toolchain/.timestamps
+/win_toolchain/vs_files
+/win_toolchain/*.timestamps
 /win_toolchain/.vspro
 /win_toolchain/data.json
 
@@ -47,5 +51,13 @@
 /tests/svn/
 /tests/svnrepo/
 
-# Ignore virtualenv created during bootstrapping.
-/ENV
+# Ignore intermediate isolate files
+*.isolated
+*.isolated.state
+
+# Ignore recipe working directory.
+/.recipe_deps
+/infra/.recipe_deps
+
+# Ignore google AE downloaded for running testing only.
+testing_support/google_appengine

data/vendor/depot_tools/OWNERS

@@ -9,10 +9,10 @@ maruel@chromium.org
 nodir@chromium.org
 petermayo@chromium.org
 pgervais@chromium.org
-rogerta@chromium.org
+phajdan.jr@chromium.org
 stip@chromium.org
+tandrii@chromium.org
 
-per-file commit_queue*=akuegel@chromium.org
 per-file commit_queue*=phajdan.jr@chromium.org
 per-file commit_queue*=sergiyb@chromium.org
 per-file commit_queue*=tandrii@chromium.org

data/vendor/depot_tools/PRESUBMIT.py

@@ -16,14 +16,16 @@ def CommonChecks(input_api, output_api, tests_to_black_list):
   results = []
   results.extend(input_api.canned_checks.CheckOwners(input_api, output_api))
   black_list = list(input_api.DEFAULT_BLACK_LIST) + [
+      r'^\.recipe_deps[\/\\].*',
+      r'^infra[\/\\]\.recipe_deps[\/\\].*',
       r'^cpplint\.py$',
       r'^cpplint_chromium\.py$',
       r'^external_bin[\/\\].+',
       r'^python[0-9]*_bin[\/\\].+',
+      r'^recipes\.py$',
       r'^site-packages-py[0-9]\.[0-9][\/\\].+',
       r'^svn_bin[\/\\].+',
-      r'^testing_support[\/\\]_rietveld[\/\\].+',
-      r'^bootstrap[\/\\].+']
+      r'^testing_support[\/\\]_rietveld[\/\\].+']
   if os.path.exists('.gitignore'):
     with open('.gitignore') as fh:
       lines = [l.strip() for l in fh.readlines()]

data/vendor/depot_tools/WATCHLISTS

@@ -8,6 +8,9 @@
 {
 
   'WATCHLIST_DEFINITIONS': {
+    'git_cl.py': {
+      'filepath': 'git_cl.py',
+    },
     'this_file': {
       'filepath': '^WATCHLISTS$',
     },
@@ -18,6 +21,9 @@
 
   'WATCHLISTS': {
     'this_file': [],
+    'git_cl.py': [
+      'tandrii+omg_git_cl@chromium.org',
+    ],
     'depot_tools': [
       'dpranke+depot_tools@chromium.org',
       'iannucci+depot_tools@chromium.org',

data/vendor/depot_tools/apply_issue.py

@@ -5,7 +5,6 @@
 
 """Applies an issue from Rietveld.
 """
-
 import getpass
 import json
 import logging
@@ -15,7 +14,6 @@ import subprocess
 import sys
 import urllib2
 
-import breakpad  # pylint: disable=W0611
 
 import annotated_gclient
 import auth
@@ -28,6 +26,12 @@ import scm
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
+RETURN_CODE_OK               = 0
+RETURN_CODE_OTHER_FAILURE    = 1  # any other failure, likely patch apply one.
+RETURN_CODE_ARGPARSE_FAILURE = 2  # default in python.
+RETURN_CODE_INFRA_FAILURE    = 3  # considered as infra failure.
+
+
 class Unbuffered(object):
   """Disable buffering on a file object."""
   def __init__(self, stream):
@@ -41,9 +45,7 @@ class Unbuffered(object):
     return getattr(self.stream, attr)
 
 
-def main():
-  # TODO(pgervais): This function is way too long. Split.
-  sys.stdout = Unbuffered(sys.stdout)
+def _get_arg_parser():
   parser = optparse.OptionParser(description=sys.modules[__name__].__doc__)
   parser.add_option(
       '-v', '--verbose', action='count', default=0,
@@ -92,6 +94,13 @@ def main():
                     help='Don\'t run gclient sync on DEPS changes.')
 
   auth.add_auth_options(parser)
+  return parser
+
+
+def main():
+  # TODO(pgervais,tandrii): split this func, it's still too long.
+  sys.stdout = Unbuffered(sys.stdout)
+  parser = _get_arg_parser()
   options, args = parser.parse_args()
   auth_config = auth.extract_auth_config_from_options(options)
 
@@ -106,6 +115,7 @@ def main():
     print 'update.flag file found: bot_update has run and checkout is already '
     print 'in a consistent state. No actions will be performed in this step.'
     return 0
+
   logging.basicConfig(
       format='%(levelname)5s %(module)11s(%(lineno)4d): %(message)s',
       level=[logging.WARNING, logging.INFO, logging.DEBUG][
@@ -131,19 +141,23 @@ def main():
   # Always try un-authenticated first, except for OAuth2
   if options.private_key_file:
     # OAuth2 authentication
-    obj = rietveld.JwtOAuth2Rietveld(options.server,
+    rietveld_obj = rietveld.JwtOAuth2Rietveld(options.server,
                                      options.email,
                                      options.private_key_file)
-    properties = obj.get_issue_properties(options.issue, False)
+    try:
+      properties = rietveld_obj.get_issue_properties(options.issue, False)
+    except urllib2.URLError:
+      logging.exception('failed to fetch issue properties')
+      sys.exit(RETURN_CODE_INFRA_FAILURE)
   else:
     # Passing None as auth_config disables authentication.
-    obj = rietveld.Rietveld(options.server, None)
+    rietveld_obj = rietveld.Rietveld(options.server, None)
     properties = None
     # Bad except clauses order (HTTPError is an ancestor class of
     # ClientLoginError)
     # pylint: disable=E0701
     try:
-      properties = obj.get_issue_properties(options.issue, False)
+      properties = rietveld_obj.get_issue_properties(options.issue, False)
     except urllib2.HTTPError as e:
       if e.getcode() != 302:
         raise
@@ -151,43 +165,54 @@ def main():
         exit('FAIL: Login detected -- is issue private?')
       # TODO(maruel): A few 'Invalid username or password.' are printed first,
       # we should get rid of those.
+    except urllib2.URLError:
+      logging.exception('failed to fetch issue properties')
+      return RETURN_CODE_INFRA_FAILURE
     except rietveld.upload.ClientLoginError as e:
       # Fine, we'll do proper authentication.
       pass
     if properties is None:
-      obj = rietveld.Rietveld(options.server, auth_config, options.email)
+      rietveld_obj = rietveld.Rietveld(options.server, auth_config,
+                                       options.email)
       try:
-        properties = obj.get_issue_properties(options.issue, False)
+        properties = rietveld_obj.get_issue_properties(options.issue, False)
       except rietveld.upload.ClientLoginError as e:
         print('Accessing the issue requires proper credentials.')
-        return 1
+        return RETURN_CODE_OTHER_FAILURE
+      except urllib2.URLError:
+        logging.exception('failed to fetch issue properties')
+        return RETURN_CODE_INFRA_FAILURE
 
   if not options.patchset:
     options.patchset = properties['patchsets'][-1]
     print('No patchset specified. Using patchset %d' % options.patchset)
 
   issues_patchsets_to_apply = [(options.issue, options.patchset)]
+  try:
+    depends_on_info = rietveld_obj.get_depends_on_patchset(
+        options.issue, options.patchset)
+  except urllib2.URLError:
+    logging.exception('failed to fetch depends_on_patchset')
+    return RETURN_CODE_INFRA_FAILURE
 
-  # Temporary comment out the below while we try to figure out what to do with
-  # patchset dependencies on trybots.
-  # TODO(rmistry): Uncomment the below after a solution is found.
-  # depends_on_info = obj.get_depends_on_patchset(options.issue,
-  #                                               options.patchset)
-  # while depends_on_info:
-  #   depends_on_issue = int(depends_on_info['issue'])
-  #   depends_on_patchset = int(depends_on_info['patchset'])
-  #   try:
-  #     depends_on_info = obj.get_depends_on_patchset(depends_on_issue,
-  #                                                   depends_on_patchset)
-  #     issues_patchsets_to_apply.insert(0, (depends_on_issue,
-  #                                          depends_on_patchset))
-  #   except urllib2.HTTPError:
-  #     print ('The patchset that was marked as a dependency no longer '
-  #            'exists: %s/%d/#ps%d' % (
-  #                options.server, depends_on_issue, depends_on_patchset))
-  #     print 'Therefore it is likely that this patch will not apply cleanly.'
-  #     print
-  #     depends_on_info = None
+  while depends_on_info:
+    depends_on_issue = int(depends_on_info['issue'])
+    depends_on_patchset = int(depends_on_info['patchset'])
+    try:
+      depends_on_info = rietveld_obj.get_depends_on_patchset(depends_on_issue,
+                                                    depends_on_patchset)
+      issues_patchsets_to_apply.insert(0, (depends_on_issue,
+                                           depends_on_patchset))
+    except urllib2.HTTPError:
+      print ('The patchset that was marked as a dependency no longer '
+             'exists: %s/%d/#ps%d' % (
+                 options.server, depends_on_issue, depends_on_patchset))
+      print 'Therefore it is likely that this patch will not apply cleanly.'
+      print
+      depends_on_info = None
+    except urllib2.URLError:
+      logging.exception('failed to fetch dependency issue')
+      return RETURN_CODE_INFRA_FAILURE
 
   num_issues_patchsets_to_apply = len(issues_patchsets_to_apply)
   if num_issues_patchsets_to_apply > 1:
@@ -207,14 +232,21 @@ def main():
                                  patchset_to_apply)
     print('Downloading patch from %s' % issue_url)
     try:
-      patchset = obj.get_patch(issue_to_apply, patchset_to_apply)
-    except urllib2.HTTPError as e:
+      patchset = rietveld_obj.get_patch(issue_to_apply, patchset_to_apply)
+    except urllib2.HTTPError:
       print(
           'Failed to fetch the patch for issue %d, patchset %d.\n'
           'Try visiting %s/%d') % (
               issue_to_apply, patchset_to_apply,
               options.server, issue_to_apply)
-      return 1
+      # If we got this far, then this is likely missing patchset.
+      # Thus, it's not infra failure.
+      return RETURN_CODE_OTHER_FAILURE
+    except urllib2.URLError:
+      logging.exception(
+          'Failed to fetch the patch for issue %d, patchset %d',
+          issue_to_apply, patchset_to_apply)
+      return RETURN_CODE_INFRA_FAILURE
     if options.whitelist:
       patchset.patches = [patch for patch in patchset.patches
                           if patch.filename in options.whitelist]
@@ -250,7 +282,7 @@ def main():
       print(str(e))
       print('CWD=%s' % os.getcwd())
       print('Checkout path=%s' % scm_obj.project_path)
-      return 1
+      return RETURN_CODE_OTHER_FAILURE
 
   if ('DEPS' in map(os.path.basename, patchset.filenames)
       and not options.ignore_deps):
@@ -281,7 +313,7 @@ def main():
           annotated_gclient.emit_buildprops(revisions)
 
         return retcode
-  return 0
+  return RETURN_CODE_OK
 
 
 if __name__ == "__main__":
@@ -290,4 +322,4 @@ if __name__ == "__main__":
     sys.exit(main())
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
-    sys.exit(1)
+    sys.exit(RETURN_CODE_OTHER_FAILURE)