Hello community, here is the log from the commit of package creduce for openSUSE:Factory checked in at 2019-06-20 19:04:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/creduce (Old) and /work/SRC/openSUSE:Factory/.creduce.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "creduce" Thu Jun 20 19:04:23 2019 rev:18 rq:711116 version:2.10.0+git.20190513.fb91843 Changes: -------- --- /work/SRC/openSUSE:Factory/creduce/creduce.changes 2019-05-07 23:18:19.756838936 +0200 +++ /work/SRC/openSUSE:Factory/.creduce.new.4811/creduce.changes 2019-06-20 19:04:26.797589435 +0200 @@ -1,0 +2,20 @@ +Thu Jun 20 11:45:35 UTC 2019 - Martin Liška <mli...@suse.cz> + +- Fix typo in spec file. + +------------------------------------------------------------------- +Tue Jun 18 08:30:24 UTC 2019 - mli...@suse.cz + +- Update to version 2.10.0+git.20190513.fb91843: + * Remove mention of FreeBSD 10.4. + * Update copyright years. + * Use LLVM 8 toolchain in the Travis-CI build. + * Update copyright years. + * Require LLVM 8.0. + * Increment version number to 2.10.0. + * Set `BUILD_WITH_INSTALL_RPATH` property on target `clang_delta`. + * On the CMake-based build path, set rpath for `clang_delta`. + * Largely revert commit be741fc. + * update to LLVM 8.0 + +------------------------------------------------------------------- Old: ---- creduce-2.9.0+git.20190501.0fc288e.tar.xz New: ---- creduce-2.10.0+git.20190513.fb91843.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ creduce.spec ++++++ --- /var/tmp/diff_new_pack.hEwCYA/_old 2019-06-20 19:04:27.497590394 +0200 +++ /var/tmp/diff_new_pack.hEwCYA/_new 2019-06-20 19:04:27.501590400 +0200 @@ -17,7 +17,7 @@ Name: creduce -Version: 2.9.0+git.20190501.0fc288e +Version: 2.10.0+git.20190513.fb91843 Release: 0 Summary: C-Reduce, a C program reducer License: BSD-3-Clause @@ -25,12 +25,12 @@ Url: https://github.com/csmith-project/creduce Source: %{name}-%{version}.tar.xz BuildRequires: astyle -BuildRequires: clang7-devel +BuildRequires: clang8-devel BuildRequires: delta BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: indent -BuildRequires: llvm7-devel +BuildRequires: llvm8-devel BuildRequires: ncurses-devel BuildRequires: perl-Benchmark-Timer BuildRequires: perl-Exporter-Lite @@ -40,10 +40,10 @@ BuildRequires: perl-Term-ReadKey BuildRequires: zlib-devel Requires: astyle -Requires: clang7-devel +Requires: clang8-devel Requires: delta Requires: indent -Requires: llvm7-devel +Requires: llvm8-devel Requires: perl-Benchmark-Timer Requires: perl-Exporter-Lite Requires: perl-File-Which ++++++ _service ++++++ --- /var/tmp/diff_new_pack.hEwCYA/_old 2019-06-20 19:04:27.533590444 +0200 +++ /var/tmp/diff_new_pack.hEwCYA/_new 2019-06-20 19:04:27.533590444 +0200 @@ -4,8 +4,8 @@ <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">creduce</param> - <param name="versionformat">2.9.0+git.%cd.%h</param> - <param name="revision">0fc288e1958a7c38c74ef85803f0e3b79f904a73</param> + <param name="versionformat">2.10.0+git.%cd.%h</param> + <param name="revision">fb91843c547794f165e5764a003166191e6c6643</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> ++++++ creduce-2.9.0+git.20190501.0fc288e.tar.xz -> creduce-2.10.0+git.20190513.fb91843.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/.travis.yml new/creduce-2.10.0+git.20190513.fb91843/.travis.yml --- old/creduce-2.9.0+git.20190501.0fc288e/.travis.yml 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/.travis.yml 2019-05-13 23:17:30.000000000 +0200 @@ -17,9 +17,9 @@ - sudo scripts/travis_deps.sh script: > - CXX=/usr/lib/llvm-7/bin/clang++ - CC=/usr/lib/llvm-7/bin/clang - ./configure --with-llvm=/usr/lib/llvm-7 && + CXX=/usr/lib/llvm-8/bin/clang++ + CC=/usr/lib/llvm-8/bin/clang + ./configure --with-llvm=/usr/lib/llvm-8 && make -j2 && make check diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/CMakeLists.txt new/creduce-2.10.0+git.20190513.fb91843/CMakeLists.txt --- old/creduce-2.9.0+git.20190501.0fc288e/CMakeLists.txt 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/CMakeLists.txt 2019-05-13 23:17:30.000000000 +0200 @@ -26,8 +26,8 @@ find_package(LLVM REQUIRED CONFIG NO_CMAKE_BUILDS_PATH) message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") message(STATUS "Using LLVMConfig.cmake in ${LLVM_DIR}") -if (${LLVM_PACKAGE_VERSION} VERSION_LESS "7.0") - message(FATAL_ERROR "C-Reduce requires LLVM 7.0 or later") +if (${LLVM_PACKAGE_VERSION} VERSION_LESS "8.0") + message(FATAL_ERROR "C-Reduce requires LLVM 8.0 or later") endif() # # Do this here, too, just to keep it with the LLVM check above. @@ -90,11 +90,11 @@ set(creduce_PACKAGE "creduce") set(creduce_PACKAGE_BUGREPORT "creduce-b...@flux.utah.edu") set(creduce_PACKAGE_NAME "creduce") -set(creduce_PACKAGE_STRING "creduce 2.9.0") +set(creduce_PACKAGE_STRING "creduce 2.10.0") set(creduce_PACKAGE_TARNAME "creduce") set(creduce_PACKAGE_URL "http://embed.cs.utah.edu/creduce/") -set(creduce_PACKAGE_VERSION "2.9.0") -set(creduce_VERSION "2.9.0") +set(creduce_PACKAGE_VERSION "2.10.0") +set(creduce_VERSION "2.10.0") # FIXME: Should be determined automatically. set(YYTEXT_POINTER 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/INSTALL.md new/creduce-2.10.0+git.20190513.fb91843/INSTALL.md --- old/creduce-2.9.0+git.20190501.0fc288e/INSTALL.md 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/INSTALL.md 2019-05-13 23:17:30.000000000 +0200 @@ -33,11 +33,11 @@ On OS X, [Perlbrew](http://perlbrew.pl/) provides an easy and flexible way to get Perl and Perl modules installed -On FreeBSD 10.4 and 11.2, the prerequisites can be installed like this: +On FreeBSD 11.2, the prerequisites can be installed like this: ``` sudo pkg install \ - llvm70 flex p5-Exporter-Lite p5-File-Which p5-Getopt-Tabular p5-Regexp-Common + llvm80 flex p5-Exporter-Lite p5-File-Which p5-Getopt-Tabular p5-Regexp-Common ``` Otherwise, install these packages either manually or using the package @@ -45,7 +45,7 @@ * [Flex](http://flex.sourceforge.net/) -* [LLVM/Clang 7.0.0](http://llvm.org/releases/download.html#7.0.0) +* [LLVM/Clang 8.0.0](http://llvm.org/releases/download.html#8.0.0) (No need to compile it: the appropriate "pre-built binaries" package is all you need. If you use one of the binary packages, you may need to install additional packages that the binary package depends on. @@ -78,7 +78,7 @@ cpan -i Term::ReadKey ``` -On FreeBSD 10.4 and 11.2: +On FreeBSD 11.2: ``` sudo pkg install p5-Term-ReadKey diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/AggregateToScalar.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/AggregateToScalar.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/AggregateToScalar.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/AggregateToScalar.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2016, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -212,7 +212,7 @@ return addTmpVar(RefE, VarName, NULL); std::string InitStr; - if (InitE->getLocStart().isInvalid()) { + if (InitE->getBeginLoc().isInvalid()) { const Type *ET = InitE->getType().getTypePtr(); if (ET->isIntegerType() || ET->isPointerType()) InitStr = "0"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ClassTemplateToClass.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ClassTemplateToClass.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ClassTemplateToClass.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ClassTemplateToClass.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2014, 2015, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2014, 2015, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -247,7 +247,7 @@ E = TheClassTemplateDecl->redecls_end(); I != E; ++I) { const TemplateParameterList *TPList = (*I)->getTemplateParameters(); - SourceLocation LocStart = (*I)->getLocStart(); + SourceLocation LocStart = (*I)->getBeginLoc(); removeTemplateAndParameter(LocStart, TPList); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/CommonRenameClassRewriteVisitor.h new/creduce-2.10.0+git.20190513.fb91843/clang_delta/CommonRenameClassRewriteVisitor.h --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/CommonRenameClassRewriteVisitor.h 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/CommonRenameClassRewriteVisitor.h 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013 The University of Utah +// Copyright (c) 2012, 2013, 2018, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -148,7 +148,7 @@ if (!TyInfo) return true; TypeLoc TyLoc = TyInfo->getTypeLoc(); - SourceLocation LocStart = TyLoc.getLocStart(); + SourceLocation LocStart = TyLoc.getBeginLoc(); TransAssert(LocStart.isValid() && "Invalid Location!"); TheRewriter->ReplaceText(LocStart, CXXRD->getNameAsString().size(), Name); } @@ -267,7 +267,7 @@ std::string Name; if (getNewName(CXXRD, Name)) { - SourceLocation LocStart = TyLoc.getLocStart(); + SourceLocation LocStart = TyLoc.getBeginLoc(); TransAssert(LocStart.isValid() && "Invalid Location!"); TheRewriter->ReplaceText(LocStart, CXXRD->getNameAsString().size(), Name); @@ -313,7 +313,7 @@ // Avoid duplicated rewrites to Decls from the same DeclGroup, e.g., // struct S s1, s2 - SourceLocation LocStart = RTLoc.getLocStart(); + SourceLocation LocStart = RTLoc.getBeginLoc(); void *LocPtr = LocStart.getPtrEncoding(); if (VisitedLocs.count(LocPtr)) return true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/EmptyStructToInt.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/EmptyStructToInt.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/EmptyStructToInt.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/EmptyStructToInt.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -113,7 +113,7 @@ const RecordDecl *RD = RTLoc.getDecl(); if (RD->getCanonicalDecl() == ConsumerInstance->TheRecordDecl) { - SourceLocation LocStart = RTLoc.getLocStart(); + SourceLocation LocStart = RTLoc.getBeginLoc(); void *LocPtr = LocStart.getPtrEncoding(); if (ConsumerInstance->VisitedLocs.count(LocPtr)) return true; @@ -147,11 +147,11 @@ return true; } - SourceLocation StartLoc = Loc.getLocStart(); + SourceLocation StartLoc = Loc.getBeginLoc(); if (StartLoc.isInvalid()) return true; TypeLoc TyLoc = Loc.getNamedTypeLoc(); - SourceLocation EndLoc = TyLoc.getLocStart(); + SourceLocation EndLoc = TyLoc.getBeginLoc(); if (EndLoc.isInvalid()) return true; EndLoc = EndLoc.getLocWithOffset(-1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ExpressionDetector.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ExpressionDetector.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ExpressionDetector.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ExpressionDetector.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -672,7 +672,7 @@ void ExpressionDetector::doRewrite() { - SourceLocation LocStart = TheStmt->getLocStart(); + SourceLocation LocStart = TheStmt->getBeginLoc(); if (shouldAddFunctionDecl(LocStart)) { SourceLocation Loc = SrcManager->getLocForStartOfFile(SrcManager->getMainFileID()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/InstantiateTemplateParam.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/InstantiateTemplateParam.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/InstantiateTemplateParam.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/InstantiateTemplateParam.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -147,7 +147,7 @@ // the "typedef typename T2 ..." is treated as // typedef typename T2::template T2::C<int>::other type; // where the second T2 is injected by Clang - void *Ptr = Loc.getLocStart().getPtrEncoding(); + void *Ptr = Loc.getBeginLoc().getPtrEncoding(); if (ConsumerInstance->VisitedLocs.count(Ptr)) return true; ConsumerInstance->VisitedLocs.insert(Ptr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/InstantiateTemplateTypeParamToInt.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/InstantiateTemplateTypeParamToInt.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/InstantiateTemplateTypeParamToInt.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/InstantiateTemplateTypeParamToInt.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -184,7 +184,7 @@ if (D != ConsumerInstance->TheParameter) return true; - void *Ptr = Loc.getLocStart().getPtrEncoding(); + void *Ptr = Loc.getBeginLoc().getPtrEncoding(); if (ConsumerInstance->VisitedLocs.count(Ptr)) return true; ConsumerInstance->VisitedLocs.insert(Ptr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/LocalToGlobal.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/LocalToGlobal.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/LocalToGlobal.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/LocalToGlobal.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2016, 2017, 2018 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2016, 2017, 2018, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -217,7 +217,7 @@ for (DeclContext* DC = FD; DC; DC = DC->getParent()) { if (DC->getParent() && DC->getParent()->isTranslationUnit()) { - TheRewriter.InsertTextBefore(cast<Decl>(DC)->getLocStart(), GlobalVarStr); + TheRewriter.InsertTextBefore(cast<Decl>(DC)->getBeginLoc(), GlobalVarStr); return true; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReduceArrayDim.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReduceArrayDim.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReduceArrayDim.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReduceArrayDim.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2017, 2018, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -249,9 +249,10 @@ if (const DependentSizedArrayType *DepArrayTy = dyn_cast<DependentSizedArrayType>(ATy)) { const Expr *E = DepArrayTy->getSizeExpr(); - llvm::APSInt Result; + Expr::EvalResult Result; if (E->EvaluateAsInt(Result, *Context)) { - return (unsigned)(*Result.getRawData()); + llvm::APSInt IVal = Result.Val.getInt(); + return (unsigned)(*IVal.getRawData()); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReduceArrayDim.h new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReduceArrayDim.h --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReduceArrayDim.h 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReduceArrayDim.h 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012 The University of Utah +// Copyright (c) 2012, 2018 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReduceArraySize.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReduceArraySize.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReduceArraySize.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReduceArraySize.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2014, 2015, 2017 The University of Utah +// Copyright (c) 2012, 2014, 2015, 2017, 2018 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReducePointerLevel.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReducePointerLevel.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReducePointerLevel.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReducePointerLevel.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -947,7 +947,7 @@ { std::string ES; RewriteHelper->getExprString(E, ES); - SourceLocation LocStart = E->getLocStart(); + SourceLocation LocStart = E->getBeginLoc(); size_t ArrowPos = ES.find("->"); TransAssert((ArrowPos != std::string::npos) && "Cannot find Arrow!"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveBaseClass.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveBaseClass.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveBaseClass.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveBaseClass.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2018 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveEnumMemberValue.h new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveEnumMemberValue.h --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveEnumMemberValue.h 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveEnumMemberValue.h 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012 The University of Utah +// Copyright (c) 2012, 2018 The University of Utah // Copyright (c) 2012 Konstantin Tokarev <annu...@yandex.ru> // All rights reserved. // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveNamespace.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveNamespace.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveNamespace.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveNamespace.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2016, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -352,7 +352,7 @@ isa<EnumConstantDecl>(OrigDecl)) { std::string Name; if (ConsumerInstance->getNewName(OrigDecl, Name)) { - ConsumerInstance->TheRewriter.ReplaceText(DRE->getLocStart(), + ConsumerInstance->TheRewriter.ReplaceText(DRE->getBeginLoc(), OrigDecl->getNameAsString().size(), Name); } } @@ -436,7 +436,7 @@ if (!TyInfo) return true; TypeLoc TyLoc = TyInfo->getTypeLoc(); - SourceLocation LocStart = TyLoc.getLocStart(); + SourceLocation LocStart = TyLoc.getBeginLoc(); TransAssert(LocStart.isValid() && "Invalid Location!"); ConsumerInstance->TheRewriter.ReplaceText( LocStart, CXXRD->getNameAsString().size(), Name); @@ -494,7 +494,7 @@ std::string Name; if (ConsumerInstance->getNewName(CXXRD, Name)) { - SourceLocation LocStart = TyLoc.getLocStart(); + SourceLocation LocStart = TyLoc.getBeginLoc(); TransAssert(LocStart.isValid() && "Invalid Location!"); ConsumerInstance->TheRewriter.ReplaceText( @@ -509,7 +509,7 @@ std::string Name; if (ConsumerInstance->getNewName(D, Name)) { - SourceLocation LocStart = TyLoc.getLocStart(); + SourceLocation LocStart = TyLoc.getBeginLoc(); ConsumerInstance->TheRewriter.ReplaceText( LocStart, D->getNameAsString().size(), Name); } @@ -522,7 +522,7 @@ std::string Name; if (ConsumerInstance->getNewName(D, Name)) { - SourceLocation LocStart = TyLoc.getLocStart(); + SourceLocation LocStart = TyLoc.getBeginLoc(); ConsumerInstance->TheRewriter.ReplaceText( LocStart, D->getNameAsString().size(), Name); } @@ -1006,7 +1006,7 @@ TheRewriter.RemoveText(StartLoc, 1); // Then remove name and the left brace - StartLoc = ND->getLocStart(); + StartLoc = ND->getBeginLoc(); TransAssert(StartLoc.isValid() && "Invalid Namespace LocStart!"); const char *StartBuf = SrcManager->getCharacterData(StartLoc); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveNestedFunction.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveNestedFunction.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveNestedFunction.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveNestedFunction.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2014, 2015, 2016 The University of Utah +// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2018, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -233,7 +233,7 @@ // Otherwise, we would end up with assertion failure, because we // modify the same location twice (through addnewAssignStmtBefore // and replaceExpr. - if (TheStmt->getLocStart() == TheCallExpr->getLocStart()) { + if (TheStmt->getBeginLoc() == TheCallExpr->getBeginLoc()) { std::string ExprStr; RewriteHelper->getExprString(TheCallExpr, ExprStr); VarStr += " = " + ExprStr + ";\n" + TmpVarName; @@ -306,7 +306,7 @@ if (const UnresolvedMemberExpr *UM = dyn_cast<UnresolvedMemberExpr>(E)) { DeclarationName DName = UM->getMemberName(); - CXXRecordDecl *CXXRD = UM->getNamingClass(); + const CXXRecordDecl *CXXRD = UM->getNamingClass(); DeclContextSet VisitedCtxs; const FunctionDecl *FD = lookupFunctionDecl(DName, CXXRD, VisitedCtxs); // FIXME: try to resolve FD here @@ -318,14 +318,14 @@ if (const CXXTemporaryObjectExpr *CXXTE = dyn_cast<CXXTemporaryObjectExpr>(E)) { const CXXConstructorDecl *CXXCtor = CXXTE->getConstructor(); - QT = CXXCtor->getThisType(ASTCtx); + QT = CXXCtor->getThisType(); return getNewTmpVariable(QT, VarStr); } if (const CXXTemporaryObjectExpr *CXXTE = dyn_cast<CXXTemporaryObjectExpr>(E)) { const CXXConstructorDecl *CXXCtor = CXXTE->getConstructor(); - QT = CXXCtor->getThisType(ASTCtx); + QT = CXXCtor->getThisType(); return getNewTmpVariable(QT, VarStr); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveNestedFunction.h new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveNestedFunction.h --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveNestedFunction.h 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveNestedFunction.h 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2014, 2016 The University of Utah +// Copyright (c) 2012, 2014, 2016, 2018 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveUnusedEnumMember.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveUnusedEnumMember.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveUnusedEnumMember.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveUnusedEnumMember.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -97,12 +97,12 @@ void RemoveUnusedEnumMember::removeEnumConstantDecl() { - SourceLocation StartLoc = (*TheEnumIterator)->getLocStart(); + SourceLocation StartLoc = (*TheEnumIterator)->getBeginLoc(); if (StartLoc.isMacroID()) { CharSourceRange Range = SrcManager->getExpansionRange(StartLoc); StartLoc = Range.getBegin(); } - SourceLocation EndLoc = (*TheEnumIterator)->getLocEnd(); + SourceLocation EndLoc = (*TheEnumIterator)->getEndLoc(); if (EndLoc.isMacroID()) { CharSourceRange Range = SrcManager->getExpansionRange(EndLoc); EndLoc = Range.getEnd(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveUnusedEnumMember.h new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveUnusedEnumMember.h --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveUnusedEnumMember.h 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveUnusedEnumMember.h 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2015 The University of Utah +// Copyright (c) 2012, 2015, 2018 The University of Utah // Copyright (c) 2012 Konstantin Tokarev <annu...@yandex.ru> // All rights reserved. // diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveUnusedFunction.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveUnusedFunction.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveUnusedFunction.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveUnusedFunction.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -387,19 +387,19 @@ SourceLocation RemoveUnusedFunction::getFunctionOuterLocStart( const FunctionDecl *FD) { - SourceLocation LocStart = FD->getLocStart(); + SourceLocation LocStart = FD->getBeginLoc(); bool RecordLoc = false; // check if FD is from a function template if (FunctionTemplateDecl *FTD = FD->getDescribedFunctionTemplate()) { - // get FTD->getLocStart() only if it is less than FD->getLocStart, + // get FTD->getBeginLoc() only if it is less than FD->getBeginLoc, // for example, in the code below: // template <typename T> struct S {template <typename T1> void foo();}; // template<typename T> template<typename T1> void S<T>::foo() { } // where - // FTD->getLocStart() points to the begining of "template<typename T1>" + // FTD->getBeginLoc() points to the begining of "template<typename T1>" if (hasValidOuterLocStart(FTD, FD)) { - LocStart = FTD->getLocStart(); + LocStart = FTD->getBeginLoc(); RecordLoc = true; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveUnusedOuterClass.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveUnusedOuterClass.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RemoveUnusedOuterClass.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RemoveUnusedOuterClass.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2016, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -122,7 +122,7 @@ void RemoveUnusedOuterClass::removeOuterClass() { TransAssert(TheCXXRDDef && "NULL Base CXXRD!"); - SourceLocation LocStart = TheCXXRDDef->getLocStart(); + SourceLocation LocStart = TheCXXRDDef->getBeginLoc(); SourceLocation LocEnd = RewriteHelper->getEndLocationUntil(LocStart, '{'); TransAssert(LocEnd.isValid() && "Invalid Location!"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RenameCXXMethod.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RenameCXXMethod.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RenameCXXMethod.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RenameCXXMethod.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -252,7 +252,7 @@ &QualLoc, MD, NewName); } else { - ConsumerInstance->TheRewriter.ReplaceText(DRE->getLocStart(), + ConsumerInstance->TheRewriter.ReplaceText(DRE->getBeginLoc(), MD->getNameAsString().size(), NewName); } @@ -534,7 +534,8 @@ dyn_cast<CXXConversionDecl>(MD)) return true; - if (MD->isUsualDeallocationFunction() || + SmallVector<const FunctionDecl*, 4> PreventedBy; + if (MD->isUsualDeallocationFunction(PreventedBy) || MD->isCopyAssignmentOperator() || MD->isMoveAssignmentOperator() || MD->isLambdaStaticInvoker() || diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RenameClass.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RenameClass.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RenameClass.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RenameClass.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2016, 2017, 2018 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RenameFun.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RenameFun.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RenameFun.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RenameFun.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2016, 2017, 2018 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2016, 2017, 2018, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -145,7 +145,7 @@ TransAssert((I != ConsumerInstance->FunToNameMap.end()) && "Cannot find FunctionDecl!"); - ConsumerInstance->TheRewriter.ReplaceText(DRE->getLocStart(), + ConsumerInstance->TheRewriter.ReplaceText(DRE->getBeginLoc(), FD->getNameAsString().size(), (*I).second); return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReplaceCallExpr.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReplaceCallExpr.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReplaceCallExpr.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReplaceCallExpr.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -538,7 +538,7 @@ I = ParmRefToStrMap.begin(), E = ParmRefToStrMap.end(); I != E; ++I) { const DeclRefExpr *ParmRef = (*I).first; - SourceLocation ParmRefLocStart = ParmRef->getLocStart(); + SourceLocation ParmRefLocStart = ParmRef->getBeginLoc(); const char *ParmRefStartBuf = SrcManager->getCharacterData(ParmRefLocStart); @@ -551,7 +551,7 @@ void ReplaceCallExpr::replaceParmRefs(std::string &RetStr, const Expr *RetE, llvm::DenseMap<const DeclRefExpr *, std::string> &ParmRefToStrMap) { - SourceLocation StartLoc = RetE->getLocStart(); + SourceLocation StartLoc = RetE->getBeginLoc(); const char *StartBuf = SrcManager->getCharacterData(StartLoc); std::vector< std::pair<const DeclRefExpr *, int> > SortedParmRefs; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReplaceDependentTypedef.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReplaceDependentTypedef.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReplaceDependentTypedef.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReplaceDependentTypedef.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -127,7 +127,7 @@ void ReplaceDependentTypedef::handleOneTypedefDecl(const TypedefDecl *D) { - if (isInIncludedFile(D) || D->getLocStart().isInvalid()) + if (isInIncludedFile(D) || D->getBeginLoc().isInvalid()) return; if (!isValidType(D->getUnderlyingType())) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReplaceDerivedClass.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReplaceDerivedClass.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReplaceDerivedClass.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReplaceDerivedClass.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2017, 2018 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReplaceFunctionDefWithDecl.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReplaceFunctionDefWithDecl.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReplaceFunctionDefWithDecl.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReplaceFunctionDefWithDecl.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -323,7 +323,7 @@ const Stmt *Body = FD->getBody(); if (!Body) return false; - return SrcManager->isMacroBodyExpansion(Body->getLocStart()); + return SrcManager->isMacroBodyExpansion(Body->getBeginLoc()); } void ReplaceFunctionDefWithDecl::addOneFunctionDef(const FunctionDecl *FD) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReplaceOneLevelTypedefType.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReplaceOneLevelTypedefType.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReplaceOneLevelTypedefType.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReplaceOneLevelTypedefType.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -123,7 +123,7 @@ return; const TypedefType *TdefTy = TLoc.getTypePtr(); const TypedefDecl *TdefD = dyn_cast<TypedefDecl>(TdefTy->getDecl()); - if (!TdefD || TdefD->getLocStart().isInvalid()) + if (!TdefD || TdefD->getBeginLoc().isInvalid()) return; const TypedefDecl *CanonicalD = dyn_cast<TypedefDecl>(TdefD->getCanonicalDecl()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReplaceSimpleTypedef.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReplaceSimpleTypedef.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReplaceSimpleTypedef.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReplaceSimpleTypedef.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -85,7 +85,7 @@ const TypedefType *TdefTy = Loc.getTypePtr(); const TypedefDecl *TdefD = dyn_cast<TypedefDecl>(TdefTy->getDecl()); - if (!TdefD || TdefD->getLocStart().isInvalid()) + if (!TdefD || TdefD->getBeginLoc().isInvalid()) return true; if (dyn_cast<TypedefDecl>(TdefD->getCanonicalDecl()) == @@ -203,10 +203,10 @@ void ReplaceSimpleTypedef::handleOneTypedefDecl(const TypedefDecl *CanonicalD) { // omit some typedefs injected by Clang - if (CanonicalD->getLocStart().isInvalid()) + if (CanonicalD->getBeginLoc().isInvalid()) return; - FullSourceLoc FullLoc = Context->getFullLoc(CanonicalD->getLocStart()); + FullSourceLoc FullLoc = Context->getFullLoc(CanonicalD->getBeginLoc()); if (FullLoc.isInSystemHeader()) return; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReplaceUndefinedFunction.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReplaceUndefinedFunction.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/ReplaceUndefinedFunction.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/ReplaceUndefinedFunction.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -90,7 +90,7 @@ return true; if (FD->getCanonicalDecl() == ConsumerInstance->ReplacedFunctionDecl) { - ConsumerInstance->TheRewriter.ReplaceText(CE->getLocStart(), + ConsumerInstance->TheRewriter.ReplaceText(CE->getBeginLoc(), ConsumerInstance->ReplacedFunctionDecl->getNameAsString().size(), ConsumerInstance->ReplacingFunctionDecl->getNameAsString()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RewriteUtils.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RewriteUtils.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/RewriteUtils.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/RewriteUtils.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2018 The University of Utah +// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -455,7 +455,7 @@ NextTL = NextTL.getNextTypeLoc(); } - return VarTypeLoc.getLocStart(); + return VarTypeLoc.getBeginLoc(); } SourceLocation RewriteUtils::getVarDeclTypeLocEnd(const VarDecl *VD) @@ -705,7 +705,7 @@ std::string RewriteUtils::getStmtIndentString(Stmt *S, SourceManager *SrcManager) { - SourceLocation StmtStartLoc = S->getLocStart(); + SourceLocation StmtStartLoc = S->getBeginLoc(); if (StmtStartLoc.isMacroID()) { StmtStartLoc = SrcManager->getFileLoc(StmtStartLoc); @@ -748,7 +748,7 @@ IndentStr = getStmtIndentString((*I), SrcManager); std::string NewVarStr = "\n" + IndentStr + VarStr; - SourceLocation StartLoc = Body->getLocStart(); + SourceLocation StartLoc = Body->getBeginLoc(); return !(TheRewriter->InsertTextAfterToken(StartLoc, NewVarStr)); } @@ -776,7 +776,7 @@ return false; } - SourceLocation StmtLocStart = BeforeStmt->getLocStart(); + SourceLocation StmtLocStart = BeforeStmt->getBeginLoc(); if (StmtLocStart.isMacroID()) { StmtLocStart = SrcManager->getFileLoc(StmtLocStart); } @@ -842,7 +842,7 @@ std::string IndentedStr; indentAfterNewLine(NewStr, IndentedStr, IndentStr); - return !(TheRewriter->InsertText(S->getLocStart(), + return !(TheRewriter->InsertText(S->getBeginLoc(), IndentedStr, /*InsertAfter=*/false)); } @@ -1164,7 +1164,7 @@ SourceLocation LastEndLoc = getEndLocationUntil(LastVarRange, ';'); getStringBetweenLocs(Str, TypeLocEnd, LastEndLoc); - SourceLocation StartLoc = FirstVD->getLocStart(); + SourceLocation StartLoc = FirstVD->getBeginLoc(); SourceLocation NewLastEndLoc = getLocationAfterSkiping(LastEndLoc, ';'); return !(TheRewriter->RemoveText(SourceRange(StartLoc, NewLastEndLoc))); } @@ -1421,7 +1421,7 @@ const Stmt *ThenStmt = IS->getThen(); TransAssert(ThenStmt && "NULL ThenStmt!"); - SourceLocation ThenLoc = ThenStmt->getLocStart(); + SourceLocation ThenLoc = ThenStmt->getBeginLoc(); SourceLocation EndLoc = ThenLoc.getLocWithOffset(-1); Rewriter::RewriteOptions Opts; @@ -1546,7 +1546,7 @@ if (Pos == 0) return true; - SourceLocation StartLoc = CE->getLocStart(); + SourceLocation StartLoc = CE->getBeginLoc(); StartLoc = StartLoc.getLocWithOffset(Pos); return !(TheRewriter->ReplaceText(StartLoc, OldDtorName.size(), Name)); @@ -1615,7 +1615,7 @@ if (!TypeId) return true; - SourceLocation LocStart = RTLoc.getLocStart(); + SourceLocation LocStart = RTLoc.getBeginLoc(); // Loc could be invalid, for example: // class AAA { }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/SimpleInliner.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/SimpleInliner.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/SimpleInliner.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/SimpleInliner.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -487,7 +487,7 @@ for (ReturnStmtsVector::iterator I = ReturnStmts.begin(), E = ReturnStmts.end(); I != E; ++I) { ReturnStmt *RS = (*I); - SourceLocation RSLocStart = RS->getLocStart(); + SourceLocation RSLocStart = RS->getBeginLoc(); const char *RSStartBuf = SrcManager->getCharacterData(RSLocStart); int Off = RSStartBuf - StartBuf; TransAssert((Off >= 0) && "Bad Offset!"); @@ -504,7 +504,7 @@ RewriteHelper->getStmtString(Body, FuncBodyStr); TransAssert(FuncBodyStr[0] == '{'); - SourceLocation StartLoc = Body->getLocStart(); + SourceLocation StartLoc = Body->getBeginLoc(); const char *StartBuf = SrcManager->getCharacterData(StartLoc); std::vector< std::pair<ReturnStmt *, int> > SortedReturnStmts; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/SimplifyDependentTypedef.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/SimplifyDependentTypedef.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/SimplifyDependentTypedef.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/SimplifyDependentTypedef.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2014, 2015, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2014, 2015, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -140,7 +140,7 @@ void SimplifyDependentTypedef::rewriteTypedefDecl(void) { - SourceLocation LocStart = TheTypedefDecl->getLocStart(); + SourceLocation LocStart = TheTypedefDecl->getBeginLoc(); // skip "typedef " LocStart = LocStart.getLocWithOffset(8); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/SimplifyIf.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/SimplifyIf.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/SimplifyIf.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/SimplifyIf.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -95,7 +95,7 @@ // foo(bar()) bool SimplifyIfStatementVisitor::VisitIfStmt(IfStmt *IS) { - if (IS->getLocStart().isMacroID()) { + if (IS->getBeginLoc().isMacroID()) { return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/SimplifyNestedClass.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/SimplifyNestedClass.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/SimplifyNestedClass.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/SimplifyNestedClass.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2016, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -134,8 +134,8 @@ void SimplifyNestedClass::removeOuterClass() { TransAssert(TheBaseCXXRD && "NULL Base CXXRD!"); - SourceLocation LocStart = TheBaseCXXRD->getLocStart(); - SourceLocation LocEnd = TheInnerDecl->getLocStart(); + SourceLocation LocStart = TheBaseCXXRD->getBeginLoc(); + SourceLocation LocEnd = TheInnerDecl->getBeginLoc(); LocEnd = LocEnd.getLocWithOffset(-1); TheRewriter.RemoveText(SourceRange(LocStart, LocEnd)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/SimplifyStruct.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/SimplifyStruct.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/SimplifyStruct.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/SimplifyStruct.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2016, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -130,7 +130,7 @@ if (RD != ConsumerInstance->TheRecordDecl) return true; - SourceLocation LocStart = VD->getLocStart(); + SourceLocation LocStart = VD->getBeginLoc(); void *LocPtr = LocStart.getPtrEncoding(); if (ConsumerInstance->VisitedVarDeclLocs.count(LocPtr)) return true; @@ -187,7 +187,7 @@ if (CanonicalRD != ConsumerInstance->TheRecordDecl) return true; - SourceLocation LocStart = RTLoc.getLocStart(); + SourceLocation LocStart = RTLoc.getBeginLoc(); void *LocPtr = LocStart.getPtrEncoding(); if (ConsumerInstance->VisitedLocs.count(LocPtr)) return true; @@ -224,7 +224,7 @@ TransAssert((ReplacingRD == ConsumerInstance->ReplacingRecordDecl) && "Unmatched Replacing RD!"); - SourceLocation LocEnd = ME->getLocEnd(); + SourceLocation LocEnd = ME->getEndLoc(); if (LocEnd.isMacroID()) { LocEnd = ConsumerInstance->SrcManager->getSpellingLoc(LocEnd); } @@ -246,7 +246,7 @@ // no more MemberExpr upon this ME if (ArrowPos.isInvalid() && PeriodPos.isInvalid()) { - SourceLocation StartLoc = ME->getLocStart(); + SourceLocation StartLoc = ME->getBeginLoc(); size_t Pos; if (ME->isArrow()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/TemplateNonTypeArgToInt.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/TemplateNonTypeArgToInt.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/TemplateNonTypeArgToInt.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/TemplateNonTypeArgToInt.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2015, 2016, 2017, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -163,10 +163,11 @@ ValidInstanceNum++; if (ValidInstanceNum == TransformationCounter) { TheExpr = ArgLoc.getLocInfo().getAsExpr(); - llvm::APSInt Result; + Expr::EvalResult Result; if (!TheExpr->isValueDependent() && TheExpr->EvaluateAsInt(Result, *Context)) { - IntString = Result.toString(10); + llvm::APSInt IVal = Result.Val.getInt(); + IntString = IVal.toString(10); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/Transformation.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/Transformation.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/Transformation.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/Transformation.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017 The University of Utah +// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source @@ -212,10 +212,11 @@ while (ASE) { const Expr *IdxE = ASE->getIdx(); unsigned int Idx = 0; - llvm::APSInt Result; + Expr::EvalResult Result; if (IdxE && IdxE->EvaluateAsInt(Result, *Context)) { // this will truncate a possible uint64 value to uint32 value - Idx = (unsigned int)(*Result.getRawData()); + llvm::APSInt IVal = Result.Val.getInt(); + Idx = (unsigned int)(*IVal.getRawData()); } BaseE = ASE->getBase()->IgnoreParenCasts(); ASE = dyn_cast<ArraySubscriptExpr>(BaseE); @@ -389,11 +390,12 @@ const ArraySubscriptExpr *ASE = dyn_cast<ArraySubscriptExpr>(E); const Expr *IdxE = ASE->getIdx(); unsigned int Idx = 0; - llvm::APSInt Result; + Expr::EvalResult Result; // If we cannot have an integeral index, use 0. if (IdxE && IdxE->EvaluateAsInt(Result, *Context)) { - std::string IntStr = Result.toString(10); + llvm::APSInt IVal = Result.Val.getInt(); + std::string IntStr = IVal.toString(10); std::stringstream TmpSS(IntStr); if (!(TmpSS >> Idx)) TransAssert(0 && "Non-integer value!"); @@ -434,12 +436,13 @@ int Transformation::getIndexAsInteger(const Expr *E) { - llvm::APSInt Result; - int Idx; + Expr::EvalResult Result; if (!E->EvaluateAsInt(Result, *Context)) TransAssert(0 && "Failed to Evaluate index!"); - Idx = (int)(*Result.getRawData()); + int Idx; + llvm::APSInt IVal = Result.Val.getInt(); + Idx = (int)(*IVal.getRawData()); return Idx; } @@ -1073,7 +1076,7 @@ bool Transformation::isInIncludedFile(const Stmt *S) const { - return isInIncludedFile(S->getLocStart()); + return isInIncludedFile(S->getBeginLoc()); } bool Transformation::isDeclaringRecordDecl(const RecordDecl *RD) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/Transformation.h new/creduce-2.10.0+git.20190513.fb91843/clang_delta/Transformation.h --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/Transformation.h 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/Transformation.h 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ //===----------------------------------------------------------------------===// // -// Copyright (c) 2012, 2013, 2014, 2015 2016 The University of Utah +// Copyright (c) 2012, 2013, 2014, 2015, 2016, 2018 The University of Utah // All rights reserved. // // This file is distributed under the University of Illinois Open Source diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/VectorToArray.cpp new/creduce-2.10.0+git.20190513.fb91843/clang_delta/VectorToArray.cpp --- old/creduce-2.9.0+git.20190501.0fc288e/clang_delta/VectorToArray.cpp 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/clang_delta/VectorToArray.cpp 2019-05-13 23:17:30.000000000 +0200 @@ -1,5 +1,5 @@ //===----------------------------------------------------------------------===// -// Copyright (c) 2016 The University of Utah +// Copyright (c) 2016, 2019 The University of Utah // Copyright (c) 2016 Ori Brostovski <o...@ceemple.com> // Copyright (c) 2016 Ceemple Software Ltd // All rights reserved. @@ -129,7 +129,7 @@ unsigned NameLength = IdInfo->getLength(); assert(NameLength && "Variable name has no length"); - SourceLocation TypeLocStart = VD->getLocStart(); + SourceLocation TypeLocStart = VD->getBeginLoc(); const std::string ElemTypeName = getVectorElemTypeName(VD); SourceLocation NameLocM1 = NameLoc.getLocWithOffset(-1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/configure new/creduce-2.10.0+git.20190513.fb91843/configure --- old/creduce-2.9.0+git.20190501.0fc288e/configure 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/configure 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for creduce 2.9.0. +# Generated by GNU Autoconf 2.69 for creduce 2.10.0. # # Report bugs to <creduce-b...@flux.utah.edu>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='creduce' PACKAGE_TARNAME='creduce' -PACKAGE_VERSION='2.9.0' -PACKAGE_STRING='creduce 2.9.0' +PACKAGE_VERSION='2.10.0' +PACKAGE_STRING='creduce 2.10.0' PACKAGE_BUGREPORT='creduce-b...@flux.utah.edu' PACKAGE_URL='http://embed.cs.utah.edu/creduce/' @@ -1347,7 +1347,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures creduce 2.9.0 to adapt to many kinds of systems. +\`configure' configures creduce 2.10.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1418,7 +1418,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of creduce 2.9.0:";; + short | recursive ) echo "Configuration of creduce 2.10.0:";; esac cat <<\_ACEOF @@ -1544,7 +1544,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -creduce configure 2.9.0 +creduce configure 2.10.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1943,7 +1943,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by creduce $as_me 2.9.0, which was +It was created by creduce $as_me 2.10.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2924,7 +2924,7 @@ # Define the identity of the package. PACKAGE='creduce' - VERSION='2.9.0' + VERSION='2.10.0' cat >>confdefs.h <<_ACEOF @@ -15852,7 +15852,7 @@ as_fn_error $? "LLVM is required but program \`llvm-config' cannot be found in $with_llvm_path" "$LINENO" 5 fi - if test -n "7.0"; then + if test -n "8.0"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LLVM version" >&5 $as_echo_n "checking for LLVM version... " >&6; } LLVM_VERSION=`$LLVM_CONFIG --version` @@ -15877,7 +15877,7 @@ -e 's/[^0-9]//g'` - ax_compare_version_B=`echo "7.0" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ + ax_compare_version_B=`echo "8.0" | sed -e 's/\([0-9]*\)/Z\1Z/g' \ -e 's/Z\([0-9]\)Z/Z0\1Z/g' \ -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \ -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \ @@ -15892,7 +15892,7 @@ if test "$ax_compare_version" = "true" ; then : else - as_fn_error $? "LLVM version 7.0 or later is required" "$LINENO" 5 + as_fn_error $? "LLVM version 8.0 or later is required" "$LINENO" 5 fi @@ -17162,7 +17162,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by creduce $as_me 2.9.0, which was +This file was extended by creduce $as_me 2.10.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17229,7 +17229,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -creduce config.status 2.9.0 +creduce config.status 2.10.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/configure.ac new/creduce-2.10.0+git.20190513.fb91843/configure.ac --- old/creduce-2.9.0+git.20190501.0fc288e/configure.ac 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/configure.ac 2019-05-13 23:17:30.000000000 +0200 @@ -37,7 +37,7 @@ AC_PROG_CXX AC_PROG_LIBTOOL -AX_LLVM([7.0],[engine]) +AX_LLVM([8.0],[engine]) AX_CLANG # Handle configure-time choice of assertion-checking method. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/scripts/travis_deps.sh new/creduce-2.10.0+git.20190513.fb91843/scripts/travis_deps.sh --- old/creduce-2.9.0+git.20190501.0fc288e/scripts/travis_deps.sh 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/scripts/travis_deps.sh 2019-05-13 23:17:30.000000000 +0200 @@ -28,23 +28,23 @@ software-properties-common \ wget -# Set up for installing LLVM 7.0. +# Set up for installing LLVM 8.0. # See <https://wiki.ubuntu.com/ToolChain>. # See <http://llvm.org/apt/>. add-apt-repository -y \ ppa:ubuntu-toolchain-r/test add-apt-repository -y \ - 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main' + 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-8 main' wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - apt-get update -qq -# Install LLVM 7.0. See file "INSTALL.md". +# Install LLVM 8.0. See file "INSTALL.md". apt-get install -y -qq \ - llvm-7 \ - llvm-7-dev \ - clang-7 \ - libclang-7-dev \ - clang-format-7 \ + llvm-8 \ + llvm-8-dev \ + clang-8 \ + libclang-8-dev \ + clang-format-8 \ libedit-dev # Install other C-Reduce dependencies. See file "INSTALL.md". diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/creduce-2.9.0+git.20190501.0fc288e/version.m4 new/creduce-2.10.0+git.20190513.fb91843/version.m4 --- old/creduce-2.9.0+git.20190501.0fc288e/version.m4 2019-05-02 00:14:13.000000000 +0200 +++ new/creduce-2.10.0+git.20190513.fb91843/version.m4 2019-05-13 23:17:30.000000000 +0200 @@ -1,6 +1,6 @@ ## -*- mode: m4 -*- ## -## Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2018 The University of Utah +## Copyright (c) 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 The University of Utah ## All rights reserved. ## ## This file is distributed under the University of Illinois Open Source @@ -8,7 +8,7 @@ ############################################################################### -m4_define([CREDUCE_VERSION], [2.9.0]) +m4_define([CREDUCE_VERSION], [2.10.0]) m4_define([CREDUCE_BUGREPORT], [creduce-b...@flux.utah.edu]) m4_define([CREDUCE_URL], [http://embed.cs.utah.edu/creduce/])