Use copy.deepcopy instead of doing it manually.

Reviewers: EricWF

Reviewed By: EricWF

Subscribers: cfe-commits

Differential Revision: https://reviews.llvm.org/D29209

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@294350 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Albert
2017-02-07 21:04:19 +00:00
parent 426546ecec
commit 5a78d25b71
2 changed files with 3 additions and 14 deletions

View File

@@ -49,18 +49,6 @@ class CXXCompiler(object):
if self.type is None or self.version is None: if self.type is None or self.version is None:
self._initTypeAndVersion() self._initTypeAndVersion()
def copy(self):
new_cxx = CXXCompiler(
self.path, flags=self.flags, compile_flags=self.compile_flags,
link_flags=self.link_flags, warning_flags=self.warning_flags,
verify_supported=self.verify_supported,
verify_flags=self.verify_flags, use_verify=self.use_verify,
modules_flags=self.modules_flags, use_modules=self.use_modules,
use_ccache=self.use_ccache, use_warnings=self.use_warnings,
compile_env=self.compile_env, cxx_type=self.type,
cxx_version=self.version)
return new_cxx
def isVerifySupported(self): def isVerifySupported(self):
if self.verify_supported is None: if self.verify_supported is None:
self.verify_supported = self.hasCompileFlag(['-Xclang', self.verify_supported = self.hasCompileFlag(['-Xclang',

View File

@@ -7,6 +7,7 @@
# #
#===----------------------------------------------------------------------===## #===----------------------------------------------------------------------===##
import copy
import errno import errno
import os import os
import time import time
@@ -36,7 +37,7 @@ class LibcxxTestFormat(object):
def __init__(self, cxx, use_verify_for_fail, execute_external, def __init__(self, cxx, use_verify_for_fail, execute_external,
executor, exec_env): executor, exec_env):
self.cxx = cxx.copy() self.cxx = copy.deepcopy(cxx)
self.use_verify_for_fail = use_verify_for_fail self.use_verify_for_fail = use_verify_for_fail
self.execute_external = execute_external self.execute_external = execute_external
self.executor = executor self.executor = executor
@@ -115,7 +116,7 @@ class LibcxxTestFormat(object):
tmpBase) tmpBase)
script = lit.TestRunner.applySubstitutions(script, substitutions) script = lit.TestRunner.applySubstitutions(script, substitutions)
test_cxx = self.cxx.copy() test_cxx = copy.deepcopy(self.cxx)
if is_fail_test: if is_fail_test:
test_cxx.useCCache(False) test_cxx.useCCache(False)
test_cxx.useWarnings(False) test_cxx.useWarnings(False)