07/18: gnu: Add libkcddb-qt5.
z572 pushed a commit to branch kde-team in repository guix. commit 66f32af369100e943db6f294614d324b0820d834 Author: Zheng Junjie AuthorDate: Tue Jul 9 11:55:06 2024 +0800 gnu: Add libkcddb-qt5. * gnu/packages/kde-multimedia.scm (libkcddb-qt5): New variable. Change-Id: Ieac08e2f33f75ce4beb273b12bfe38d2e9f69d59 --- gnu/packages/kde-multimedia.scm | 21 + 1 file changed, 21 insertions(+) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 92418dde31..7ada81cfc3 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -703,6 +703,27 @@ Its features include: (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+ +(define-public libkcddb-qt5 + (package +(inherit libkcddb) +(name "libkcddb-qt5") +(native-inputs + (list extra-cmake-modules kdoctools-5)) +(inputs + (list kcodecs-5 + kconfig-5 + ki18n-5 + kio-5 + kcmutils-5 + kwidgetsaddons-5 + libmusicbrainz)) +(arguments + (list + #:qtbase qtbase-5 + #:configure-flags #~(list "-DQT_MAJOR_VERSION=5") + ;; Most tests require network + #:tests? #f + (define-public libkcompactdisc (package (name "libkcompactdisc")
01/18: gnu: smb4k: Update to 3.2.5.
z572 pushed a commit to branch kde-team in repository guix. commit ca16eb28df489fb525946df2f727866d389aed5c Author: Zheng Junjie AuthorDate: Tue Jul 9 10:35:44 2024 +0800 gnu: smb4k: Update to 3.2.5. * gnu/packages/kde-utils.scm (smb4k): Update to 3.2.5. [inputs]: Remove kauth, kconfig, kconfigwidgets, kcompletion, kcoreaddons, kcrash, kdbusaddons, kdnssd, ki18n, kiconthemes, kio, kjobwidgets, knotifications, knotifyconfig, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, and solid; add kauth-5, kconfig-5, kconfigwidgets-5, kcompletion-5, kcoreaddons-5, kcrash-5, kdbusaddons-5, kdnssd-5, ki18n-5, kiconthemes-5, kio-5, kjobwidgets-5, knotifications-5, knotifyconfig-5, ktextwidgets-5, kwallet-5, kwidgetsaddons-5, kwindowsystem-5, kxmlgui-5, and solid-5. [native-inputs]: Remove kdoctools; add kdoctools-5. Change-Id: I16b512f63b821c0bad0f20c39b044edff38ba5f5 --- gnu/packages/kde-utils.scm | 46 +++--- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index e3581ed33e..feeefd479c 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -1126,43 +1126,43 @@ remind you to take a break now and then.") (define-public smb4k (package (name "smb4k") -(version "3.1.3") +(version "3.2.5") (source (origin (method url-fetch) (uri (string-append "https://sourceforge.net/projects/smb4k/files/; version "/smb4k-" version ".tar.xz")) (sha256 -(base32 "0prw0aq16nz9ns4d50mc6fbaw9pbcyh8p698izylhd4i0nr1dd9d" +(base32 "1d53yl02wrfl6wl2h4a30qiirs44qmfkfsr1kjv69fqhbqp2cszs" (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs - (list kauth - kconfig - kconfigwidgets - kcompletion - kcoreaddons - kcrash - kdbusaddons - kdnssd - ki18n - kiconthemes - kio - kjobwidgets - knotifications - knotifyconfig - ktextwidgets - kwallet - kwidgetsaddons - kwindowsystem - kxmlgui + (list kauth-5 + kconfig-5 + kconfigwidgets-5 + kcompletion-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + kdnssd-5 + ki18n-5 + kiconthemes-5 + kio-5 + kjobwidgets-5 + knotifications-5 + knotifyconfig-5 + ktextwidgets-5 + kwallet-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 samba breeze-icons ;; default icon set plasma-framework qtbase-5 qtdeclarative-5 - solid)) + solid-5)) (home-page "https://apps.kde.org/smb4k/;) (synopsis "Samba (SMB) share advanced browser") (description "Smb4K is an network neighborhood browser for the KDE
04/18: gnu: krusader: Update to 2.8.1.
z572 pushed a commit to branch kde-team in repository guix. commit 76a541737c3f31a75e5137f8cf6b9eae17d18770 Author: Zheng Junjie AuthorDate: Tue Jul 9 10:47:05 2024 +0800 gnu: krusader: Update to 2.8.1. * gnu/packages/kde-utils.scm (krusader): Update to 2.8.1. [inputs]: Remove karchive, kbookmarks, kcodecs, kcompletion, kconfig, kcoreaddons, kguiaddons, ki18n, kiconthemes, kio, kitemviews, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, and solid; add karchive-5, kbookmarks-5, kcodecs-5, kcompletion-5, kconfig-5, kcoreaddons-5, kguiaddons-5, ki18n-5, kiconthemes-5, kio-5, kitemviews-5, knotifications-5, kparts-5, ktextwidgets-5, kwallet-5, kwidgetsaddons-5, kwindowsystem-5, kxmlgui-5, and solid-5. [native-inputs]: Remove kdoctools; add kdoctools-5. Change-Id: I76091b66818d8166f629ea7fccefb3c57674d039 --- gnu/packages/kde-utils.scm | 44 ++-- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 487b84c5c7..a0b47e7a12 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -941,14 +941,14 @@ to save the times and resume them later.") (define-public krusader (package (name "krusader") -(version "2.8.0") +(version "2.8.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/krusader/" version "/krusader-" version ".tar.xz")) (sha256 -(base32 "16n2y861ka8jhackf7hd9b0b0argifc1p0a114dvrc0qjddg0k4f" +(base32 "10w2y66kapd0ii8lr37jjwgg2a623ds05bv416j1payh352j1grp" (build-system qt-build-system) (arguments (list #:phases @@ -960,29 +960,29 @@ to save the times and resume them later.") (("# include ") "") (("# include ") ""))) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs - (list karchive - kbookmarks - kcodecs - kcompletion - kconfig - kcoreaddons - kguiaddons - ki18n - kiconthemes - kio - kitemviews - knotifications - kparts - ktextwidgets - kwallet - kwidgetsaddons - kwindowsystem - kxmlgui + (list karchive-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kcoreaddons-5 + kguiaddons-5 + ki18n-5 + kiconthemes-5 + kio-5 + kitemviews-5 + knotifications-5 + kparts-5 + ktextwidgets-5 + kwallet-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 breeze-icons ;; default icon set qtbase-5 - solid + solid-5 zlib)) (home-page "https://krusader.org/;) (synopsis "Twin-panel (commander-style) file manager")
14/18: gnu: kamoso: Use new input style.
z572 pushed a commit to branch kde-team in repository guix. commit 68b5cfde4e588766dda6e038135c5b5fcbda864a Author: Zheng Junjie AuthorDate: Tue Jul 9 12:41:48 2024 +0800 gnu: kamoso: Use new input style. * gnu/packages/kde-multimedia.scm (kamoso)[naitve-inputs]: Use new style. Change-Id: If1702c4c7f31d629d1c604018010ac756acfb012 --- gnu/packages/kde-multimedia.scm | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index d7c94cf355..7428cfb6e4 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -518,10 +518,11 @@ autoloading of subtitle files for use while playing video.") (base32 "1i2w2cmlfr9q4p405kycy2xqp8q5d6f1j3pwr5sbdhis3rm7vm4l" (build-system qt-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ("glib:bin" ,glib "bin") - ("kdoctools" ,kdoctools-5) - ("pkg-config" ,pkg-config))) + (list + extra-cmake-modules + `(,glib "bin") + kdoctools-5 + pkg-config)) (inputs (list gstreamer gst-plugins-base
15/18: gnu: kwave: Update to 24.05.2.
z572 pushed a commit to branch kde-team in repository guix. commit fdd39ecab7f10006281863996cc1d5c78078751f Author: Zheng Junjie AuthorDate: Tue Jul 9 12:52:52 2024 +0800 gnu: kwave: Update to 24.05.2. * gnu/packages/kde-multimedia.scm (kwave): Update to 24.05.2. [inputs]: Remove karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdbusaddons, ki18n, kiconthemes, kio, kservice, ktextwidgets, kwidgetsaddons, and kxmlgui; add karchive-5, kcompletion-5, kconfig-5, kconfigwidgets-5, kcoreaddons-5, kcrash-5, kdbusaddons-5, ki18n-5, kiconthemes-5, kio-5, kservice-5, ktextwidgets-5, kwidgetsaddons-5, and kxmlgui-5. [native-inputs]: Remove kdoctools; add kdoctools-5 and tzdata-for-tests. [arguments]: Add set-TZDATA phase. Change-Id: Ib0a2f64f331ab4155f37093c7b0e63337f929587 --- gnu/packages/kde-multimedia.scm | 47 + 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 7428cfb6e4..5323660033 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -32,6 +32,7 @@ #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages audio) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages cdrom) @@ -597,36 +598,37 @@ This package is part of the KDE multimedia module.") (define-public kwave (package (name "kwave") -(version "23.04.3") +(version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kwave-" version ".tar.xz")) + "/src/kwave-" version ".tar.xz")) (sha256 -(base32 "0s9w8jgwblljwfji2a19bqs3nx6sr2qzz35kwbi0ahwncy69k4jx" +(base32 "1g3gaxmchsf9c7zvx608wl41qs001vr1zm0cgnaim753446vb08f" (build-system qt-build-system) (native-inputs - (list extra-cmake-modules (librsvg-for-system) pkg-config kdoctools)) + (list extra-cmake-modules (librsvg-for-system) pkg-config kdoctools-5 + tzdata-for-tests)) (inputs (list alsa-lib audiofile flac id3lib - karchive - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - ki18n - kiconthemes - kio - kservice - ktextwidgets - kwidgetsaddons - kxmlgui + karchive-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + ki18n-5 + kiconthemes-5 + kio-5 + kservice-5 + ktextwidgets-5 + kwidgetsaddons-5 + kxmlgui-5 libmad libsamplerate libvorbis @@ -636,6 +638,15 @@ This package is part of the KDE multimedia module.") qtbase-5 qtmultimedia-5 zlib)) +(arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-TZDATA +(lambda* (#:key inputs tests? #:allow-other-keys) + (setenv "TZDIR" + (search-input-directory inputs + "share/zoneinfo"))) (home-page "https://apps.kde.org/kwave/;) (synopsis "Sound editor for KDE") (description "Kwave is a sound editor designed for the KDE Desktop
13/18: gnu: kamoso: Update to 24.05.2.
z572 pushed a commit to branch kde-team in repository guix. commit 19abb23e40ff9f92ff45239ef3dd14960ca1785a Author: Zheng Junjie AuthorDate: Tue Jul 9 12:39:54 2024 +0800 gnu: kamoso: Update to 24.05.2. * gnu/packages/kde-multimedia.scm (kamoso): Update to 24.05.2. [inputs]: Remove kconfig, ki18n, kio, kirigami, knotifications, kparts, and purpose; add kconfig-5, ki18n-5, kio-5, kirigami-5, knotifications-5, kparts-5, and purpose-5. [native-inputs]: Remove kdoctools; add kdoctools-5. Change-Id: I0b2a554ee0e82a1e7de71d7583322d9f7e13e1c3 --- gnu/packages/kde-multimedia.scm | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index ae40403275..d7c94cf355 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -508,31 +508,31 @@ autoloading of subtitle files for use while playing video.") (define-public kamoso (package (name "kamoso") -(version "23.04.3") +(version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kamoso-" version ".tar.xz")) (sha256 -(base32 "1f06331qigf5wi6lgir5ij8h1fsdn54v32fyw2mgf0hg05xndrcl" +(base32 "1i2w2cmlfr9q4p405kycy2xqp8q5d6f1j3pwr5sbdhis3rm7vm4l" (build-system qt-build-system) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("glib:bin" ,glib "bin") - ("kdoctools" ,kdoctools) + ("kdoctools" ,kdoctools-5) ("pkg-config" ,pkg-config))) (inputs (list gstreamer gst-plugins-base - kconfig - ki18n - kio - kirigami - knotifications - kparts + kconfig-5 + ki18n-5 + kio-5 + kirigami-5 + knotifications-5 + kparts-5 breeze-icons ; default icon set - purpose + purpose-5 qtbase-5 qtdeclarative-5 qtgraphicaleffects
02/18: gnu: rsibreak: Update to 0.12.15.
z572 pushed a commit to branch kde-team in repository guix. commit 2d6031735df711ff2f159028f2ee551962a4b285 Author: Zheng Junjie AuthorDate: Tue Jul 9 10:37:52 2024 +0800 gnu: rsibreak: Update to 0.12.15. * gnu/packages/kde-utils.scm (rsibreak): Update to 0.12.15. [inputs]: Remove kauth, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdbusaddons, ki18n, kiconthemes, kidletime, knotifications, knotifyconfig, ktextwidgets, kwindowsystem, and kxmlgui; add kauth-5, kconfig-5, kconfigwidgets-5, kcoreaddons-5, kcrash-5, kdbusaddons-5, ki18n-5, kiconthemes-5, kidletime-5, knotifications-5, knotifyconfig-5, ktextwidgets-5, kwindowsystem-5, and kxmlgui-5. [native-inputs]: Remove kdoctools; add kdoctools-5. Change-Id: I564a4d1edd700cd72302ba7c7d0b31c2eb4ade41 --- gnu/packages/kde-utils.scm | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index feeefd479c..c7bd0d7d30 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -1086,32 +1086,32 @@ redone.") (define-public rsibreak (package (name "rsibreak") -(version "0.12.14") +(version "0.12.15") (source (origin (method url-fetch) (uri (string-append "mirror://kde//stable/rsibreak/0.12/" "rsibreak-" version ".tar.xz")) (sha256 -(base32 "0yjv5awngi2hk6xzlwzmj92i6qppnfc0inqdp16rd8gzfpw7xqqw" +(base32 "0kfbbhyzilvar3vns68pd8vkd17f07g8q9g83xxwl06zl3k6672j" (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs - (list kauth - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - ki18n - kiconthemes - kidletime - knotifications - knotifyconfig - ktextwidgets - kwindowsystem - kxmlgui + (list kauth-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + ki18n-5 + kiconthemes-5 + kidletime-5 + knotifications-5 + knotifyconfig-5 + ktextwidgets-5 + kwindowsystem-5 + kxmlgui-5 breeze-icons ;; default icon set qtbase-5)) (home-page "https://apps.kde.org/rsibreak/;)
12/18: gnu: Add purpose-5.
z572 pushed a commit to branch kde-team in repository guix. commit 5a0ad6826855ab1b1207ffdcacc841dfdfba6ddc Author: Zheng Junjie AuthorDate: Tue Jul 9 12:38:56 2024 +0800 gnu: Add purpose-5. * gnu/packages/kde-frameworks.scm (purpose-5): New variable. Change-Id: I2bc23279ddc46ed1285c6a898f6149364b245dc5 --- gnu/packages/kde-frameworks.scm | 31 +++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index f27b2d26fc..8f559fc2c5 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -5183,6 +5183,37 @@ components so that all the plugins can receive all the information they need.") (license license:lgpl2.1+))) +(define-public purpose-5 + (package +(inherit purpose) +(name "purpose") +(version "5.116.0") +(source (origin + (method url-fetch) + (uri (string-append +"mirror://kde/stable/frameworks/" +(version-major+minor version) "/" +name "-" version ".tar.xz")) + (sha256 + (base32 +"1g0xip1khclinx3vb835krdsj66jllgbx1fka8d9f55n68d6rmk2" +(native-inputs + (list extra-cmake-modules)) +(inputs + (list + kconfig-5 + kcoreaddons-5 + knotifications-5 + ki18n-5 + kio-5 + kirigami-5 + qtbase-5 + qtdeclarative-5)) +(arguments + (list #:tests? #f ;; seem to require network; don't find QTQuick components + ;; not run anyway + #:configure-flags #~'("-DBUILD_TESTING=OFF") + (define-public ktextaddons (package (name "ktextaddons")
05/18: gnu: kronometer: Fix build.
z572 pushed a commit to branch kde-team in repository guix. commit a5c297c31921ca94d772a8e39bc3f7aa3645b746 Author: Zheng Junjie AuthorDate: Tue Jul 9 10:51:54 2024 +0800 gnu: kronometer: Fix build. * gnu/packages/kde-utils.scm (kronometer): Update to 2.3.0. [inputs]: Replace kauth, kconfig, kconfigwidgets, kcoreaddons, kcrash, ki18n, kwidgetsaddons, and kxmlgui with kauth-5, kconfig-5, kconfigwidgets-5, kcoreaddons-5, kcrash-5, ki18n-5, kwidgetsaddons-5, and kxmlgui-5. [native-inputs]: Replace kdoctools with kdoctools-5. Change-Id: I730b366a65fbee3724470fa65ab555ecd0af2098 --- gnu/packages/kde-utils.scm | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index a0b47e7a12..cac92b9c92 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -918,16 +918,16 @@ sentences to be re-spoken.") (base32 "0xn4z9y2yl57a5skwp4cjsn1456kiwnwvhrddc0qsihgdyif3fbm" (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs - (list kauth - kconfig - kconfigwidgets - kcoreaddons - kcrash - ki18n - kwidgetsaddons - kxmlgui + (list kauth-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + ki18n-5 + kwidgetsaddons-5 + kxmlgui-5 breeze-icons ;; default icon set qtbase-5)) (home-page "https://apps.kde.org/kronometer/;)
08/18: gnu: k3b: Update to 24.05.2.
z572 pushed a commit to branch kde-team in repository guix. commit 75ef0cc2f1bb05c550dcfaa5fa99c69292393bc9 Author: Zheng Junjie AuthorDate: Tue Jul 9 11:55:37 2024 +0800 gnu: k3b: Update to 24.05.2. * gnu/packages/kde-multimedia.scm (k3b): Update to 24.05.2. [inputs]: Remove karchive, kcmutils, kconfig, kcoreaddons, kfilemetadata, ki18n, kiconthemes, kio, kjobwidgets, knewstuff, knotifications, knotifyconfig, kservice, kwidgetsaddons, kxmlgui, libkcddb, qtbase-5, and solid; add karchive-5, kcmutils-5, kconfig-5, kcoreaddons-5, kfilemetadata-5, ki18n-5, kiconthemes-5, kio-5, kjobwidgets-5, knewstuff-5, knotifications-5, knotifyconfig-5, kservice-5, kwidgetsaddons-5, kxmlgui-5, libkcddb-qt5, and solid-5. [native-inputs]: Remove kdoctools; add kdoctools-5. Change-Id: Ic26400e74b17e062afb70c076e69cce593e51b6f --- gnu/packages/kde-multimedia.scm | 41 - 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 7ada81cfc3..33de6c50cd 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -357,14 +357,14 @@ variety of formats.") (define-public k3b (package (name "k3b") -(version "23.04.3") +(version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/k3b-" version ".tar.xz")) (sha256 -(base32 "1kr1hw4pws87zzwyrwrg2ysdn11qf0qhwi1vc9b0k8jkjmmdplmb" +(base32 "11r6nda3djj9p918sx9bpipc1byg5mvgib4vyf0kpdpnh9bnhvcj" (build-system qt-build-system) (arguments `(#:phases @@ -402,7 +402,7 @@ variety of formats.") '("cdrdao" "cdrtools" "dvd+rw-tools" "libburn" "sox" #t) (native-inputs - (list extra-cmake-modules pkg-config kdoctools)) + (list extra-cmake-modules pkg-config kdoctools-5)) (inputs (list bash-minimal cdrdao @@ -410,28 +410,28 @@ variety of formats.") dvd+rw-tools ffmpeg flac - karchive - kcmutils - kconfig - kcoreaddons - kfilemetadata - ki18n - kiconthemes - kio - kjobwidgets - knewstuff - knotifications - knotifyconfig - kservice - kwidgetsaddons - kxmlgui + karchive-5 + kcmutils-5 + kconfig-5 + kcoreaddons-5 + kfilemetadata-5 + ki18n-5 + kiconthemes-5 + kio-5 + kjobwidgets-5 + knewstuff-5 + knotifications-5 + knotifyconfig-5 + kservice-5 + kwidgetsaddons-5 + kxmlgui-5 lame libburn libcdio-paranoia libdvdcss libdvdread ;; TODO: LibFuzzer - libkcddb + libkcddb-qt5 libmad libmpcdec ;;("libmusicbrainz" ,libmusicbrainz) ; wants old version 2 @@ -439,9 +439,8 @@ variety of formats.") libsndfile libvorbis breeze-icons ; default icon set - qtbase-5 shared-mime-info - solid + solid-5 sox taglib zlib))
branch kde-team updated (3e682c913e -> 2326ae16d4)
z572 pushed a change to branch kde-team in repository guix. from 3e682c913e gnu: kwayland-integration: Update to 6.1.2. new ca16eb28df gnu: smb4k: Update to 3.2.5. new 2d6031735d gnu: rsibreak: Update to 0.12.15. new 65bbe3889d gnu: kxstitch: Fix build. new 76a541737c gnu: krusader: Update to 2.8.1. new a5c297c319 gnu: kronometer: Fix build. new f4eef24a01 gnu: Add kfilemetadata-5. new 66f32af369 gnu: Add libkcddb-qt5. new 75ef0cc2f1 gnu: k3b: Update to 24.05.2. new 013e8e6cec gnu: k3b: Use new style. new 15b59d2f32 gnu: kaffeine: Fix build. new 441a331c08 gnu: kaffeine: Use new style. new 5a0ad68268 gnu: Add purpose-5. new 19abb23e40 gnu: kamoso: Update to 24.05.2. new 68b5cfde4e gnu: kamoso: Use new input style. new fdd39ecab7 gnu: kwave: Update to 24.05.2. new c52b6d6389 gnu: kmix: Update to 24.05.2. new fc696aa54e gnu: kddockwidgets: Update to 2.1.0. new 2326ae16d4 gnu: hotspot: Update to 1.5.1. The 18 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: gnu/packages/kde-frameworks.scm | 72 +++ gnu/packages/kde-multimedia.scm | 278 ++-- gnu/packages/kde-utils.scm | 146 ++--- gnu/packages/linux.scm | 17 ++- gnu/packages/qt.scm | 17 +-- 5 files changed, 316 insertions(+), 214 deletions(-)
03/18: gnu: kxstitch: Fix build.
z572 pushed a commit to branch kde-team in repository guix. commit 65bbe3889d2eb4375251c992441c5ca9139b43a4 Author: Zheng Junjie AuthorDate: Tue Jul 9 10:40:51 2024 +0800 gnu: kxstitch: Fix build. * gnu/packages/kde-utils.scm (kxstitch): Fix build. [inputs]: Replace ktexteditor with ktexteditor-5. [native-inputs]: Replace kdoctools with kdoctools-5. Change-Id: Id8f59c9748534c140ce427d04332715e61523499 --- gnu/packages/kde-utils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index c7bd0d7d30..487b84c5c7 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -1014,9 +1014,9 @@ great on your desktop.") (base32 "1q6blvcqz6hxdfrkdi0fplmz7rmk3im56kpp68r0yrivhx3hn8sc" (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools pkg-config)) + (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs - (list ktexteditor imagemagick qtbase-5 qtx11extras)) + (list ktexteditor-5 imagemagick qtbase-5 qtx11extras)) (home-page "https://apps.kde.org/kxstitch/;) (synopsis "Create and print cross stitch patterns") (description
06/18: gnu: Add kfilemetadata-5.
z572 pushed a commit to branch kde-team in repository guix. commit f4eef24a01e273afcd33826b5f1330227eb08c50 Author: Zheng Junjie AuthorDate: Tue Jul 9 11:51:02 2024 +0800 gnu: Add kfilemetadata-5. * gnu/packages/kde-frameworks.scm (kfilemetadata-5): New variable. Change-Id: I2a7edc051f7d311db05bf67a76d0f28ea4f48476 --- gnu/packages/kde-frameworks.scm | 41 + 1 file changed, 41 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 8dde300935..f27b2d26fc 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2566,6 +2566,47 @@ used by file indexers to retrieve the metadata. This library can also be used by applications to write metadata.") (license (list license:lgpl2.0 license:lgpl2.1 license:lgpl3 +(define-public kfilemetadata-5 + (package +(inherit kfilemetadata) +(name "kfilemetadata") +(version "5.116.0") +(source (origin + (method url-fetch) + (uri (string-append +"mirror://kde/stable/frameworks/" +(version-major+minor version) "/" +name "-" version ".tar.xz")) + (sha256 + (base32 +"13yfcy02rmhrhf8lxv7smk1n9rg1ywsh60hwzm94b8hq9a62qp0r" +(arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check +(lambda* (#:key tests? #:allow-other-keys) + (when tests? +(invoke "ctest" "-E" +"(usermetadatawritertest|taglibextractortest)"))) +(native-inputs (list extra-cmake-modules pkg-config)) +(inputs + (list attr + ebook-tools + karchive-5 + kconfig-5 + kcoreaddons-5 + ki18n-5 + qtmultimedia-5 + qtbase-5 + ;; Required run-time packages + catdoc + ;; Optional run-time packages + exiv2 + ffmpeg + poppler-qt5 + taglib + (define-public kimageannotator (package (name "kimageannotator")
[clang] [llvm] [AArch64] Add -mlr-for-calls-only to replace the now removed -ffixed-x30 flag. (PR #98073)
dm,+reserve-lr-for-ra" } + +... +# This test checks that the live-in flags for LR are correctly set when LR is reserved, but live for a call. +--- +name:check_lr_live +alignment: 4 +tracksRegLiveness: true +tracksDebugUserValues: true +liveins: + - { reg: '$x0' } +frameInfo: + maxAlignment:1 + adjustsStack:true + hasCalls:true + maxCallFrameSize: 0 + savePoint: '%bb.2' + restorePoint:'%bb.2' +machineFunctionInfo: {} +body: | + ; CHECK-LABEL: name: check_lr_live + ; CHECK: bb.0.bb: + ; CHECK-NEXT: successors: %bb.1(0x2000), %bb.2(0x6000) + ; CHECK-NEXT: liveins: $x0 + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: renamable $x8 = COPY $x0 + ; CHECK-NEXT: renamable $w0 = MOVi32imm -536870206 + ; CHECK-NEXT: CBNZX killed renamable $x8, %bb.2 + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: bb.1: + ; CHECK-NEXT: successors: %bb.4(0x8000) + ; CHECK-NEXT: liveins: $w0 + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: B %bb.4 + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: bb.2.bb: + ; CHECK-NEXT: successors: %bb.4(0x2aab), %bb.3(0x) + ; CHECK-NEXT: liveins: $w0 + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: CBNZW $wzr, %bb.4 + ; CHECK-NEXT: B %bb.3 + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: bb.3.bb1: + ; CHECK-NEXT: successors: %bb.4(0x8000) + ; CHECK-NEXT: liveins: $lr + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: early-clobber $sp = frame-setup STPXpre killed $fp, killed $lr, $sp, -2 :: (store (s64) into %stack.1), (store (s64) into %stack.0) + ; CHECK-NEXT: BL @spam, csr_darwin_aarch64_aapcs, implicit-def dead $lr, implicit $sp, implicit-def $sp + ; CHECK-NEXT: renamable $w0 = COPY $wzr + ; CHECK-NEXT: early-clobber $sp, $fp, $lr = frame-destroy LDPXpost $sp, 2 :: (load (s64) from %stack.1), (load (s64) from %stack.0) + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: bb.4.bb2: + ; CHECK-NEXT: liveins: $w0 + ; CHECK-NEXT: {{ $}} + ; CHECK-NEXT: RET_ReallyLR implicit $w0 + bb.0.bb: +successors: %bb.4(0x2000), %bb.1(0x6000) +liveins: $x0 + +renamable $x8 = COPY $x0 +renamable $w0 = MOVi32imm -536870206 +CBNZX killed renamable $x8, %bb.1 + + bb.4: +liveins: $w0 + +B %bb.3 + + bb.1.bb: +successors: %bb.3(0x2aab), %bb.2(0x) +liveins: $w0 + +CBNZW $wzr, %bb.3 +B %bb.2 + + bb.2.bb1: +ADJCALLSTACKDOWN 0, 0, implicit-def dead $sp, implicit $sp +BL @spam, csr_darwin_aarch64_aapcs, implicit-def dead $lr, implicit $sp, implicit-def $sp +ADJCALLSTACKUP 0, 0, implicit-def dead $sp, implicit $sp +renamable $w0 = COPY $wzr + + bb.3.bb2: +liveins: $w0 + +RET_ReallyLR implicit $w0 + +... >From 2bf70e805667f4d49a013524412adf6b3c301fd6 Mon Sep 17 00:00:00 2001 From: Amara Emerson Date: Mon, 8 Jul 2024 14:54:32 -0700 Subject: [PATCH 2/3] whitespace Co-authored-by: Francis Visoiu Mistrih <890283+franci...@users.noreply.github.com> --- clang/include/clang/Driver/aarch64-mlr-for-calls-only.c | 1 - 1 file changed, 1 deletion(-) diff --git a/clang/include/clang/Driver/aarch64-mlr-for-calls-only.c b/clang/include/clang/Driver/aarch64-mlr-for-calls-only.c index 1fe3bdab4f3e4..e71a4cdfe0e7f 100644 --- a/clang/include/clang/Driver/aarch64-mlr-for-calls-only.c +++ b/clang/include/clang/Driver/aarch64-mlr-for-calls-only.c @@ -1,4 +1,3 @@ - // RUN: %clang --target=aarch64-none-gnu -mlr-for-calls-only -### %s 2> %t // RUN: FileCheck --check-prefix=CHECK < %t %s // CHECK: "-target-feature" "+reserve-lr-for-ra" >From da20973d6fc62b06c11012062918104abcb150d7 Mon Sep 17 00:00:00 2001 From: Amara Emerson Date: Mon, 8 Jul 2024 23:03:52 -0700 Subject: [PATCH 3/3] Fix framelayout-sve.mir test --- llvm/test/CodeGen/AArch64/framelayout-sve.mir | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/llvm/test/CodeGen/AArch64/framelayout-sve.mir b/llvm/test/CodeGen/AArch64/framelayout-sve.mir index f7920e595e44b..17b1ad2197c46 100644 --- a/llvm/test/CodeGen/AArch64/framelayout-sve.mir +++ b/llvm/test/CodeGen/AArch64/framelayout-sve.mir @@ -57,7 +57,8 @@ # CHECK: stackSize: 32 # CHECK: bb.0.entry: -# CHECK-NEXT: $sp = frame-setup STRXpre killed $[[SCRATCH:[a-z0-9]+]], $sp, -16 +# CHECK: liveins: $fp +# CHECK: early-clobber $sp = frame-setup STRXpre killed $[[SCRATCH:[a-z0-9]+]], $sp, -16 # CHECK-NEXT: frame-setup CFI_INSTRUCTION def_cfa_offset 16 # CHECK-NEXT: frame-setup CFI_INSTRUCTION offset $w29, -16 # CHECK-NEXT: $sp = frame-setup SUBXri $sp, 16, 0 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [Clang] Ensure the method scope at the late parsing of noexcept specifiers (PR #98023)
zyn0217 wrote: Looks like this caused a regression in `std/utilities/tuple/tuple.tuple/tuple.cnstr/PR23256_constrain_UTypes_ctor.pass.cpp`... I will look into that. https://github.com/llvm/llvm-project/pull/98023 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang] fix sema init crash for not checking a ExprResult (PR #98102)
https://github.com/yuxuanchen1997 updated https://github.com/llvm/llvm-project/pull/98102 >From 01a5dd6e5bfc612678818035b88f85fda5c039d1 Mon Sep 17 00:00:00 2001 From: Yuxuan Chen Date: Mon, 8 Jul 2024 18:16:17 -0700 Subject: [PATCH] [clang] fix sema init crash for not checking a ExprResult --- clang/lib/Sema/SemaInit.cpp | 4 1 file changed, 4 insertions(+) diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 41753a1661ace..a27ed02fc73b8 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -5576,6 +5576,10 @@ static void TryOrBuildParenListInitialization( ExprResult ER; ER = IS.Perform(S, SubEntity, SubKind, Arg ? MultiExprArg(Arg) : std::nullopt); + + if (ER.isInvalid()) +return false; + if (InitExpr) *InitExpr = ER.get(); else ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [X86][MC] Added support for -msse2avx option in llvm-mc (PR #96860)
JaydeepChauhan14 wrote: @MaskRay, @RKSimon, @aengelke, @phoebewang, @KanRobert requesting for review again. https://github.com/llvm/llvm-project/pull/96860 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [AArch64] Add -mlr-for-calls-only to replace the now removed -ffixed-x30 flag. (PR #98073)
@@ -3267,10 +3267,13 @@ bool AArch64FrameLowering::spillCalleeSavedRegisters( InsertSEH(MIB, TII, MachineInstr::FrameSetup); } else { // The code when the pair of ZReg is not present MachineInstrBuilder MIB = BuildMI(MBB, MI, DL, TII.get(StrOpc)); - if (!MRI.isReserved(Reg1)) + const AArch64RegisterInfo *RegInfo = + static_cast( + MF.getSubtarget().getRegisterInfo()); + if (!RegInfo->isStrictlyReservedReg(MF, Reg1)) aemerson wrote: Maybe not, but I'm not sure what other options we have. It's worked for so far except for this case with the outliner. https://github.com/llvm/llvm-project/pull/98073 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [Clang] Ensure the method scope at the late parsing of noexcept specifiers (PR #98023)
https://github.com/zyn0217 edited https://github.com/llvm/llvm-project/pull/98023 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [Clang] Ensure the method scope at the late parsing of noexcept specifiers (PR #98023)
xpression.cpp index c616a77f36619..53d23580d02a2 100644 --- a/clang/test/SemaCXX/cxx0x-noexcept-expression.cpp +++ b/clang/test/SemaCXX/cxx0x-noexcept-expression.cpp @@ -157,3 +157,11 @@ void f5() { // expected-error@-1 {{no member named 'non_existent' in 'typeid_::X'}} } } // namespace typeid_ + +namespace GH97453 { + +struct X { + void ICE(int that) noexcept(noexcept([that]() {})); +}; + +} // namespace GH97453 >From 58f8ba2d6cb8809078059bbcab86d691e55efe4c Mon Sep 17 00:00:00 2001 From: Younan Zhang Date: Tue, 9 Jul 2024 12:53:39 +0800 Subject: [PATCH 2/2] Comments --- clang/lib/Parse/ParseCXXInlineMethods.cpp | 15 +++ .../expr/expr.prim/expr.prim.general/p3-0x.cpp| 5 - 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/clang/lib/Parse/ParseCXXInlineMethods.cpp b/clang/lib/Parse/ParseCXXInlineMethods.cpp index faab9c6b19caa..2df84e78d7f0e 100644 --- a/clang/lib/Parse/ParseCXXInlineMethods.cpp +++ b/clang/lib/Parse/ParseCXXInlineMethods.cpp @@ -523,14 +523,6 @@ void Parser::ParseLexedMethodDeclaration(LateParsedMethodDeclaration ) { Actions, Method ? Method->getParent() : nullptr, Method ? Method->getMethodQualifiers() : Qualifiers{}, Method && getLangOpts().CPlusPlus11); - -// Parse the exception-specification. -SourceRange SpecificationRange; -SmallVector DynamicExceptions; -SmallVector DynamicExceptionRanges; -ExprResult NoexceptExpr; -CachedTokens *ExceptionSpecTokens; - // Push a function scope so that tryCaptureVariable() can properly visit // function scopes involving function parameters that are referenced inside // the noexcept specifier e.g. through a lambda expression. @@ -540,6 +532,13 @@ void Parser::ParseLexedMethodDeclaration(LateParsedMethodDeclaration ) { // }; Sema::SynthesizedFunctionScope Scope(Actions, FunctionToPush); +// Parse the exception-specification. +SourceRange SpecificationRange; +SmallVector DynamicExceptions; +SmallVector DynamicExceptionRanges; +ExprResult NoexceptExpr; +CachedTokens *ExceptionSpecTokens; + ExceptionSpecificationType EST = tryParseExceptionSpecification(/*Delayed=*/false, SpecificationRange, DynamicExceptions, diff --git a/clang/test/CXX/expr/expr.prim/expr.prim.general/p3-0x.cpp b/clang/test/CXX/expr/expr.prim/expr.prim.general/p3-0x.cpp index d50d05d17ab7a..203490632dffb 100644 --- a/clang/test/CXX/expr/expr.prim/expr.prim.general/p3-0x.cpp +++ b/clang/test/CXX/expr/expr.prim/expr.prim.general/p3-0x.cpp @@ -114,7 +114,10 @@ namespace Static { static int h(); -// The use of 'm' doesn't constitute an ODR use, so we don't have a reason to reject it. +// [expr.prim.id.general]p4: +// An id-expression that denotes a non-static data member... can only be used: +// ... +// (4.3) if that id-expression denotes a non-static data member and it appears in an unevaluated operand. static int i() noexcept(noexcept(m + 2)); }; ___________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [Clang] Ensure the method scope at the late parsing of noexcept specifiers (PR #98023)
@@ -113,8 +113,9 @@ namespace Static { static auto g() -> decltype(this->m); // expected-error{{'this' cannot be used in a static member function declaration}} static int h(); - -static int i() noexcept(noexcept(m + 2)); // expected-error{{'this' cannot be implicitly used in a static member function declaration}} + +// The use of 'm' doesn't constitute an ODR use, so we don't have a reason to reject it. +static int i() noexcept(noexcept(m + 2)); zyn0217 wrote: Done. I didn't even know we had relevant wordings about such scenarios until @frederick-vs-ja (thanks!) told me about [[expr.prim.id.general](https://eel.is/c++draft/expr.prim#id.general-4.3)]/4. https://github.com/llvm/llvm-project/pull/98023 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [RISCV] Remove unused RequiredFeatures argument from RVVIntrinsic constructor. NFC (PR #98067)
https://github.com/topperc closed https://github.com/llvm/llvm-project/pull/98067 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] 8474194 - [RISCV] Remove unused RequiredFeatures argument from RVVIntrinsic constructor. NFC (#98067)
Author: Craig Topper Date: 2024-07-08T21:48:29-07:00 New Revision: 84741940f2d9cb858ecb29ce5197714a45e7e67a URL: https://github.com/llvm/llvm-project/commit/84741940f2d9cb858ecb29ce5197714a45e7e67a DIFF: https://github.com/llvm/llvm-project/commit/84741940f2d9cb858ecb29ce5197714a45e7e67a.diff LOG: [RISCV] Remove unused RequiredFeatures argument from RVVIntrinsic constructor. NFC (#98067) Looks like the usage was removed by 7a5cb15ea6facd82756adafae76d60f36a0b60fd Added: Modified: clang/include/clang/Support/RISCVVIntrinsicUtils.h clang/lib/Support/RISCVVIntrinsicUtils.cpp clang/utils/TableGen/RISCVVEmitter.cpp Removed: diff --git a/clang/include/clang/Support/RISCVVIntrinsicUtils.h b/clang/include/clang/Support/RISCVVIntrinsicUtils.h index 97493bae5656e..b4ff61784126e 100644 --- a/clang/include/clang/Support/RISCVVIntrinsicUtils.h +++ b/clang/include/clang/Support/RISCVVIntrinsicUtils.h @@ -409,7 +409,6 @@ class RVVIntrinsic { bool HasBuiltinAlias, llvm::StringRef ManualCodegen, const RVVTypes , const std::vector , - const std::vector , unsigned NF, Policy PolicyAttrs, bool HasFRMRoundModeOp); ~RVVIntrinsic() = default; diff --git a/clang/lib/Support/RISCVVIntrinsicUtils.cpp b/clang/lib/Support/RISCVVIntrinsicUtils.cpp index 7d2a2d7e826f9..e3718130ca06a 100644 --- a/clang/lib/Support/RISCVVIntrinsicUtils.cpp +++ b/clang/lib/Support/RISCVVIntrinsicUtils.cpp @@ -978,8 +978,7 @@ RVVIntrinsic::RVVIntrinsic( bool HasMaskedOffOperand, bool HasVL, PolicyScheme Scheme, bool SupportOverloading, bool HasBuiltinAlias, StringRef ManualCodegen, const RVVTypes , const std::vector , -const std::vector , unsigned NF, -Policy NewPolicyAttrs, bool HasFRMRoundModeOp) +unsigned NF, Policy NewPolicyAttrs, bool HasFRMRoundModeOp) : IRName(IRName), IsMasked(IsMasked), HasMaskedOffOperand(HasMaskedOffOperand), HasVL(HasVL), Scheme(Scheme), SupportOverloading(SupportOverloading), HasBuiltinAlias(HasBuiltinAlias), diff --git a/clang/utils/TableGen/RISCVVEmitter.cpp b/clang/utils/TableGen/RISCVVEmitter.cpp index 48cd83cabfc7d..7f3cb70c97d09 100644 --- a/clang/utils/TableGen/RISCVVEmitter.cpp +++ b/clang/utils/TableGen/RISCVVEmitter.cpp @@ -576,8 +576,8 @@ void RVVEmitter::createRVVIntrinsics( Name, SuffixStr, OverloadedName, OverloadedSuffixStr, IRName, /*IsMasked=*/false, /*HasMaskedOffOperand=*/false, HasVL, UnMaskedPolicyScheme, SupportOverloading, HasBuiltinAlias, -ManualCodegen, *Types, IntrinsicTypes, RequiredFeatures, NF, -DefaultPolicy, HasFRMRoundModeOp)); +ManualCodegen, *Types, IntrinsicTypes, NF, DefaultPolicy, +HasFRMRoundModeOp)); if (UnMaskedPolicyScheme != PolicyScheme::SchemeNone) for (auto P : SupportedUnMaskedPolicies) { SmallVector PolicyPrototype = @@ -591,8 +591,8 @@ void RVVEmitter::createRVVIntrinsics( Name, SuffixStr, OverloadedName, OverloadedSuffixStr, IRName, /*IsMask=*/false, /*HasMaskedOffOperand=*/false, HasVL, UnMaskedPolicyScheme, SupportOverloading, HasBuiltinAlias, -ManualCodegen, *PolicyTypes, IntrinsicTypes, RequiredFeatures, -NF, P, HasFRMRoundModeOp)); +ManualCodegen, *PolicyTypes, IntrinsicTypes, NF, P, +HasFRMRoundModeOp)); } if (!HasMasked) continue; @@ -603,8 +603,7 @@ void RVVEmitter::createRVVIntrinsics( Name, SuffixStr, OverloadedName, OverloadedSuffixStr, MaskedIRName, /*IsMasked=*/true, HasMaskedOffOperand, HasVL, MaskedPolicyScheme, SupportOverloading, HasBuiltinAlias, ManualCodegen, *MaskTypes, -IntrinsicTypes, RequiredFeatures, NF, DefaultPolicy, -HasFRMRoundModeOp)); +IntrinsicTypes, NF, DefaultPolicy, HasFRMRoundModeOp)); if (MaskedPolicyScheme == PolicyScheme::SchemeNone) continue; for (auto P : SupportedMaskedPolicies) { @@ -618,8 +617,8 @@ void RVVEmitter::createRVVIntrinsics( Name, SuffixStr, OverloadedName, OverloadedSuffixStr, MaskedIRName, /*IsMasked=*/true, HasMaskedOffOperand, HasVL, MaskedPolicyScheme, SupportOverloading, HasBuiltinAlias, - ManualCodegen, *PolicyTypes, IntrinsicTypes, RequiredFeatures, NF, - P, HasFRMRoundModeOp)); + ManualCodegen, *PolicyTypes, IntrinsicTypes, NF, P, + HasFRMRoundModeOp)); } } // End for Log2LMULList } // End for TypeRange ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[jenkinsci/plugin-compat-tester] 3f2497: Bump org.jenkins-ci:jenkins from 1.116 to 1.118 (#...
Branch: refs/heads/master Home: https://github.com/jenkinsci/plugin-compat-tester Commit: 3f2497b2ca7605dd9a4857345182e594f1705ddc https://github.com/jenkinsci/plugin-compat-tester/commit/3f2497b2ca7605dd9a4857345182e594f1705ddc Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: 2024-07-09 (Tue, 09 Jul 2024) Changed paths: M pom.xml Log Message: --- Bump org.jenkins-ci:jenkins from 1.116 to 1.118 (#678) To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/plugin-compat-tester/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/plugin-compat-tester/push/refs/heads/master/321e90-3f2497%40github.com.
[jenkinsci/plugin-compat-tester] 321e90: Bump org.jenkins-ci.plugins:text-finder from 1.27 ...
Branch: refs/heads/master Home: https://github.com/jenkinsci/plugin-compat-tester Commit: 321e904f693c34ea710ec29e521f1daeaa4ea251 https://github.com/jenkinsci/plugin-compat-tester/commit/321e904f693c34ea710ec29e521f1daeaa4ea251 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: 2024-07-09 (Tue, 09 Jul 2024) Changed paths: M pom.xml Log Message: --- Bump org.jenkins-ci.plugins:text-finder from 1.27 to 1.29 (#680) To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/plugin-compat-tester/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/plugin-compat-tester/push/refs/heads/master/3c1ef9-321e90%40github.com.
[jenkinsci/jenkins] 8c2572: [JENKINS-73278] Migrate core from EE 8 to EE 9
/StaplerDispatchValidatorTest.java M test/src/test/java/jenkins/security/stapler/StaplerRoutableActionTest.java M test/src/test/java/jenkins/security/stapler/StaticRoutingDecisionProviderTest.java M test/src/test/java/jenkins/security/stapler/TypedFilterTest.java M test/src/test/java/jenkins/telemetry/TelemetryTest.java M test/src/test/java/jenkins/util/FullDuplexHttpServiceTest.java M test/src/test/java/jenkins/util/SystemPropertiesTest.java M test/src/test/java/lib/form/AdvancedButtonTest.java M test/src/test/java/lib/form/BooleanRadioTest.java M test/src/test/java/lib/form/DropdownListTest.java M test/src/test/java/lib/form/EnumSetTest.java M test/src/test/java/lib/form/EnumTest.java M test/src/test/java/lib/form/ExpandableTextboxTest.java M test/src/test/java/lib/form/NameRefTest.java M test/src/test/java/lib/form/PasswordTest.java M test/src/test/java/lib/form/RepeatableTest.java M test/src/test/java/lib/form/RowSetTest.java M test/src/test/java/lib/form/RowVisibilityGroupTest.java M test/src/test/java/lib/form/ValidateButtonTest.java M test/src/test/java/lib/layout/ConfirmationLinkTest.java M test/src/test/java/lib/layout/StopButtonTest.java M test/src/test/java/lib/layout/TaskTest.java M test/src/test/java/org/kohsuke/stapler/MockStaplerRequestBuilder.java M test/src/test/java/org/kohsuke/stapler/Security1097Test.java M war/pom.xml R websocket/jetty10/pom.xml R websocket/jetty10/src/main/java/jenkins/websocket/Jetty10Provider.java R websocket/jetty12-ee8/pom.xml R websocket/jetty12-ee8/src/main/java/jenkins/websocket/Jetty12EE8Provider.java A websocket/jetty12-ee9/pom.xml A websocket/jetty12-ee9/src/main/java/jenkins/websocket/Jetty12EE9Provider.java M websocket/spi/pom.xml M websocket/spi/src/main/java/jenkins/websocket/Provider.java Log Message: --- [JENKINS-73278] Migrate core from EE 8 to EE 9 To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/jenkins/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/jenkins/push/refs/heads/jakarta/1c5f48-8c2572%40github.com.
[jenkinsci/jenkins] fe8635: [JENKINS-73130] Upgrade core from Jetty 10.x to 12...
Branch: refs/heads/prototype Home: https://github.com/jenkinsci/jenkins Commit: fe8635ff89cd80c8ee48642fa80b653a9101649c https://github.com/jenkinsci/jenkins/commit/fe8635ff89cd80c8ee48642fa80b653a9101649c Author: Basil Crow Date: 2024-07-08 (Mon, 08 Jul 2024) Changed paths: M .github/dependabot.yml M .idea/encodings.xml M bom/pom.xml M pom.xml M test/pom.xml M test/src/test/java/hudson/PluginTest.java M test/src/test/java/hudson/model/DirectoryBrowserSupportTest.java M test/src/test/java/hudson/model/UpdateSiteTest.java M test/src/test/java/jenkins/install/SetupWizardTest.java M test/src/test/java/jenkins/security/Security3030Test.java M test/src/test/java/jenkins/util/SystemPropertiesTest.java M war/pom.xml M websocket/jetty10/pom.xml A websocket/jetty12-ee8/pom.xml A websocket/jetty12-ee8/src/main/java/jenkins/websocket/Jetty12EE8Provider.java Log Message: --- [JENKINS-73130] Upgrade core from Jetty 10.x to 12.x (EE 8) Co-authored-by: Olivier Lamy To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/jenkins/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/jenkins/push/refs/heads/prototype/f54822-fe8635%40github.com.
[jenkinsci/jenkins-test-harness]
Branch: refs/tags/2239.v08c54912b_47a_ Home: https://github.com/jenkinsci/jenkins-test-harness To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/jenkins-test-harness/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/jenkins-test-harness/push/refs/tags/2239.v08c54912b_47a_/00-08c549%40github.com.
[jenkinsci/jenkins-test-harness]
Branch: refs/heads/dependabot/maven/io.jenkins.servlet-javax-servlet-api-4.0.8 Home: https://github.com/jenkinsci/jenkins-test-harness To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/jenkins-test-harness/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/jenkins-test-harness/push/refs/heads/dependabot/maven/io.jenkins.servlet-javax-servlet-api-4.0.8/1b5e39-00%40github.com.
[jenkinsci/jenkins-test-harness] 08c549: Bump io.jenkins.servlet:javax-servlet-api from 4.0...
Branch: refs/heads/master Home: https://github.com/jenkinsci/jenkins-test-harness Commit: 08c54912b47a8d17249b387307dfa46db64048ca https://github.com/jenkinsci/jenkins-test-harness/commit/08c54912b47a8d17249b387307dfa46db64048ca Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: 2024-07-09 (Tue, 09 Jul 2024) Changed paths: M pom.xml Log Message: --- Bump io.jenkins.servlet:javax-servlet-api from 4.0.7 to 4.0.8 (#798) To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/jenkins-test-harness/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/jenkins-test-harness/push/refs/heads/master/b4b075-08c549%40github.com.
[clang] Compiler messages on HIP SDK for Windows (PR #97668)
https://github.com/david-salinas updated https://github.com/llvm/llvm-project/pull/97668 >From 970b1e696b77216f326fb7d8dcad5b55a82db489 Mon Sep 17 00:00:00 2001 From: David Salinas Date: Thu, 4 Jul 2024 03:32:13 + Subject: [PATCH] Compiler messages on HIP SDK for Windows When target triple indicates we are on Windows, do not add linux paths to search path in ROCm Installation Detection. Change-Id: I18effb8c20252de3d84ea37ef562124695c5a570 --- clang/lib/Driver/ToolChains/AMDGPU.cpp| 18 ++ clang/lib/Driver/ToolChains/ROCm.h| 5 + clang/test/Driver/rocm-detect-windows.hip | 7 +++ 3 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 clang/test/Driver/rocm-detect-windows.hip diff --git a/clang/lib/Driver/ToolChains/AMDGPU.cpp b/clang/lib/Driver/ToolChains/AMDGPU.cpp index 453daed7cc7d5..e05b9202599c7 100644 --- a/clang/lib/Driver/ToolChains/AMDGPU.cpp +++ b/clang/lib/Driver/ToolChains/AMDGPU.cpp @@ -306,14 +306,16 @@ RocmInstallationDetector::getInstallationPathCandidates() { LatestVer = Ver; } } - if (!LatestROCm.empty()) -ROCmSearchDirs.emplace_back(D.SysRoot + "/opt/" + LatestROCm, -/*StrictChecking=*/true); + if (!isWindows()) { +if (!LatestROCm.empty()) + ROCmSearchDirs.emplace_back(D.SysRoot + "/opt/" + LatestROCm, + /*StrictChecking=*/true); - ROCmSearchDirs.emplace_back(D.SysRoot + "/usr/local", - /*StrictChecking=*/true); - ROCmSearchDirs.emplace_back(D.SysRoot + "/usr", - /*StrictChecking=*/true); +ROCmSearchDirs.emplace_back(D.SysRoot + "/usr/local", +/*StrictChecking=*/true); +ROCmSearchDirs.emplace_back(D.SysRoot + "/usr", +/*StrictChecking=*/true); + } DoPrintROCmSearchDirs(); return ROCmSearchDirs; @@ -322,7 +324,7 @@ RocmInstallationDetector::getInstallationPathCandidates() { RocmInstallationDetector::RocmInstallationDetector( const Driver , const llvm::Triple , const llvm::opt::ArgList , bool DetectHIPRuntime, bool DetectDeviceLib) -: D(D) { +: D(D), hostTriple(HostTriple) { Verbose = Args.hasArg(options::OPT_v); RocmPathArg = Args.getLastArgValue(clang::driver::options::OPT_rocm_path_EQ); PrintROCmSearchDirs = diff --git a/clang/lib/Driver/ToolChains/ROCm.h b/clang/lib/Driver/ToolChains/ROCm.h index dceb0ab036693..242e84a32e8d0 100644 --- a/clang/lib/Driver/ToolChains/ROCm.h +++ b/clang/lib/Driver/ToolChains/ROCm.h @@ -111,6 +111,8 @@ class RocmInstallationDetector { // Wheter -nogpulib is specified. bool NoBuiltinLibs = false; + llvm::Triple hostTriple; + // Paths SmallString<0> InstallPath; SmallString<0> BinPath; @@ -193,6 +195,9 @@ class RocmInstallationDetector { /// Check whether we detected a valid HIP STDPAR Acceleration library. bool hasHIPStdParLibrary() const { return HasHIPStdParLibrary; } + /// Check whether the target triple is for Windows. + bool isWindows() const { return hostTriple.isOSWindows(); } + /// Print information about the detected ROCm installation. void print(raw_ostream ) const; diff --git a/clang/test/Driver/rocm-detect-windows.hip b/clang/test/Driver/rocm-detect-windows.hip new file mode 100644 index 0..7f7c34efb5fd4 --- /dev/null +++ b/clang/test/Driver/rocm-detect-windows.hip @@ -0,0 +1,7 @@ +// UNSUPPORTED: system-linux + +// RUN: %clang -### -nogpulib -nogpuinc \ +// RUN: --print-rocm-search-dirs %s 2>&1 \ +// RUN: | FileCheck %s + +// CHECK-NOT: ROCm installation search path: [[ROCM_PATH:.*/usr$]] ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Compiler messages on HIP SDK for Windows (PR #97668)
ot;[[HIP_PATH:.*/myhip]]/include" +// HIP-PATH: "-L[[HIP_PATH]]/lib" {{.*}}"-lamdhip64" + +// ROCM-PATH: ROCm installation search path: [[ROCM_PATH:.*/Inputs/rocm]] +// ROCM-PATH: "-mlink-builtin-bitcode" "[[ROCM_PATH]]/amdgcn/bitcode/oclc_isa_version_1010.bc" +// ROCM-PATH: "-idirafter" "[[ROCM_PATH]]/include" +// ROCM-PATH: "-L[[ROCM_PATH]]/lib" {{.*}}"-lamdhip64" + +// USR: ROCm installation search path: [[ROCM_PATH:.*/usr$]] +// USR: "-mlink-builtin-bitcode" "[[ROCM_PATH]]/amdgcn/bitcode/oclc_isa_version_1010.bc" +// USR: "-idirafter" "[[ROCM_PATH]]/include" +// USR: "-L[[ROCM_PATH]]/lib" {{.*}}"-lamdhip64" + +// ROCM-REL: ROCm installation search path: {{.*}}/opt/rocm +// ROCM-REL: ROCm installation search path: {{.*}}/opt/rocm-3.10.0 + +// SPACK: InstalledDir: [[DIR:.*]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin +// SPACK: ROCm installation search path (Spack 4.0.0): [[DIR]] +// SPACK: ROCm installation search path: [[CLANG:.*]] +// SPACK: ROCm installation search path: [[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z +// SPACK: ROCm installation search path: [[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/lib/clang +// SPACK: ROCm installation search path: /opt/rocm +// SPACK: Found HIP installation: [[DIR]]/hip-4.0.0-5f63slrursbrvfe2txrrjkynbsywsob5, version 4.0.20214-a2917cd +// SPACK: "-triple" "amdgcn-amd-amdhsa" +// SPACK-SAME: "-mlink-builtin-bitcode" "[[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/hip.bc" +// SPACK-SAME: "-idirafter" "[[DIR]]/hip-4.0.0-5f63slrursbrvfe2txrrjkynbsywsob5/include" + +// SPACK-SET: InstalledDir: [[DIR:.*]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/bin +// SPACK-SET: Found HIP installation: [[DIR]]/hip-4.0.0-abcd, version 4.0.20214-a2917cd +// SPACK-SET: "-triple" "amdgcn-amd-amdhsa" +// SPACK-SET-SAME: "-mlink-builtin-bitcode" "[[DIR]]/llvm-amdgpu-4.0.0-ieagcs7inf7runpyfvepqkurasoglq4z/amdgcn/bitcode/hip.bc" +// SPACK-SET-SAME: "-idirafter" "[[DIR]]/hip-4.0.0-abcd/include" + +// SPACK-MISS-SILENT-NOT: SPACK package hip-{{.*}} not found at +// SPACK-MISS-SILENT-NOT: Found HIP installation ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [X86][vectorcall] Do not consume register for indirect return value (PR #97939)
phoebewang wrote: > You can see from this example that when C++ rules force the use of an sret > indirect return, a register is consumed: > https://godbolt.org/z/W3fdn8s5Y Could you explain more about the example? I didn't find where the register consumed. Don't both `copy_trivial` and `copy_nontrivial` use the same `esp + 4` to pass the pointer of sret? https://github.com/llvm/llvm-project/pull/97939 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang-format][NFC] Annotate function/ctor/dtor declaration l_paren (PR #97938)
https://github.com/owenca edited https://github.com/llvm/llvm-project/pull/97938 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[jenkinsci/stapler] d45b64: [JENKINS-73258] Migrate Stapler from EE 8 to EE 9
/stapler/interceptor/Interceptor.java M core/src/main/java/org/kohsuke/stapler/interceptor/JsonOutputFilter.java M core/src/main/java/org/kohsuke/stapler/interceptor/RequirePOST.java M core/src/main/java/org/kohsuke/stapler/interceptor/RespondSuccess.java M core/src/main/java/org/kohsuke/stapler/json/JsonBody.java M core/src/main/java/org/kohsuke/stapler/json/JsonHttpResponse.java M core/src/main/java/org/kohsuke/stapler/json/JsonResponse.java M core/src/main/java/org/kohsuke/stapler/json/SubmittedForm.java M core/src/main/java/org/kohsuke/stapler/package-info.java M core/src/main/java/org/kohsuke/stapler/verb/HttpVerbInterceptor.java M core/src/test/java/org/kohsuke/stapler/AbstractStaplerTestBase.java M core/src/test/java/org/kohsuke/stapler/AncestorImplTest.java M core/src/test/java/org/kohsuke/stapler/ClassDescriptorTest.java M core/src/test/java/org/kohsuke/stapler/DataBindingTest.java M core/src/test/java/org/kohsuke/stapler/DispatcherTest.java M core/src/test/java/org/kohsuke/stapler/IndexHtmlDispatcherTest.java M core/src/test/java/org/kohsuke/stapler/MockRequest.java M core/src/test/java/org/kohsuke/stapler/MockServletContext.java M core/src/test/java/org/kohsuke/stapler/NestedJsonTest.java M core/src/test/java/org/kohsuke/stapler/RequestImplTest.java M core/src/test/java/org/kohsuke/stapler/ResponseImplTest.java M core/src/test/java/org/kohsuke/stapler/ServletConfigImpl.java M core/src/test/java/org/kohsuke/stapler/Stapler2Test.java M core/src/test/java/org/kohsuke/stapler/bind/BoundObjectTableTest.java M core/src/test/java/org/kohsuke/stapler/bind/JavaScriptProxyTest.java M core/src/test/java/org/kohsuke/stapler/interceptor/JsonOutputFilterTest.java M core/src/test/java/org/kohsuke/stapler/test/JettyTestCase.java M docs/getting-started.adoc M docs/jelly-taglib-ref.adoc M docs/reference.adoc M docs/taglib-jelly.xsd M docs/taglib.xsd M groovy/pom.xml M groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyClassTearOff.java M groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyFacet.java M groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovyServerPageTearOff.java M groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/JellyBuilder.java M jelly/pom.xml M jelly/src/main/java/org/kohsuke/stapler/framework/adjunct/Adjunct.java M jelly/src/main/java/org/kohsuke/stapler/framework/adjunct/AdjunctManager.java M jelly/src/main/java/org/kohsuke/stapler/framework/adjunct/AdjunctsInPage.java M jelly/src/main/java/org/kohsuke/stapler/jelly/AbstractStaplerTag.java M jelly/src/main/java/org/kohsuke/stapler/jelly/BindTag.java M jelly/src/main/java/org/kohsuke/stapler/jelly/CompressTag.java M jelly/src/main/java/org/kohsuke/stapler/jelly/ContentTypeTag.java M jelly/src/main/java/org/kohsuke/stapler/jelly/DefaultScriptInvoker.java M jelly/src/main/java/org/kohsuke/stapler/jelly/InternationalizedStringExpression.java M jelly/src/main/java/org/kohsuke/stapler/jelly/IsUserInRoleTag.java M jelly/src/main/java/org/kohsuke/stapler/jelly/JellyClassTearOff.java M jelly/src/main/java/org/kohsuke/stapler/jelly/JellyFacet.java M jelly/src/main/java/org/kohsuke/stapler/jelly/JellyRequestDispatcher.java M jelly/src/main/java/org/kohsuke/stapler/jelly/RedirectTag.java M jelly/src/main/java/org/kohsuke/stapler/jelly/ScriptInvoker.java M jelly/src/main/java/org/kohsuke/stapler/jelly/StaplerTagLibrary.java M jelly/src/test/java/org/kohsuke/stapler/jelly/issue76/Arm.java M jelly/src/test/java/org/kohsuke/stapler/jelly/issue76/ProtectedClass.java M jrebel/pom.xml M jrebel/src/main/java/org/kohsuke/stapler/JRebelFacet.java M jsp/pom.xml M jsp/src/main/java/org/kohsuke/stapler/jsp/JSPFacet.java M jsp/src/main/java/org/kohsuke/stapler/jsp/RequestDispatcherWrapper.java M jsp/src/main/java/org/kohsuke/stapler/tags/Include.java M pom.xml Log Message: --- [JENKINS-73258] Migrate Stapler from EE 8 to EE 9 To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/stapler/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/stapler/push/refs/heads/jakarta/9b9e5f-d45b64%40github.com.
[jenkinsci/jenkins-test-harness] 1b5e39: Bump io.jenkins.servlet:javax-servlet-api from 4.0...
Branch: refs/heads/dependabot/maven/io.jenkins.servlet-javax-servlet-api-4.0.8 Home: https://github.com/jenkinsci/jenkins-test-harness Commit: 1b5e3910f722a21464c5dcdd96af12ba426b5f1a https://github.com/jenkinsci/jenkins-test-harness/commit/1b5e3910f722a21464c5dcdd96af12ba426b5f1a Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: 2024-07-09 (Tue, 09 Jul 2024) Changed paths: M pom.xml Log Message: --- Bump io.jenkins.servlet:javax-servlet-api from 4.0.7 to 4.0.8 Bumps [io.jenkins.servlet:javax-servlet-api](https://github.com/jenkinsci/pom) from 4.0.7 to 4.0.8. - [Release notes](https://github.com/jenkinsci/pom/releases) - [Changelog](https://github.com/jenkinsci/pom/blob/master/CHANGELOG-old.md) - [Commits](https://github.com/jenkinsci/pom/commits) --- updated-dependencies: - dependency-name: io.jenkins.servlet:javax-servlet-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/jenkins-test-harness/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/jenkins-test-harness/push/refs/heads/dependabot/maven/io.jenkins.servlet-javax-servlet-api-4.0.8/00-1b5e39%40github.com.
[clang] [clang-format][NFC] Annotate function decl l_paren (PR #97938)
); ASSERT_EQ(Tokens.size(), 8u) << Tokens; EXPECT_TOKEN(Tokens[2], tok::identifier, TT_CtorDtorDeclName); + EXPECT_TOKEN(Tokens[3], tok::l_paren, TT_FunctionDeclarationLParen); EXPECT_TOKEN(Tokens[5], tok::l_brace, TT_FunctionLBrace); Tokens = annotate("Foo::~Foo() {}"); ASSERT_EQ(Tokens.size(), 9u) << Tokens; EXPECT_TOKEN(Tokens[3], tok::identifier, TT_CtorDtorDeclName); + EXPECT_TOKEN(Tokens[4], tok::l_paren, TT_FunctionDeclarationLParen); EXPECT_TOKEN(Tokens[6], tok::l_brace, TT_FunctionLBrace); Tokens = annotate("struct Test {\n" @@ -2012,6 +2022,7 @@ TEST_F(TokenAnnotatorTest, UnderstandsCtorAndDtorDeclNames) { "};"); ASSERT_EQ(Tokens.size(), 25u) << Tokens; EXPECT_TOKEN(Tokens[3], tok::identifier, TT_CtorDtorDeclName); + EXPECT_TOKEN(Tokens[4], tok::l_paren, TT_FunctionDeclarationLParen); EXPECT_TOKEN(Tokens[14], tok::identifier, TT_Unknown); } @@ -3003,10 +3014,12 @@ TEST_F(TokenAnnotatorTest, BraceKind) { "};"); ASSERT_EQ(Tokens.size(), 19u) << Tokens; EXPECT_TOKEN(Tokens[3], tok::identifier, TT_CtorDtorDeclName); + EXPECT_TOKEN(Tokens[4], tok::l_paren, TT_FunctionDeclarationLParen); EXPECT_TOKEN(Tokens[6], tok::l_brace, TT_FunctionLBrace); EXPECT_BRACE_KIND(Tokens[6], BK_Block); EXPECT_BRACE_KIND(Tokens[7], BK_Block); EXPECT_TOKEN(Tokens[10], tok::identifier, TT_CtorDtorDeclName); + EXPECT_TOKEN(Tokens[11], tok::l_paren, TT_FunctionDeclarationLParen); EXPECT_TOKEN(Tokens[13], tok::l_brace, TT_FunctionLBrace); EXPECT_BRACE_KIND(Tokens[13], BK_Block); EXPECT_BRACE_KIND(Tokens[14], BK_Block); @@ -3229,6 +3242,7 @@ TEST_F(TokenAnnotatorTest, FunctionTryBlock) { "}"); ASSERT_EQ(Tokens.size(), 45u); EXPECT_TOKEN(Tokens[2], tok::identifier, TT_CtorDtorDeclName); + EXPECT_TOKEN(Tokens[3], tok::l_paren, TT_FunctionDeclarationLParen); EXPECT_TOKEN(Tokens[11], tok::colon, TT_CtorInitializerColon); EXPECT_TOKEN(Tokens[14], tok::l_square, TT_LambdaLSquare); EXPECT_TOKEN(Tokens[16], tok::arrow, TT_TrailingReturnArrow); ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang][ARM] Fix warning for using VFP from interrupts. (PR #91870)
chrisnc wrote: Fixed another release notes conflict. Ping @DavidSpickett @ostannard @jthackray. https://github.com/llvm/llvm-project/pull/91870 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang][ARM] Fix warning for using VFP from interrupts. (PR #91870)
, 25 insertions(+), 8 deletions(-) diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index c7fed20e2bd9a..d9333cfe3c333 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -672,6 +672,8 @@ Improvements to Clang's diagnostics - Clang now shows implicit deduction guides when diagnosing overload resolution failure. #GH92393. +- For the ARM target, calling an interrupt handler from another function is now an error. #GH95359. + Improvements to Clang's time-trace -- diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index a29287153a604..005987c37690a 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -340,6 +340,8 @@ def warn_arm_interrupt_vfp_clobber : Warning< "interrupt service routine with vfp enabled may clobber the " "interruptee's vfp state">, InGroup>; +def err_arm_interrupt_called : Error< + "interrupt service routine cannot be called directly">; def warn_interrupt_attribute_invalid : Warning< "%select{MIPS|MSP430|RISC-V}0 'interrupt' attribute only applies to " "functions that have %select{no parameters|a 'void' return type}1">, diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp index be579be7bf331..38cbef4b375f5 100644 --- a/clang/lib/Sema/SemaExpr.cpp +++ b/clang/lib/Sema/SemaExpr.cpp @@ -6626,9 +6626,15 @@ ExprResult Sema::BuildResolvedCallExpr(Expr *Fn, NamedDecl *NDecl, unsigned BuiltinID = (FDecl ? FDecl->getBuiltinID() : 0); // Functions with 'interrupt' attribute cannot be called directly. - if (FDecl && FDecl->hasAttr()) { -Diag(Fn->getExprLoc(), diag::err_anyx86_interrupt_called); -return ExprError(); + if (FDecl) { +if (FDecl->hasAttr()) { + Diag(Fn->getExprLoc(), diag::err_anyx86_interrupt_called); + return ExprError(); +} +if (FDecl->hasAttr()) { + Diag(Fn->getExprLoc(), diag::err_arm_interrupt_called); + return ExprError(); +} } // X86 interrupt handlers may only call routines with attribute diff --git a/clang/test/Sema/arm-interrupt-attr.c b/clang/test/Sema/arm-interrupt-attr.c index aed2c262b440e..f2698eedacea1 100644 --- a/clang/test/Sema/arm-interrupt-attr.c +++ b/clang/test/Sema/arm-interrupt-attr.c @@ -1,8 +1,10 @@ -// RUN: %clang_cc1 %s -triple arm-none-eabi -DSOFT -verify -fsyntax-only +// RUN: %clang_cc1 %s -triple arm-none-eabi -verify -fsyntax-only // RUN: %clang_cc1 %s -triple arm-none-eabi -target-feature +vfp2 -verify -fsyntax-only -#ifdef SOFT +#ifdef __ARM_FP +__attribute__((interrupt("IRQ"))) void float_irq(void); // expected-warning {{interrupt service routine with vfp enabled may clobber the interruptee's vfp state}} +#else // !defined(__ARM_FP) __attribute__((interrupt("irq"))) void foo1(void) {} // expected-warning {{'interrupt' attribute argument not supported: irq}} __attribute__((interrupt(IRQ))) void foo(void) {} // expected-error {{'interrupt' attribute requires a string}} __attribute__((interrupt("IRQ", 1))) void foo2(void) {} // expected-error {{'interrupt' attribute takes no more than 1 argument}} @@ -14,6 +16,11 @@ __attribute__((interrupt("UNDEF"))) void foo7(void) {} __attribute__((interrupt)) void foo8(void) {} __attribute__((interrupt())) void foo9(void) {} __attribute__((interrupt(""))) void foo10(void) {} -#else -__attribute__((interrupt("IRQ"))) void float_irq(void); // expected-warning {{interrupt service routine with vfp enabled may clobber the interruptee's vfp state}} -#endif + +__attribute__((interrupt("IRQ"))) void callee(void) {} + +void caller(void) +{ +callee(); // expected-error {{interrupt service routine cannot be called directly}} +} +#endif // __ARM_FP ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[jenkinsci/ansible-plugin] 55965e: Bump org.jenkins-ci.plugins:plugin from 4.84 to 4.85
Branch: refs/heads/main Home: https://github.com/jenkinsci/ansible-plugin Commit: 55965e2edd259a1996211e16d05535a4bc0d15e8 https://github.com/jenkinsci/ansible-plugin/commit/55965e2edd259a1996211e16d05535a4bc0d15e8 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: 2024-07-08 (Mon, 08 Jul 2024) Changed paths: M pom.xml Log Message: --- Bump org.jenkins-ci.plugins:plugin from 4.84 to 4.85 Bumps [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) from 4.84 to 4.85. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.84...plugin-4.85) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Commit: bcd419c3512c5edfeac0206a4ffa8e71e21587a4 https://github.com/jenkinsci/ansible-plugin/commit/bcd419c3512c5edfeac0206a4ffa8e71e21587a4 Author: Valentin Delaye Date: 2024-07-09 (Tue, 09 Jul 2024) Changed paths: M pom.xml Log Message: --- Merge pull request #231 from jenkinsci/dependabot/maven/org.jenkins-ci.plugins-plugin-4.85 Bump org.jenkins-ci.plugins:plugin from 4.84 to 4.85 Compare: https://github.com/jenkinsci/ansible-plugin/compare/30f226ce8d48...bcd419c3512c To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/ansible-plugin/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/ansible-plugin/push/refs/heads/main/30f226-bcd419%40github.com.
[clang-tools-extra] [clang-doc] fix paths by hard coding path to share (PR #98099)
https://github.com/PeterChou1 closed https://github.com/llvm/llvm-project/pull/98099 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang-tools-extra] 87d58ab - [clang-doc] fix paths by hard coding path to share (#98099)
Author: PeterChou1 Date: 2024-07-08T23:48:34-04:00 New Revision: 87d58ab22af0627b2c90138713c19b5263b6c132 URL: https://github.com/llvm/llvm-project/commit/87d58ab22af0627b2c90138713c19b5263b6c132 DIFF: https://github.com/llvm/llvm-project/commit/87d58ab22af0627b2c90138713c19b5263b6c132.diff LOG: [clang-doc] fix paths by hard coding path to share (#98099) Added: Modified: clang-tools-extra/clang-doc/tool/CMakeLists.txt Removed: diff --git a/clang-tools-extra/clang-doc/tool/CMakeLists.txt b/clang-tools-extra/clang-doc/tool/CMakeLists.txt index e93a5728d6b6b..601a0460d76b3 100644 --- a/clang-tools-extra/clang-doc/tool/CMakeLists.txt +++ b/clang-tools-extra/clang-doc/tool/CMakeLists.txt @@ -25,7 +25,7 @@ set(assets ) set(asset_dir "${CMAKE_CURRENT_SOURCE_DIR}/../assets") -set(resource_dir "${CMAKE_BINARY_DIR}/share/clang-doc") +set(resource_dir "${LLVM_RUNTIME_OUTPUT_INTDIR}/../share/clang-doc") set(out_files) function(copy_files_to_dst src_dir dst_dir file) _______ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[jenkinsci/locale-plugin] 6af118: Bump org.jenkins-ci.plugins:plugin from 4.84 to 4....
Branch: refs/heads/main Home: https://github.com/jenkinsci/locale-plugin Commit: 6af11835ebeb6129982123b77cdd593a2433914e https://github.com/jenkinsci/locale-plugin/commit/6af11835ebeb6129982123b77cdd593a2433914e Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: 2024-07-09 (Tue, 09 Jul 2024) Changed paths: M pom.xml Log Message: --- Bump org.jenkins-ci.plugins:plugin from 4.84 to 4.85 (#231) Bumps [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) from 4.84 to 4.85. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.84...plugin-4.85) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/locale-plugin/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/locale-plugin/push/refs/heads/main/daabd5-6af118%40github.com.
[jenkinsci/locale-plugin]
Branch: refs/heads/dependabot/maven/io.jenkins.tools.bom-bom-2.452.x-3180.vc1df4d5b_8097 Home: https://github.com/jenkinsci/locale-plugin To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/locale-plugin/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/locale-plugin/push/refs/heads/dependabot/maven/io.jenkins.tools.bom-bom-2.452.x-3180.vc1df4d5b_8097/3b1743-00%40github.com.
[jenkinsci/locale-plugin] daabd5: Bump io.jenkins.tools.bom:bom-2.452.x (#230)
Branch: refs/heads/main Home: https://github.com/jenkinsci/locale-plugin Commit: daabd5813dafafad2eadb33ee3892349b2be8ba0 https://github.com/jenkinsci/locale-plugin/commit/daabd5813dafafad2eadb33ee3892349b2be8ba0 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: 2024-07-09 (Tue, 09 Jul 2024) Changed paths: M pom.xml Log Message: --- Bump io.jenkins.tools.bom:bom-2.452.x (#230) Bumps [io.jenkins.tools.bom:bom-2.452.x](https://github.com/jenkinsci/bom) from 3157.vb_3e8b_8a_d185d to 3180.vc1df4d5b_8097. - [Release notes](https://github.com/jenkinsci/bom/releases) - [Commits](https://github.com/jenkinsci/bom/commits) --- updated-dependencies: - dependency-name: io.jenkins.tools.bom:bom-2.452.x dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/locale-plugin/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/locale-plugin/push/refs/heads/main/77855f-daabd5%40github.com.
[jenkinsci/skip-notifications-trait-plugin] b3315a: Bump io.jenkins.tools.bom:bom-2.452.x
Branch: refs/heads/main Home: https://github.com/jenkinsci/skip-notifications-trait-plugin Commit: b3315a77ea8f59f3f6e9f773aa67ef2fba54d591 https://github.com/jenkinsci/skip-notifications-trait-plugin/commit/b3315a77ea8f59f3f6e9f773aa67ef2fba54d591 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: 2024-07-08 (Mon, 08 Jul 2024) Changed paths: M pom.xml Log Message: --- Bump io.jenkins.tools.bom:bom-2.452.x Bumps [io.jenkins.tools.bom:bom-2.452.x](https://github.com/jenkinsci/bom) from 3157.vb_3e8b_8a_d185d to 3180.vc1df4d5b_8097. - [Release notes](https://github.com/jenkinsci/bom/releases) - [Commits](https://github.com/jenkinsci/bom/commits) --- updated-dependencies: - dependency-name: io.jenkins.tools.bom:bom-2.452.x dependency-type: direct:production ... Signed-off-by: dependabot[bot] Commit: c96cebb1ebe076989d48e0b3e7af5b0b7a52dd17 https://github.com/jenkinsci/skip-notifications-trait-plugin/commit/c96cebb1ebe076989d48e0b3e7af5b0b7a52dd17 Author: Valentin Delaye Date: 2024-07-09 (Tue, 09 Jul 2024) Changed paths: M pom.xml Log Message: --- Merge pull request #195 from jenkinsci/dependabot/maven/io.jenkins.tools.bom-bom-2.452.x-3180.vc1df4d5b_8097 Bump io.jenkins.tools.bom:bom-2.452.x from 3157.vb_3e8b_8a_d185d to 3180.vc1df4d5b_8097 Compare: https://github.com/jenkinsci/skip-notifications-trait-plugin/compare/b7cba5605beb...c96cebb1ebe0 To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/skip-notifications-trait-plugin/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/skip-notifications-trait-plugin/push/refs/heads/main/b7cba5-c96ceb%40github.com.
[jenkinsci/skip-notifications-trait-plugin] 4e8d6b: Bump org.jenkins-ci.plugins:plugin from 4.84 to 4.85
Branch: refs/heads/main Home: https://github.com/jenkinsci/skip-notifications-trait-plugin Commit: 4e8d6bb503c34768b5a94660c518be0541ccbb44 https://github.com/jenkinsci/skip-notifications-trait-plugin/commit/4e8d6bb503c34768b5a94660c518be0541ccbb44 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: 2024-07-08 (Mon, 08 Jul 2024) Changed paths: M pom.xml Log Message: --- Bump org.jenkins-ci.plugins:plugin from 4.84 to 4.85 Bumps [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) from 4.84 to 4.85. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.84...plugin-4.85) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Commit: b7cba5605beb279e5c86144b7a524a92731aa6e3 https://github.com/jenkinsci/skip-notifications-trait-plugin/commit/b7cba5605beb279e5c86144b7a524a92731aa6e3 Author: Valentin Delaye Date: 2024-07-09 (Tue, 09 Jul 2024) Changed paths: M pom.xml Log Message: --- Merge pull request #194 from jenkinsci/dependabot/maven/org.jenkins-ci.plugins-plugin-4.85 Bump org.jenkins-ci.plugins:plugin from 4.84 to 4.85 Compare: https://github.com/jenkinsci/skip-notifications-trait-plugin/compare/310e760835b9...b7cba5605beb To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/skip-notifications-trait-plugin/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/skip-notifications-trait-plugin/push/refs/heads/main/310e76-b7cba5%40github.com.
[jenkinsci/ansible-plugin] 07c0f8: Bump io.jenkins.tools.bom:bom-2.440.x
Branch: refs/heads/main Home: https://github.com/jenkinsci/ansible-plugin Commit: 07c0f8778f87b3580c71e42d70c616f46582d666 https://github.com/jenkinsci/ansible-plugin/commit/07c0f8778f87b3580c71e42d70c616f46582d666 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: 2024-07-08 (Mon, 08 Jul 2024) Changed paths: M pom.xml Log Message: --- Bump io.jenkins.tools.bom:bom-2.440.x Bumps [io.jenkins.tools.bom:bom-2.440.x](https://github.com/jenkinsci/bom) from 3157.vb_3e8b_8a_d185d to 3180.vc1df4d5b_8097. - [Release notes](https://github.com/jenkinsci/bom/releases) - [Commits](https://github.com/jenkinsci/bom/commits) --- updated-dependencies: - dependency-name: io.jenkins.tools.bom:bom-2.440.x dependency-type: direct:production ... Signed-off-by: dependabot[bot] Commit: 30f226ce8d48e0d8e8978cfc0cca6fae66089294 https://github.com/jenkinsci/ansible-plugin/commit/30f226ce8d48e0d8e8978cfc0cca6fae66089294 Author: Valentin Delaye Date: 2024-07-09 (Tue, 09 Jul 2024) Changed paths: M pom.xml Log Message: --- Merge pull request #232 from jenkinsci/dependabot/maven/io.jenkins.tools.bom-bom-2.440.x-3180.vc1df4d5b_8097 Bump io.jenkins.tools.bom:bom-2.440.x from 3157.vb_3e8b_8a_d185d to 3180.vc1df4d5b_8097 Compare: https://github.com/jenkinsci/ansible-plugin/compare/804249487bcd...30f226ce8d48 To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/ansible-plugin/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/ansible-plugin/push/refs/heads/main/804249-30f226%40github.com.
[jenkinsci/jenkins] bbedcb: [JENKINS-73130] Upgrade core from Jetty 10.x to 12...
/util/ListBoxModel.java M core/src/main/java/hudson/util/MultipartFormDataParser.java M core/src/main/java/hudson/util/PluginServletFilter.java M core/src/main/java/jenkins/model/Jenkins.java M core/src/main/java/jenkins/mvn/GlobalSettingsProvider.java M core/src/main/java/jenkins/mvn/SettingsProvider.java M core/src/main/java/jenkins/util/HttpSessionListener.java M core/src/main/java/jenkins/util/groovy/GroovyHookScript.java M test/pom.xml Log Message: --- Move compatibility layer to separate package Compare: https://github.com/jenkinsci/jenkins/compare/6a01c6d2007d...1c5f487aea52 To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/jenkins/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/jenkins/push/refs/heads/jakarta/6a01c6-1c5f48%40github.com.
[clang] [clang] Define ATOMIC_FLAG_INIT correctly for C++. (PR #97534)
chrisnc wrote: ping https://github.com/llvm/llvm-project/pull/97534 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[jenkinsci/analysis-pom-plugin] d9e1a8: Bump net.bytebuddy:byte-buddy from 1.14.17 to 1.14.18
Branch: refs/heads/dependabot/maven/net.bytebuddy-byte-buddy-1.14.18 Home: https://github.com/jenkinsci/analysis-pom-plugin Commit: d9e1a8eb911f56b72bdf6e3a6469fce35812ef5b https://github.com/jenkinsci/analysis-pom-plugin/commit/d9e1a8eb911f56b72bdf6e3a6469fce35812ef5b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: 2024-07-09 (Tue, 09 Jul 2024) Changed paths: M pom.xml Log Message: --- Bump net.bytebuddy:byte-buddy from 1.14.17 to 1.14.18 Bumps [net.bytebuddy:byte-buddy](https://github.com/raphw/byte-buddy) from 1.14.17 to 1.14.18. - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.14.17...byte-buddy-1.14.18) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/analysis-pom-plugin/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/analysis-pom-plugin/push/refs/heads/dependabot/maven/net.bytebuddy-byte-buddy-1.14.18/00-d9e1a8%40github.com.
[clang] [Clang] Fix the order of addInstantiatedParameters in LambdaScopeForCallOperatorInstantiationRAII (PR #97215)
https://github.com/mizvekov approved this pull request. LGTM https://github.com/llvm/llvm-project/pull/97215 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [Coverage] Suppress covmap and profdata for system headers. (PR #97952)
https://github.com/ornata approved this pull request. LGTM https://github.com/llvm/llvm-project/pull/97952 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Adds a pseudonym to clang"s windows mangler... (PR #97792)
https://github.com/memory-thrasher edited https://github.com/llvm/llvm-project/pull/97792 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[jenkins-infra/jenkins-infra] 90d950: chore: Update the `azure-cli` version in the hiera...
Branch: refs/heads/updatecli_production_790bc3d86b9e47c007ac303e2697b7d7ab7f5d66fc4a4ce7cdd4fe95ebb3551d Home: https://github.com/jenkins-infra/jenkins-infra Commit: 90d9507411d64baf6f6bf201db27183b0b25a38c https://github.com/jenkins-infra/jenkins-infra/commit/90d9507411d64baf6f6bf201db27183b0b25a38c Author: Jenkins Infra Bot (updatecli) <60776566+jenkins-infra-...@users.noreply.github.com> Date: 2024-07-09 (Tue, 09 Jul 2024) Changed paths: M hieradata/common.yaml Log Message: --- chore: Update the `azure-cli` version in the hieradata/common.yaml file Made with ❤️️ by updatecli To unsubscribe from these emails, change your notification settings at https://github.com/jenkins-infra/jenkins-infra/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkins-infra/jenkins-infra/push/refs/heads/updatecli_production_790bc3d86b9e47c007ac303e2697b7d7ab7f5d66fc4a4ce7cdd4fe95ebb3551d/00-90d950%40github.com.
[jenkinsci/stapler] 9b9e5f: Move compatibility layer to separate package
Branch: refs/heads/jakarta Home: https://github.com/jenkinsci/stapler Commit: 9b9e5f3ba6a2ad818d76eb12f5f0de187d5304bf https://github.com/jenkinsci/stapler/commit/9b9e5f3ba6a2ad818d76eb12f5f0de187d5304bf Author: Basil Crow Date: 2024-07-08 (Mon, 08 Jul 2024) Changed paths: M core/pom.xml M core/src/main/java/org/kohsuke/stapler/AnnotationHandler.java M core/src/main/java/org/kohsuke/stapler/CompatibleFilter.java M core/src/main/java/org/kohsuke/stapler/Function.java M core/src/main/java/org/kohsuke/stapler/HttpDeletable.java M core/src/main/java/org/kohsuke/stapler/HttpResponse.java M core/src/main/java/org/kohsuke/stapler/StaplerRequest.java M core/src/main/java/org/kohsuke/stapler/StaplerResponse.java M core/src/main/java/org/kohsuke/stapler/WebApp.java M core/src/main/java/org/kohsuke/stapler/interceptor/Interceptor.java Log Message: --- Move compatibility layer to separate package To unsubscribe from these emails, change your notification settings at https://github.com/jenkinsci/stapler/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkinsci/stapler/push/refs/heads/jakarta/bdcbd9-9b9e5f%40github.com.
[clang-tools-extra] Fix Default Asset File locator for clang docs (PR #97505)
STINATION "${CMAKE_INSTALL_DATADIR}/clang-doc" COMPONENT clang-doc) - foreach(config ${CMAKE_CONFIGURATION_TYPES}) - set(resource_dir "${CMAKE_BINARY_DIR}/${config}/share/clang-doc") - copy_files_to_dst(${asset_dir} ${resource_dir} ${f}) - endforeach(config) + if ("${CMAKE_CONFIGURATION_TYPES}" STREQUAL "") + set(resource_dir "${CMAKE_BINARY_DIR}/share/clang-doc") + copy_files_to_dst(${asset_dir} ${resource_dir} ${f}) + else() +foreach(config ${CMAKE_CONFIGURATION_TYPES}) +set(resource_dir "${CMAKE_BINARY_DIR}/${config}/share/clang-doc") +copy_files_to_dst(${asset_dir} ${resource_dir} ${f}) +endforeach(config) + endif() endforeach(f) add_custom_target(copy-clang-doc-assets >From 334dda0bdca872500624727a11fc978d47190e2d Mon Sep 17 00:00:00 2001 From: Joshua Batista Date: Mon, 8 Jul 2024 15:59:24 -0700 Subject: [PATCH 8/9] revert old way of copying things --- clang-tools-extra/clang-doc/tool/CMakeLists.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/clang-tools-extra/clang-doc/tool/CMakeLists.txt b/clang-tools-extra/clang-doc/tool/CMakeLists.txt index 77c620b50addd..78d6dc83e3db3 100644 --- a/clang-tools-extra/clang-doc/tool/CMakeLists.txt +++ b/clang-tools-extra/clang-doc/tool/CMakeLists.txt @@ -33,7 +33,11 @@ function(copy_files_to_dst src_dir dst_dir file) if (NOT EXISTS ${dst_dir}) file(MAKE_DIRECTORY ${dst_dir}) endif() - configure_file(${src} ${dst} COPYONLY) + add_custom_command(OUTPUT ${dst} +DEPENDS ${src} +COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst} +COMMENT "Copying ${file} to ${dst_dir}" + ) list(APPEND out_files ${dst}) set(out_files ${out_files} PARENT_SCOPE) endfunction(copy_files_to_dst) >From 356f47ffbb6f7b86592bf802c23316e527237806 Mon Sep 17 00:00:00 2001 From: Joshua Batista Date: Mon, 8 Jul 2024 19:47:43 -0700 Subject: [PATCH 9/9] remove unnecessary dir check code --- clang-tools-extra/clang-doc/tool/CMakeLists.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/clang-tools-extra/clang-doc/tool/CMakeLists.txt b/clang-tools-extra/clang-doc/tool/CMakeLists.txt index 78d6dc83e3db3..a30c6677ad1e8 100644 --- a/clang-tools-extra/clang-doc/tool/CMakeLists.txt +++ b/clang-tools-extra/clang-doc/tool/CMakeLists.txt @@ -30,9 +30,6 @@ set(out_files) function(copy_files_to_dst src_dir dst_dir file) set(src "${src_dir}/${file}") set(dst "${dst_dir}/${file}") - if (NOT EXISTS ${dst_dir}) -file(MAKE_DIRECTORY ${dst_dir}) - endif() add_custom_command(OUTPUT ${dst} DEPENDS ${src} COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst} ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [mlir] [MLIR] Add f8E4M3 IEEE 754 type (PR #97118)
@@ -6532,6 +6534,34 @@ TEST(APFloatTest, Float8E5M2ToDouble) { EXPECT_TRUE(std::isnan(QNaN.convertToDouble())); } +TEST(APFloatTest, Float8E4M3ToDouble) { + APFloat One(APFloat::Float8E4M3(), "1.0"); + EXPECT_EQ(1.0, One.convertToDouble()); + APFloat Two(APFloat::Float8E4M3(), "2.0"); + EXPECT_EQ(2.0, Two.convertToDouble()); + APFloat PosLargest = APFloat::getLargest(APFloat::Float8E4M3(), false); + EXPECT_EQ(240.0F, PosLargest.convertToDouble()); + APFloat NegLargest = APFloat::getLargest(APFloat::Float8E4M3(), true); + EXPECT_EQ(-240.0F, NegLargest.convertToDouble()); + APFloat PosSmallest = + APFloat::getSmallestNormalized(APFloat::Float8E4M3(), false); + EXPECT_EQ(0x1.p-6, PosSmallest.convertToDouble()); + APFloat NegSmallest = + APFloat::getSmallestNormalized(APFloat::Float8E4M3(), true); + EXPECT_EQ(-0x1.p-6, NegSmallest.convertToDouble()); makslevental wrote: Sanity check: this test is basically exactly the same as above except with exponent adjusted? https://github.com/llvm/llvm-project/pull/97118 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [mlir] [MLIR] Add f8E4M3 IEEE 754 type (PR #97118)
@@ -460,10 +460,10 @@ class alignas(void *) Stmt { unsigned : NumExprBits; static_assert( -llvm::APFloat::S_MaxSemantics < 16, -"Too many Semantics enum values to fit in bitfield of size 4"); +llvm::APFloat::S_MaxSemantics < 32, +"Too many Semantics enum values to fit in bitfield of size 5"); LLVM_PREFERRED_TYPE(llvm::APFloat::Semantics) -unsigned Semantics : 4; // Provides semantics for APFloat construction makslevental wrote: Didn't I see this in another PR you sent? If not, is there a way to separate this into PRs for LLVM/Clang and PRs for MLIR? https://github.com/llvm/llvm-project/pull/97118 _______ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [mlir] [MLIR] Add f8E4M3 IEEE 754 type (PR #97118)
@@ -136,6 +136,7 @@ static constexpr fltSemantics semIEEEquad = {16383, -16382, 113, 128}; static constexpr fltSemantics semFloat8E5M2 = {15, -14, 3, 8}; static constexpr fltSemantics semFloat8E5M2FNUZ = { 15, -15, 3, 8, fltNonfiniteBehavior::NanOnly, fltNanEncoding::NegativeZero}; +static constexpr fltSemantics semFloat8E4M3 = {7, -6, 4, 8}; makslevental wrote: Just sanity checking: this is ``` maxExponent = 7 minExponent = -6 precision = 4 sizeInBits = 8 ``` ? https://github.com/llvm/llvm-project/pull/97118 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [mlir] [MLIR] Add f8E4M3 IEEE 754 type (PR #97118)
https://github.com/makslevental commented: Man talk about boiler plate . Anyway this all looks basically fine. Except for the one ask about splitting this up I think I can approve (modulo the tests passing). I'll double check tomorrow on a bigger screen (currently on my laptop) so I can make sure everything lines up with the copy-pasted tests. https://github.com/llvm/llvm-project/pull/97118 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [mlir] [MLIR] Add f8E4M3 IEEE 754 type (PR #97118)
https://github.com/makslevental edited https://github.com/llvm/llvm-project/pull/97118 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Fix erroneous `-Wmissing-prototypes` for Win32 entry points (PR #98105)
ang now shows implicit deduction guides when diagnosing overload resolution failure. #GH92393. +- Clong no longer emits a no previous prototype warning for Win32 entry points under ``-Wmissing-prototypes``. + Fixes #GH94366. + Improvements to Clang's time-trace -- ___________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Fix erroneous `-Wmissing-prototypes` for Win32 entry points (PR #98105)
https://github.com/MaxEW707 updated https://github.com/llvm/llvm-project/pull/98105 >From f9def27dcbfe6ce1a55fd5c41d15d55b05d9a056 Mon Sep 17 00:00:00 2001 From: MaxEW707 Date: Mon, 8 Jul 2024 19:14:11 -0700 Subject: [PATCH 1/3] Fix erroneous `-Wmissing-prototypes` for Win32 entry points --- clang/lib/Sema/SemaDecl.cpp | 3 +++ clang/test/Sema/no-warn-missing-prototype.c | 27 +++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index b3bfdacb01790..b4d8d653616b1 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -15214,6 +15214,9 @@ ShouldWarnAboutMissingPrototype(const FunctionDecl *FD, if (II->isStr("main") || II->isStr("efi_main")) return false; + if (FD->isMSVCRTEntryPoint()) +return false; + // Don't warn about inline functions. if (FD->isInlined()) return false; diff --git a/clang/test/Sema/no-warn-missing-prototype.c b/clang/test/Sema/no-warn-missing-prototype.c index 6059b6aa0f146..577718c928e59 100644 --- a/clang/test/Sema/no-warn-missing-prototype.c +++ b/clang/test/Sema/no-warn-missing-prototype.c @@ -1,10 +1,33 @@ // RUN: %clang_cc1 -fsyntax-only -Wmissing-prototypes -x c -ffreestanding -verify %s // RUN: %clang_cc1 -fsyntax-only -Wmissing-prototypes -x c++ -ffreestanding -verify %s +// RUN: %clang_cc1 -fms-compatibility -fsyntax-only -x c++ -ffreestanding -triple=x86_64-pc-win32 -verify -DMS %s // expected-no-diagnostics int main() { - return 0; +return 0; } int efi_main() { - return 0; +return 0; } + +#ifdef MS +int wmain(int, wchar_t *[], wchar_t *[]) +{ +return 0; +} + +int wWinMain(void*, void*, wchar_t*, int) +{ +return 0; +} + +int WinMain(void*, void*, char*, int) +{ +return 0; +} + +bool DllMain(void*, unsigned, void*) +{ +return true; +} +#endif \ No newline at end of file >From 1143a06a4b4b7f435c19325bd3b2253cde02372c Mon Sep 17 00:00:00 2001 From: MaxEW707 Date: Mon, 8 Jul 2024 19:19:07 -0700 Subject: [PATCH 2/3] formatting --- clang/test/Sema/no-warn-missing-prototype.c | 26 + 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/clang/test/Sema/no-warn-missing-prototype.c b/clang/test/Sema/no-warn-missing-prototype.c index 577718c928e59..1b6e8f059fc45 100644 --- a/clang/test/Sema/no-warn-missing-prototype.c +++ b/clang/test/Sema/no-warn-missing-prototype.c @@ -3,31 +3,27 @@ // RUN: %clang_cc1 -fms-compatibility -fsyntax-only -x c++ -ffreestanding -triple=x86_64-pc-win32 -verify -DMS %s // expected-no-diagnostics int main() { -return 0; + return 0; } int efi_main() { -return 0; + return 0; } #ifdef MS -int wmain(int, wchar_t *[], wchar_t *[]) -{ -return 0; +int wmain(int, wchar_t *[], wchar_t *[]) { + return 0; } -int wWinMain(void*, void*, wchar_t*, int) -{ -return 0; +int wWinMain(void*, void*, wchar_t*, int) { + return 0; } -int WinMain(void*, void*, char*, int) -{ -return 0; +int WinMain(void*, void*, char*, int) { + return 0; } -bool DllMain(void*, unsigned, void*) -{ -return true; +bool DllMain(void*, unsigned, void* { + return true; } -#endif \ No newline at end of file +#endif >From bc40af777e31df856de3c68fe749311c8011f21f Mon Sep 17 00:00:00 2001 From: MaxEW707 Date: Mon, 8 Jul 2024 19:26:29 -0700 Subject: [PATCH 3/3] fix unit test --- clang/test/Sema/no-warn-missing-prototype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/test/Sema/no-warn-missing-prototype.c b/clang/test/Sema/no-warn-missing-prototype.c index 1b6e8f059fc45..17d69ac8913fa 100644 --- a/clang/test/Sema/no-warn-missing-prototype.c +++ b/clang/test/Sema/no-warn-missing-prototype.c @@ -1,6 +1,6 @@ // RUN: %clang_cc1 -fsyntax-only -Wmissing-prototypes -x c -ffreestanding -verify %s // RUN: %clang_cc1 -fsyntax-only -Wmissing-prototypes -x c++ -ffreestanding -verify %s -// RUN: %clang_cc1 -fms-compatibility -fsyntax-only -x c++ -ffreestanding -triple=x86_64-pc-win32 -verify -DMS %s +// RUN: %clang_cc1 -fms-compatibility -fsyntax-only -Wmissing-prototypes -x c++ -ffreestanding -triple=x86_64-pc-win32 -verify -DMS %s // expected-no-diagnostics int main() { return 0; @@ -23,7 +23,7 @@ int WinMain(void*, void*, char*, int) { return 0; } -bool DllMain(void*, unsigned, void* { +bool DllMain(void*, unsigned, void*) { return true; } #endif ___________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Fix erroneous `-Wmissing-prototypes` for Win32 entry points (PR #98105)
llvmbot wrote: @llvm/pr-subscribers-clang Author: Max Winkler (MaxEW707) Changes Fixes https://github.com/llvm/llvm-project/issues/94366. --- Full diff: https://github.com/llvm/llvm-project/pull/98105.diff 2 Files Affected: - (modified) clang/lib/Sema/SemaDecl.cpp (+3) - (modified) clang/test/Sema/no-warn-missing-prototype.c (+19) ``diff diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index b3bfdacb01790..b4d8d653616b1 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -15214,6 +15214,9 @@ ShouldWarnAboutMissingPrototype(const FunctionDecl *FD, if (II->isStr("main") || II->isStr("efi_main")) return false; + if (FD->isMSVCRTEntryPoint()) +return false; + // Don't warn about inline functions. if (FD->isInlined()) return false; diff --git a/clang/test/Sema/no-warn-missing-prototype.c b/clang/test/Sema/no-warn-missing-prototype.c index 6059b6aa0f146..1b6e8f059fc45 100644 --- a/clang/test/Sema/no-warn-missing-prototype.c +++ b/clang/test/Sema/no-warn-missing-prototype.c @@ -1,5 +1,6 @@ // RUN: %clang_cc1 -fsyntax-only -Wmissing-prototypes -x c -ffreestanding -verify %s // RUN: %clang_cc1 -fsyntax-only -Wmissing-prototypes -x c++ -ffreestanding -verify %s +// RUN: %clang_cc1 -fms-compatibility -fsyntax-only -x c++ -ffreestanding -triple=x86_64-pc-win32 -verify -DMS %s // expected-no-diagnostics int main() { return 0; @@ -8,3 +9,21 @@ int main() { int efi_main() { return 0; } + +#ifdef MS +int wmain(int, wchar_t *[], wchar_t *[]) { + return 0; +} + +int wWinMain(void*, void*, wchar_t*, int) { + return 0; +} + +int WinMain(void*, void*, char*, int) { + return 0; +} + +bool DllMain(void*, unsigned, void* { + return true; +} +#endif `` https://github.com/llvm/llvm-project/pull/98105 _______ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Fix erroneous `-Wmissing-prototypes` for Win32 entry points (PR #98105)
https://github.com/MaxEW707 created https://github.com/llvm/llvm-project/pull/98105 Fixes https://github.com/llvm/llvm-project/issues/94366. >From f9def27dcbfe6ce1a55fd5c41d15d55b05d9a056 Mon Sep 17 00:00:00 2001 From: MaxEW707 Date: Mon, 8 Jul 2024 19:14:11 -0700 Subject: [PATCH 1/2] Fix erroneous `-Wmissing-prototypes` for Win32 entry points --- clang/lib/Sema/SemaDecl.cpp | 3 +++ clang/test/Sema/no-warn-missing-prototype.c | 27 +++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index b3bfdacb01790..b4d8d653616b1 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -15214,6 +15214,9 @@ ShouldWarnAboutMissingPrototype(const FunctionDecl *FD, if (II->isStr("main") || II->isStr("efi_main")) return false; + if (FD->isMSVCRTEntryPoint()) +return false; + // Don't warn about inline functions. if (FD->isInlined()) return false; diff --git a/clang/test/Sema/no-warn-missing-prototype.c b/clang/test/Sema/no-warn-missing-prototype.c index 6059b6aa0f146..577718c928e59 100644 --- a/clang/test/Sema/no-warn-missing-prototype.c +++ b/clang/test/Sema/no-warn-missing-prototype.c @@ -1,10 +1,33 @@ // RUN: %clang_cc1 -fsyntax-only -Wmissing-prototypes -x c -ffreestanding -verify %s // RUN: %clang_cc1 -fsyntax-only -Wmissing-prototypes -x c++ -ffreestanding -verify %s +// RUN: %clang_cc1 -fms-compatibility -fsyntax-only -x c++ -ffreestanding -triple=x86_64-pc-win32 -verify -DMS %s // expected-no-diagnostics int main() { - return 0; +return 0; } int efi_main() { - return 0; +return 0; } + +#ifdef MS +int wmain(int, wchar_t *[], wchar_t *[]) +{ +return 0; +} + +int wWinMain(void*, void*, wchar_t*, int) +{ +return 0; +} + +int WinMain(void*, void*, char*, int) +{ +return 0; +} + +bool DllMain(void*, unsigned, void*) +{ +return true; +} +#endif \ No newline at end of file >From 1143a06a4b4b7f435c19325bd3b2253cde02372c Mon Sep 17 00:00:00 2001 From: MaxEW707 Date: Mon, 8 Jul 2024 19:19:07 -0700 Subject: [PATCH 2/2] formatting --- clang/test/Sema/no-warn-missing-prototype.c | 26 + 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/clang/test/Sema/no-warn-missing-prototype.c b/clang/test/Sema/no-warn-missing-prototype.c index 577718c928e59..1b6e8f059fc45 100644 --- a/clang/test/Sema/no-warn-missing-prototype.c +++ b/clang/test/Sema/no-warn-missing-prototype.c @@ -3,31 +3,27 @@ // RUN: %clang_cc1 -fms-compatibility -fsyntax-only -x c++ -ffreestanding -triple=x86_64-pc-win32 -verify -DMS %s // expected-no-diagnostics int main() { -return 0; + return 0; } int efi_main() { -return 0; + return 0; } #ifdef MS -int wmain(int, wchar_t *[], wchar_t *[]) -{ -return 0; +int wmain(int, wchar_t *[], wchar_t *[]) { + return 0; } -int wWinMain(void*, void*, wchar_t*, int) -{ -return 0; +int wWinMain(void*, void*, wchar_t*, int) { + return 0; } -int WinMain(void*, void*, char*, int) -{ -return 0; +int WinMain(void*, void*, char*, int) { + return 0; } -bool DllMain(void*, unsigned, void*) -{ -return true; +bool DllMain(void*, unsigned, void* { + return true; } -#endif \ No newline at end of file +#endif ___________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[Lldb-commits] [lldb] [lldb] Put the new debugger in synchronous mode in TestGlobalModuleCache (PR #98041)
https://github.com/JDevlieghere approved this pull request. https://github.com/llvm/llvm-project/pull/98041 ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] [lldb] Correct invalid format style (PR #98089)
https://github.com/JDevlieghere approved this pull request. https://github.com/llvm/llvm-project/pull/98089 ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
@@ -470,13 +892,15 @@ void SemaHLSL::handleResourceBindingAttr(Decl *D, const ParsedAttr ) { // Validate. if (!Slot.empty()) { switch (Slot[0]) { +case 't': case 'u': case 'b': case 's': -case 't': +case 'c': +case 'i': break; default: - Diag(ArgLoc, diag::err_hlsl_unsupported_register_type) + Diag(ArgLoc, diag::err_hlsl_unsupported_register_type_and_resource_type) bob80905 wrote: Test added in resource_binding_attr_error.hlsl https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang] Support --sysroot= for ${arch}-windows-msvc targets (PR #96417)
YSROOT:[^"]+]]" +// COMPILE_X86_64_STL_LINK: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/x86_64-unknown-windows-msvc/c++/stl" +// COMPILE_X86_64_STL_LINK: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/stl" +// COMPILE_X86_64_STL_LINK: link.exe{{.*}}" "-libpath:[[SYSROOT:[^"]+]]/lib/x86_64-unknown-windows-msvc" "-libpath:[[SYSROOT:[^"]+]]/lib" + +// RUN: %clangxx --target=loongarch64-unknown-windows-msvc -stdlib=libc++ -### \ +// RUN: --sysroot=%S/Inputs/basic_linux_libcxx_tree/usr %s 2>&1 \ +// RUN: | FileCheck --check-prefix=COMPILE_LOONGARCH64_LIBCXX_LINK %s +// COMPILE_LOONGARCH64_LIBCXX_LINK: clang{{.*}}" "-cc1" +// COMPILE_LOONGARCH64_LIBCXX_LINK: "-isysroot" "[[SYSROOT:[^"]+]]" +// COMPILE_LOONGARCH64_LIBCXX_LINK: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/loongarch64-unknown-windows-msvc/c++/v1" +// COMPILE_LOONGARCH64_LIBCXX_LINK: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/v1" +// COMPILE_LOONGARCH64_LIBCXX_LINK: link.exe{{.*}}" "-libpath:[[SYSROOT:[^"]+]]/lib/loongarch64-unknown-windows-msvc" "-libpath:[[SYSROOT:[^"]+]]/lib" + +// RUN: %clangxx --target=riscv64-unknown-windows-msvc -### --stdlib=libstdc++ %s 2>&1 \ +// RUN: --sysroot=%S/Inputs/basic_linux_libstdcxx_libcxxv2_tree/usr \ +// RUN: | FileCheck -check-prefix=COMPILE_RISCV64_LIBSTDCXX_LINK %s +// COMPILE_RISCV64_LIBSTDCXX_LINK: "-cc1" +// COMPILE_RISCV64_LIBSTDCXX_LINK: "-resource-dir" "[[RESOURCE_DIR:[^"]*]]" +// COMPILE_RISCV64_LIBSTDCXX_LINK: "-isysroot" "[[SYSROOT:[^"]+]]" +// COMPILE_RISCV64_LIBSTDCXX_LINK: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/4.8/riscv64-unknown-windows-msvc" +// COMPILE_RISCV64_LIBSTDCXX_LINK: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/4.8" +// COMPILE_RISCV64_LIBSTDCXX_LINK: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/4.8/backward" +// COMPILE_RISCV64_LIBSTDCXX_LINK: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|)}}include" +// COMPILE_RISCV64_LIBSTDCXX_LINK: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/riscv64-unknown-windows-msvc" +// COMPILE_RISCV64_LIBSTDCXX_LINK: "-internal-isystem" "[[SYSROOT:[^"]+]]/include" +// COMPILE_RISCV64_LIBSTDCXX_LINK: link.exe{{.*}}" "-libpath:[[SYSROOT:[^"]+]]/lib/riscv64-unknown-windows-msvc" "-libpath:[[SYSROOT:[^"]+]]/lib" diff --git a/clang/test/Driver/wasm-toolchain.cpp b/clang/test/Driver/wasm-toolchain.cpp index ba1c55b33edca..203e3d0d99a3e 100644 --- a/clang/test/Driver/wasm-toolchain.cpp +++ b/clang/test/Driver/wasm-toolchain.cpp @@ -86,3 +86,15 @@ // COMPILE_STDCXX: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|)}}include" // COMPILE_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/wasm32-wasi" // COMPILE_STDCXX: "-internal-isystem" "[[SYSROOT:[^"]+]]/include" + +// RUN: %clangxx -### --target=wasm32-wasi --stdlib=stl %s 2>&1 \ +// RUN: --sysroot=%S \ +// RUN: | FileCheck -check-prefix=COMPILE_STL %s +// COMPILE_STL: "-cc1" +// COMPILE_STL: "-resource-dir" "[[RESOURCE_DIR:[^"]*]]" +// COMPILE_STL: "-isysroot" "[[SYSROOT:[^"]+]]" +// COMPILE_STL: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/wasm32-wasi/c++/stl" +// COMPILE_STL: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/c++/stl" +// COMPILE_STL: "-internal-isystem" "[[RESOURCE_DIR]]{{(/|)}}include" +// COMPILE_STL: "-internal-isystem" "[[SYSROOT:[^"]+]]/include/wasm32-wasi" +// COMPILE_STL: "-internal-isystem" "[[SYSROOT:[^"]+]]/include" \ No newline at end of file ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[Lldb-commits] [lldb] [lldb] Change lldb's breakpoint handling behavior (PR #96260)
jasonmolenda wrote: Thanks again for all the help @AlexK0 I pushed an update that should compile correctly with my update. It's great to hear that the testsuite looks clean -- that's the part that worried me the most about these changes. I finished an aarch64 Ubuntu testsuite run and it is clean. I think this patch is about ready for review by @jimingham when he has time. https://github.com/llvm/llvm-project/pull/96260 ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [lldb] [lldb] Change lldb's breakpoint handling behavior (PR #96260)
https://github.com/jasonmolenda updated https://github.com/llvm/llvm-project/pull/96260 >From 9b541e6a035635e26c6a24eca022de8552fa4c17 Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Thu, 20 Jun 2024 17:53:17 -0700 Subject: [PATCH 1/6] [lldb] Change lldb's breakpoint handling behavior lldb today has two rules: When a thread stops at a BreakpointSite, we set the thread's StopReason to be "breakpoint hit" (regardless if we've actually hit the breakpoint, or if we've merely stopped *at* the breakpoint instruction/point and haven't tripped it yet). And second, when resuming a process, any thread sitting at a BreakpointSite is silently stepped over the BreakpointSite -- because we've already flagged the breakpoint hit when we stopped there originally. In this patch, I change lldb to only set a thread's stop reason to breakpoint-hit when we've actually executed the instruction/triggered the breakpoint. When we resume, we only silently step past a BreakpointSite that we've registered as hit. We preserve this state across inferior function calls that the user may do while stopped, etc. Also, when a user adds a new breakpoint at $pc while stopped, or changes $pc to be the address of a BreakpointSite, we will silently step past that breakpoint when the process resumes. This is purely a UX call, I don't think there's any person who wants to set a breakpoint at $pc and then hit it immediately on resuming. One non-intuitive UX from this change, but I'm convinced it is necessary: If you're stopped at a BreakpointSite that has not yet executed, you `stepi`, you will hit the breakpoint and the pc will not yet advance. This thread has not completed its stepi, and the thread plan is still on the stack. If you then `continue` the thread, lldb will now stop and say, "instruction step completed", one instruction past the BreakpointSite. You can continue a second time to resume execution. I discussed this with Jim, and trying to paper over this behavior will lead to more complicated scenarios behaving non-intuitively. And mostly it's the testsuite that was trying to instruction step past a breakpoint and getting thrown off -- and I changed those tests to expect the new behavior. The bugs driving this change are all from lldb dropping the real stop reason for a thread and setting it to breakpoint-hit when that was not the case. Jim hit one where we have an aarch64 watchpoint that triggers one instruction before a BreakpointSite. On this arch we are notified of the watchpoint hit after the instruction has been unrolled -- we disable the watchpoint, instruction step, re-enable the watchpoint and collect the new value. But now we're on a BreakpointSite so the watchpoint-hit stop reason is lost. Another was reported by ZequanWu in https://discourse.llvm.org/t/lldb-unable-to-break-at-start/78282 we attach to/launch a process with the pc at a BreakpointSite and misbehave. Caroline Tice mentioned it is also a problem they've had with putting a breakpoint on _dl_debug_state. The change to each Process plugin that does execution control is that 1. If we've stopped at a BreakpointSite (whether we hit it or not), we call Thread::SetThreadStoppedAtBreakpointSite(pc) to record the state at the point when the thread stopped. (so we can detect newly-added breakpoints, or when the pc is changed to an instruction that is a BreakpointSite) 2. When we have actually hit a breakpoint, and it is enabled for this thread, we call Thread::SetThreadHitBreakpointAtAddr(pc) so we know that it should be silently stepped past when we resume execution. When resuming, we silently step over a breakpoint if we've hit it, or if it is newly added (or the pc was changed to an existing BreakpointSite). The biggest set of changes is to StopInfoMachException where we translate a Mach Exception into a stop reason. The Mach exception codes differ in a few places depending on the target (unambiguously), and I didn't want to duplicate the new code for each target so I've tested what mach exceptions we get for each action on each target, and reorganized StopInfoMachException::CreateStopReasonWithMachException to document these possible values, and handle them without specializing based on the target arch. rdar://123942164 --- lldb/include/lldb/Target/Thread.h | 29 ++ .../Process/Utility/StopInfoMachException.cpp | 296 +++--- .../Process/Windows/Common/ProcessWindows.cpp | 16 +- .../Process/gdb-remote/ProcessGDBRemote.cpp | 118 +++ .../Process/scripted/ScriptedThread.cpp | 9 + lldb/source/Target/Thread.cpp | 17 +- .../TestConsecutiveBreakpoints.py | 26 +- .../TestStepOverBreakpoint.py | 6 +- 8 files changed, 235 insertions(+), 282 deletions(-) diff --git a/lldb/include/lldb/Target/Thread.h b/lldb/include/lldb/Target/Thread.h index c17bddf4d98b8..1e1aead896018 100644 --- a/lldb/include/lldb/Target/Thread.h +++
[clang] [llvm] [AsmPrinter] Don't check for inlineasm dialect on non-X86 platforms (PR #98097)
https://github.com/dtellenbach edited https://github.com/llvm/llvm-project/pull/98097 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [AsmPrinter] Don't check for inlineasm dialect on non-X86 platforms (PR #98097)
@@ -0,0 +1,23 @@ +// REQUIRES: aarch64-registered-target dtellenbach wrote: Yep, seems like I accidentally added a new folder. Targets other than AArch64 and Arm use a subfolder but still rely on `REQUIRES`. AArch64 just dumps everything into the top-level test folder and thus have to rely on `REQUIRES`. I now move the test up to `test/CodeGen` and stick with `REQUIRES`. Should be reworked but not in this patch. https://github.com/llvm/llvm-project/pull/98097 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [AsmPrinter] Don't check for inlineasm dialect on non-X86 platforms (PR #98097)
https://github.com/dtellenbach updated https://github.com/llvm/llvm-project/pull/98097 >From 46e32d1156e38653c79682600fbf63d964277dba Mon Sep 17 00:00:00 2001 From: David Tellenbach Date: Mon, 8 Jul 2024 16:04:18 -0700 Subject: [PATCH 1/2] [AsmPrinter] Don't check for inlineasm dialect on non-X86 platforms AArch64 uses MCAsmInfo::AssemblerDialect to control the style of emitted Neon assembly. E.g. Apple platforms use AsmWriterVariantTy::Apple by default which collides with InlineAsm::AD_Intel (both value 1). Checking for inlineasm dialects on non-X86 platforms can thus lead to problems. --- clang/test/CodeGen/AArch64/inline-asm-ios.c | 23 +++ .../AsmPrinter/AsmPrinterInlineAsm.cpp| 14 +++ 2 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 clang/test/CodeGen/AArch64/inline-asm-ios.c diff --git a/clang/test/CodeGen/AArch64/inline-asm-ios.c b/clang/test/CodeGen/AArch64/inline-asm-ios.c new file mode 100644 index 0..5e7328a15f69d --- /dev/null +++ b/clang/test/CodeGen/AArch64/inline-asm-ios.c @@ -0,0 +1,23 @@ +// REQUIRES: aarch64-registered-target +// RUN: %clang_cc1 -triple arm64-apple-ios -S -o - %s | FileCheck %s + +// CHECK: _restartable_function: +// CHECK-NEXT: ldr x11, [x0] +// CHECK-NEXT: add x11, x11, #1 +// CHECK-NEXT: str x11, [x0] +// CHECK-NEXT: Ltmp0: +// CHECK-NEXT: b Ltmp0 +// CHECK-NEXT: LExit_restartable_function: +// CHECK-NEXT: ret +asm(".align 4\n" +".text\n" +".private_extern _restartable_function\n" +"_restartable_function:\n" +"ldrx11, [x0]\n" +"addx11, x11, #1\n" +"strx11, [x0]\n" +"1:\n" +"b 1b\n" +"LExit_restartable_function:\n" +"ret\n" +); diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp index 5a7013c964cb4..6fe8d0e0af995 100644 --- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp @@ -113,12 +113,16 @@ void AsmPrinter::emitInlineAsm(StringRef Str, const MCSubtargetInfo , if (!TAP) report_fatal_error("Inline asm not supported by this streamer because" " we don't have an asm parser for this target\n"); - Parser->setAssemblerDialect(Dialect); + + // Respect inlineasm dialect on X86 targets only + if (TM.getTargetTriple().isX86()) { +Parser->setAssemblerDialect(Dialect); +// Enable lexing Masm binary and hex integer literals in intel inline +// assembly. +if (Dialect == InlineAsm::AD_Intel) + Parser->getLexer().setLexMasmIntegers(true); + } Parser->setTargetParser(*TAP); - // Enable lexing Masm binary and hex integer literals in intel inline - // assembly. - if (Dialect == InlineAsm::AD_Intel) -Parser->getLexer().setLexMasmIntegers(true); emitInlineAsmStart(); // Don't implicitly switch to the text section before the asm. >From ca81fa117841a551702d678a6402a3bd98e85f2b Mon Sep 17 00:00:00 2001 From: David Tellenbach Date: Mon, 8 Jul 2024 18:38:32 -0700 Subject: [PATCH 2/2] Move test up into clang/test/CodeGen instead of target specific folder --- .../CodeGen/{AArch64/inline-asm-ios.c => aarch64-inlineasm-ios.c} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename clang/test/CodeGen/{AArch64/inline-asm-ios.c => aarch64-inlineasm-ios.c} (100%) diff --git a/clang/test/CodeGen/AArch64/inline-asm-ios.c b/clang/test/CodeGen/aarch64-inlineasm-ios.c similarity index 100% rename from clang/test/CodeGen/AArch64/inline-asm-ios.c rename to clang/test/CodeGen/aarch64-inlineasm-ios.c ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[jenkins-infra/account-app] 82ab00: Update jetty Docker tag to v10.0.22
Branch: refs/heads/renovate/jetty-10.x Home: https://github.com/jenkins-infra/account-app Commit: 82ab00457622690af35b4b9a5e60cdcc0376ac8f https://github.com/jenkins-infra/account-app/commit/82ab00457622690af35b4b9a5e60cdcc0376ac8f Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: 2024-07-09 (Tue, 09 Jul 2024) Changed paths: M Dockerfile Log Message: --- Update jetty Docker tag to v10.0.22 To unsubscribe from these emails, change your notification settings at https://github.com/jenkins-infra/account-app/settings/notifications -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/jenkinsci-commits/jenkins-infra/account-app/push/refs/heads/renovate/jetty-10.x/00-82ab00%40github.com.
[clang] [clang] fix sema init crash for not checking a ExprResult (PR #98102)
@@ -5576,6 +5576,10 @@ static void TryOrBuildParenListInitialization( ExprResult ER; ER = IS.Perform(S, SubEntity, SubKind, Arg ? MultiExprArg(Arg) : std::nullopt); + + if (ER.IsInvalid()) +return false; + if (InitExpr) *InitExpr = ER.get(); yuxuanchen1997 wrote: ER.get() is null if we don't apply this fix. https://github.com/llvm/llvm-project/pull/98102 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang] fix sema init crash for not checking a ExprResult (PR #98102)
llvmbot wrote: @llvm/pr-subscribers-clang Author: Yuxuan Chen (yuxuanchen1997) Changes We ran into a FE crash and root caused to `ER.get()` on line 5584 here being nullptr. I think this is a result of not checking if ER here is invalid. We have been using automated reduction tools (like CReduce) for a while and it is not performing well and would like to ask upstream opinions on whether this condition here is handled correctly. Preferably with help to write a small, well contained crash-on-valid test case. I do have a crash-on-invalid test [here](https://gist.github.com/yuxuanchen1997/2bbfc1b9d78fe43ed8784a5db11eac98), would really appreciate any pointers. --- Full diff: https://github.com/llvm/llvm-project/pull/98102.diff 1 Files Affected: - (modified) clang/lib/Sema/SemaInit.cpp (+4) ``diff diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 41753a1661ace..80286302e9b9d 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -5576,6 +5576,10 @@ static void TryOrBuildParenListInitialization( ExprResult ER; ER = IS.Perform(S, SubEntity, SubKind, Arg ? MultiExprArg(Arg) : std::nullopt); + + if (ER.IsInvalid()) +return false; + if (InitExpr) *InitExpr = ER.get(); else `` https://github.com/llvm/llvm-project/pull/98102 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [clang] fix sema init crash for not checking a ExprResult (PR #98102)
https://github.com/yuxuanchen1997 created https://github.com/llvm/llvm-project/pull/98102 We ran into a FE crash and root caused to `ER.get()` on line 5584 here being nullptr. I think this is a result of not checking if ER here is invalid. We have been using automated reduction tools (like CReduce) for a while and it is not performing well and would like to ask upstream opinions on whether this condition here is handled correctly. Preferably with help to write a small, well contained crash-on-valid test case. I do have a crash-on-invalid test [here](https://gist.github.com/yuxuanchen1997/2bbfc1b9d78fe43ed8784a5db11eac98), would really appreciate any pointers. >From 82e3cb025e8eafdae5f7ee42fc9d14235d5b Mon Sep 17 00:00:00 2001 From: Yuxuan Chen Date: Mon, 8 Jul 2024 18:16:17 -0700 Subject: [PATCH] [clang] fix sema init crash for not checking a ExprResult --- clang/lib/Sema/SemaInit.cpp | 4 1 file changed, 4 insertions(+) diff --git a/clang/lib/Sema/SemaInit.cpp b/clang/lib/Sema/SemaInit.cpp index 41753a1661ace..80286302e9b9d 100644 --- a/clang/lib/Sema/SemaInit.cpp +++ b/clang/lib/Sema/SemaInit.cpp @@ -5576,6 +5576,10 @@ static void TryOrBuildParenListInitialization( ExprResult ER; ER = IS.Perform(S, SubEntity, SubKind, Arg ? MultiExprArg(Arg) : std::nullopt); + + if (ER.IsInvalid()) +return false; + if (InitExpr) *InitExpr = ER.get(); else ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
@@ -470,13 +892,15 @@ void SemaHLSL::handleResourceBindingAttr(Decl *D, const ParsedAttr ) { // Validate. if (!Slot.empty()) { switch (Slot[0]) { +case 't': case 'u': case 'b': case 's': -case 't': +case 'c': +case 'i': break; default: - Diag(ArgLoc, diag::err_hlsl_unsupported_register_type) + Diag(ArgLoc, diag::err_hlsl_unsupported_register_type_and_resource_type) damyanp wrote: Is there a test for this? https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [RISCV] Handle empty structs/unions passing in C++ (PR #97315)
topperc wrote: > Could someone please merge this change? I do not have permissions to do so. Done https://github.com/llvm/llvm-project/pull/97315 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [RISCV] Handle empty structs/unions passing in C++ (PR #97315)
https://github.com/topperc closed https://github.com/llvm/llvm-project/pull/97315 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] d65f423 - [RISCV] Handle empty structs/unions passing in C++ (#97315)
Author: Sudharsan Veeravalli Date: 2024-07-08T18:17:51-07:00 New Revision: d65f4232026a6c0fcd2431e1d28a7ad49127f6e5 URL: https://github.com/llvm/llvm-project/commit/d65f4232026a6c0fcd2431e1d28a7ad49127f6e5 DIFF: https://github.com/llvm/llvm-project/commit/d65f4232026a6c0fcd2431e1d28a7ad49127f6e5.diff LOG: [RISCV] Handle empty structs/unions passing in C++ (#97315) According to RISC-V integer calling convention empty structs or union arguments or return values are ignored by C compilers which support them as a non-standard extension. This is not the case for C++, which requires them to be sized types. Fixes #97285 Added: Modified: clang/docs/ReleaseNotes.rst clang/lib/CodeGen/Targets/RISCV.cpp clang/test/CodeGen/RISCV/abi-empty-structs.c Removed: diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst index 838cb69f647ee..e086b4fa43743 100644 --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -1084,6 +1084,7 @@ RISC-V Support - ``__attribute__((rvv_vector_bits(N)))`` is now supported for RVV vbool*_t types. - Profile names in ``-march`` option are now supported. +- Passing empty structs/unions as arguments in C++ is now handled correctly. The behavior is similar to GCC's. CUDA/HIP Language Changes ^ diff --git a/clang/lib/CodeGen/Targets/RISCV.cpp b/clang/lib/CodeGen/Targets/RISCV.cpp index a4c5ec315b8df..f2add9351c03c 100644 --- a/clang/lib/CodeGen/Targets/RISCV.cpp +++ b/clang/lib/CodeGen/Targets/RISCV.cpp @@ -361,12 +361,13 @@ ABIArgInfo RISCVABIInfo::classifyArgumentType(QualType Ty, bool IsFixed, CGCXXABI::RAA_DirectInMemory); } - // Ignore empty structs/unions. - if (isEmptyRecord(getContext(), Ty, true)) -return ABIArgInfo::getIgnore(); - uint64_t Size = getContext().getTypeSize(Ty); + // Ignore empty structs/unions whose size is zero. According to the calling + // convention empty structs/unions are required to be sized types in C++. + if (isEmptyRecord(getContext(), Ty, true) && Size == 0) +return ABIArgInfo::getIgnore(); + // Pass floating point values via FPRs if possible. if (IsFixed && Ty->isFloatingType() && !Ty->isComplexType() && FLen >= Size && ArgFPRsLeft) { diff --git a/clang/test/CodeGen/RISCV/abi-empty-structs.c b/clang/test/CodeGen/RISCV/abi-empty-structs.c index c48a2891627d4..5157165787fcb 100644 --- a/clang/test/CodeGen/RISCV/abi-empty-structs.c +++ b/clang/test/CodeGen/RISCV/abi-empty-structs.c @@ -167,6 +167,61 @@ struct s9 { // void test_s9(struct s9 a) {} +struct s10 { }; +// CHECK-C-LABEL: define dso_local void @test_s10 +// CHECK-C-SAME: () #[[ATTR0]] { +// CHECK-C: entry: +// +// CHECK32-CXX-LABEL: define dso_local i32 @_Z8test_s103s10 +// CHECK32-CXX-SAME: (i32 [[A_COERCE:%.*]]) #[[ATTR0]] { +// CHECK32-CXX: entry: +// +// CHECK64-CXX-LABEL: define dso_local i64 @_Z8test_s103s10 +// CHECK64-CXX-SAME: (i64 [[A_COERCE:%.*]]) #[[ATTR0]] { +// CHECK64-CXX: entry: +// +struct s10 test_s10(struct s10 a) { + return a; +} + +struct s11 { int : 0; }; +// CHECK-C-LABEL: define dso_local void @test_s11 +// CHECK-C-SAME: () #[[ATTR0]] { +// CHECK-C: entry: +// +// CHECK32-CXX-LABEL: define dso_local i32 @_Z8test_s113s11 +// CHECK32-CXX-SAME: (i32 [[A_COERCE:%.*]]) #[[ATTR0]] { +// CHECK32-CXX: entry: +// +// CHECK64-CXX-LABEL: define dso_local i64 @_Z8test_s113s11 +// CHECK64-CXX-SAME: (i64 [[A_COERCE:%.*]]) #[[ATTR0]] { +// CHECK64-CXX: entry: +// +struct s11 test_s11(struct s11 a) { + return a; +} + +struct s12 {int x[0];}; +// CHECK32-C-LABEL: define dso_local i32 @test_s12 +// CHECK32-C-SAME: (i32 noundef [[I1:%.*]], i32 noundef [[I2:%.*]]) #[[ATTR0]] { +// CHECK32-C: entry: +// +// CHECK64-C-LABEL: define dso_local signext i32 @test_s12 +// CHECK64-C-SAME: (i32 noundef signext [[I1:%.*]], i32 noundef signext [[I2:%.*]]) #[[ATTR0]] { +// CHECK64-C: entry: +// +// CHECK32-CXX-LABEL: define dso_local noundef i32 @_Z8test_s12i3s12i +// CHECK32-CXX-SAME: (i32 noundef [[I1:%.*]], i32 noundef [[I2:%.*]]) #[[ATTR0]] { +// CHECK32-CXX: entry: +// +// CHECK64-CXX-LABEL: define dso_local noundef signext i32 @_Z8test_s12i3s12i +// CHECK64-CXX-SAME: (i32 noundef signext [[I1:%.*]], i32 noundef signext [[I2:%.*]]) #[[ATTR0]] { +// CHECK64-CXX: entry: +// +int test_s12(int32_t i1, struct s12 a, int32_t i2) { + return i2; +} + NOTE: These prefixes are unused and the list is autogenerated. Do not add tests below this line: // CHECK32-C: {{.*}} // CHECK64-C: {{.*}} ___________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
https://github.com/bob80905 edited https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
@@ -0,0 +1,104 @@ +// RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-library -x hlsl -o - -fsyntax-only %s -verify + +// TODO: Implement "Buffer" +struct Eg1 { + float f; + // Buffer Buf; + RWBuffer RWBuf; + }; +Eg1 e1 : /* register(t0) :*/ register(u0); +// Valid: f is skipped, Buf is bound to t0, RWBuf is bound to u0 + + +struct Eg2 { + float f; + // Buffer Buf; + RWBuffer RWBuf; + RWBuffer RWBuf2; + }; +Eg2 e2 : /* register(t0) :*/ register(u0); +// Valid: f is skipped, Buf is bound to t0, RWBuf is bound to u0. +// RWBuf2 gets automatically assigned to u1 even though there is no explicit binding for u1. + +/* +struct Eg3 { + float f; + // Buffer Buf; + }; +Eg3 e3 : register(t0) : register(u0); +// Valid: Buf gets bound to t0. Buf will also be bound to u0. +*/ + +struct Eg4 { + struct Bar { +RWBuffer a; +}; +Bar b; +}; +Eg4 e4 : register(u0); +// Valid: Bar, the struct within Eg4, has a valid resource that can be bound to t0. + +/* Light up this test when SamplerState is implemented +struct Eg5 { + SamplerState s[3]; +}; + +Eg5 e5 : register(s5); +// Valid: the first sampler state object within Eg5's s is bound to slot 5 +*/ + +struct Eg6 { + float f; +}; +// expected-warning@+1{{variable of type 'Eg6' bound to register type 't' does not contain a matching 'srv' resource}} +Eg6 e6 : register(t0); + +struct Eg7 { + struct Bar { +float f; + }; + Bar b; +}; +// expected-warning@+1{{variable of type 'Eg7' bound to register type 't' does not contain a matching 'srv' resource}} +Eg7 e7 : register(t0); + +struct Eg8 { + RWBuffer a; +}; +// expected-warning@+1{{register 'c' used on type with no contents to allocate in a constant buffer}} +Eg8 e8 : register(c0); + + +struct Eg9{ + // expected-error@+1{{'register' attribute only applies to cbuffer/tbuffer and external global variables}} + RWBuffer a : register(u9); +}; + +Eg9 e9; + + +/* Light up this test when Texture2D is implemented +template +struct Eg10 { +R b; +}; +// expecting warning: {{variable of type 'Eg10' bound to register type 'u' does not contain a matching 'uav' resource}} +Eg10 e10 : register(u0); + +// invalid because after template expansion, there are no valid resources inside Eg10 to bind as a UAV. +*/ + +struct Eg11{ + RWBuffer a; + RWBuffer b; +}; + +// expected-error@+1{{conflicting register annotations: multiple register numbers detected for register type 'u'}} +Eg11 e11 : register(u9) : register(u10); bob80905 wrote: This isn't a conflict in DXC, and no errors are reported: https://godbolt.org/z/1dGTcdrW4 I think it's worth adding to the test, but I don't think we should expect any errors from it, since the variable is being bound to 2 different logical registers at the same virtual register number. Also there's this quote according to the docs on the register keyword: > register(t3, space0) will never conflict with register(t3, space1), nor with > any array in another space that might include t3. Which can be found here: https://learn.microsoft.com/en-us/windows/win32/direct3d12/resource-binding-in-hlsl https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [RISCV] Handle empty structs/unions passing in C++ (PR #97315)
svs-quic wrote: Could someone please merge this change? I do not have permissions to do so. https://github.com/llvm/llvm-project/pull/97315 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
https://github.com/llvm-beanz edited https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
@@ -437,7 +453,409 @@ void SemaHLSL::handleShaderAttr(Decl *D, const ParsedAttr ) { D->addAttr(NewAttr); } +struct RegisterBindingFlags { + bool Resource = false; + bool Udt = false; + bool Other = false; + bool Basic = false; + + bool Srv = false; + bool Uav = false; + bool Cbv = false; + bool Sampler = false; + + bool ContainsNumeric = false; + bool DefaultGlobals = false; +}; + +bool isDeclaredWithinCOrTBuffer(const Decl *decl) { llvm-beanz wrote: Take a pass over the parameter names and local variables you’re adding. They should match the style guide: https://llvm.org/docs/CodingStandards.html#name-types-functions-variables-and-enumerators-properly https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
mpler: { +r.Sampler = true; +break; + } + } +} else { + if (VD->getType()->isBuiltinType()) +r.Basic = true; + else if (VD->getType()->isAggregateType()) { +r.Udt = true; +QualType VarType = VD->getType(); +if (const RecordType *RT = VarType->getAs()) { + const RecordDecl *RD = RT->getDecl(); + // recurse through members, set appropriate resource class flags. + setResourceClassFlagsFromRecordDecl(r, RD); +} + } else +r.Other = true; +} + } else { +llvm_unreachable("unknown decl type"); llvm-beanz wrote: How would this happen? Can we instead write this as an assert earlier in the function that more clearly communicates the expected requirements? https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
@@ -437,7 +453,409 @@ void SemaHLSL::handleShaderAttr(Decl *D, const ParsedAttr ) { D->addAttr(NewAttr); } +struct RegisterBindingFlags { + bool Resource = false; + bool Udt = false; + bool Other = false; + bool Basic = false; + + bool Srv = false; + bool Uav = false; + bool Cbv = false; + bool Sampler = false; + + bool ContainsNumeric = false; + bool DefaultGlobals = false; +}; + +bool isDeclaredWithinCOrTBuffer(const Decl *decl) { + if (!decl) +return false; + + // Traverse up the parent contexts + const DeclContext *context = decl->getDeclContext(); + while (context) { +if (isa(context)) { + return true; +} +context = context->getParent(); + } + + return false; +} + +const CXXRecordDecl *getRecordDeclFromVarDecl(VarDecl *VD) { + const Type *Ty = VD->getType()->getPointeeOrArrayElementType(); + if (!Ty) +llvm_unreachable("Resource class must have an element type."); + + if (const BuiltinType *BTy = dyn_cast(Ty)) { +return nullptr; + } + + const CXXRecordDecl *TheRecordDecl = Ty->getAsCXXRecordDecl(); + if (!TheRecordDecl) +llvm_unreachable("Resource class should have a resource type declaration."); + + if (auto TDecl = dyn_cast(TheRecordDecl)) +TheRecordDecl = TDecl->getSpecializedTemplate()->getTemplatedDecl(); + TheRecordDecl = TheRecordDecl->getCanonicalDecl(); + return TheRecordDecl; +} + +const HLSLResourceAttr * +getHLSLResourceAttrFromEitherDecl(VarDecl *VD, + HLSLBufferDecl *CBufferOrTBuffer) { + + if (VD) { +const CXXRecordDecl *TheRecordDecl = getRecordDeclFromVarDecl(VD); +if (!TheRecordDecl) + return nullptr; +const auto *Attr = TheRecordDecl->getAttr(); +return Attr; + } else if (CBufferOrTBuffer) { +const auto *Attr = CBufferOrTBuffer->getAttr(); +return Attr; + } + llvm_unreachable("one of the two conditions should be true."); + return nullptr; +} + +void traverseType(QualType T, RegisterBindingFlags ) { + if (T->isIntegralOrEnumerationType() || T->isFloatingType()) { +r.ContainsNumeric = true; +return; + } else if (const RecordType *RT = T->getAs()) { llvm-beanz wrote: nit: Don’t use `else` after a return (see: https://llvm.org/docs/CodingStandards.html#don-t-use-else-after-a-return) This functions nesting also gets pretty deep, you could use an early return to flatten it (see: https://llvm.org/docs/CodingStandards.html#use-early-exits-and-continue-to-simplify-code). https://github.com/llvm/llvm-project/pull/97103 _______ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
@@ -437,7 +453,409 @@ void SemaHLSL::handleShaderAttr(Decl *D, const ParsedAttr ) { D->addAttr(NewAttr); } +struct RegisterBindingFlags { + bool Resource = false; + bool Udt = false; + bool Other = false; + bool Basic = false; + + bool Srv = false; + bool Uav = false; + bool Cbv = false; + bool Sampler = false; + + bool ContainsNumeric = false; + bool DefaultGlobals = false; +}; + +bool isDeclaredWithinCOrTBuffer(const Decl *decl) { + if (!decl) +return false; + + // Traverse up the parent contexts + const DeclContext *context = decl->getDeclContext(); + while (context) { llvm-beanz wrote: What are the cases where we need to traverse up more than one level here? https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
@@ -437,7 +453,409 @@ void SemaHLSL::handleShaderAttr(Decl *D, const ParsedAttr ) { D->addAttr(NewAttr); } +struct RegisterBindingFlags { + bool Resource = false; + bool Udt = false; + bool Other = false; + bool Basic = false; + + bool Srv = false; + bool Uav = false; + bool Cbv = false; + bool Sampler = false; + + bool ContainsNumeric = false; + bool DefaultGlobals = false; +}; + +bool isDeclaredWithinCOrTBuffer(const Decl *decl) { + if (!decl) +return false; + + // Traverse up the parent contexts + const DeclContext *context = decl->getDeclContext(); + while (context) { +if (isa(context)) { + return true; +} +context = context->getParent(); + } + + return false; +} + +const CXXRecordDecl *getRecordDeclFromVarDecl(VarDecl *VD) { + const Type *Ty = VD->getType()->getPointeeOrArrayElementType(); + if (!Ty) +llvm_unreachable("Resource class must have an element type."); + + if (const BuiltinType *BTy = dyn_cast(Ty)) { +return nullptr; + } + + const CXXRecordDecl *TheRecordDecl = Ty->getAsCXXRecordDecl(); + if (!TheRecordDecl) +llvm_unreachable("Resource class should have a resource type declaration."); + + if (auto TDecl = dyn_cast(TheRecordDecl)) +TheRecordDecl = TDecl->getSpecializedTemplate()->getTemplatedDecl(); + TheRecordDecl = TheRecordDecl->getCanonicalDecl(); + return TheRecordDecl; +} + +const HLSLResourceAttr * +getHLSLResourceAttrFromEitherDecl(VarDecl *VD, + HLSLBufferDecl *CBufferOrTBuffer) { + + if (VD) { +const CXXRecordDecl *TheRecordDecl = getRecordDeclFromVarDecl(VD); +if (!TheRecordDecl) + return nullptr; +const auto *Attr = TheRecordDecl->getAttr(); +return Attr; + } else if (CBufferOrTBuffer) { +const auto *Attr = CBufferOrTBuffer->getAttr(); +return Attr; + } + llvm_unreachable("one of the two conditions should be true."); + return nullptr; +} + +void traverseType(QualType T, RegisterBindingFlags ) { + if (T->isIntegralOrEnumerationType() || T->isFloatingType()) { +r.ContainsNumeric = true; +return; + } else if (const RecordType *RT = T->getAs()) { +RecordDecl *SubRD = RT->getDecl(); +if (auto TDecl = dyn_cast(SubRD)) { + auto TheRecordDecl = TDecl->getSpecializedTemplate()->getTemplatedDecl(); + TheRecordDecl = TheRecordDecl->getCanonicalDecl(); + const auto *Attr = TheRecordDecl->getAttr(); + llvm::hlsl::ResourceClass DeclResourceClass = Attr->getResourceClass(); + switch (DeclResourceClass) { + case llvm::hlsl::ResourceClass::SRV: { llvm-beanz wrote: nit: the braces on these case labels add a lot of extra braces, but the scoping isn’t particularly useful. https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
@@ -490,34 +490,36 @@ void HLSLExternalSemaSource::defineTrivialHLSLTypes() { } /// Set up common members and attributes for buffer types -static BuiltinTypeDeclBuilder setupBufferType(CXXRecordDecl *Decl, Sema , - ResourceClass RC, ResourceKind RK, - bool IsROV) { +static BuiltinTypeDeclBuilder setupBufferHandle(CXXRecordDecl *Decl, Sema , +ResourceClass RC) { llvm-beanz wrote: Am I correct in reading this that you’re moving the attribute from the `onCompletion` handler to the forward declaration so that the type is always attributed? https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
@@ -437,7 +453,409 @@ void SemaHLSL::handleShaderAttr(Decl *D, const ParsedAttr ) { D->addAttr(NewAttr); } +struct RegisterBindingFlags { + bool Resource = false; + bool Udt = false; + bool Other = false; + bool Basic = false; + + bool Srv = false; + bool Uav = false; + bool Cbv = false; + bool Sampler = false; + + bool ContainsNumeric = false; + bool DefaultGlobals = false; +}; + +bool isDeclaredWithinCOrTBuffer(const Decl *decl) { + if (!decl) +return false; + + // Traverse up the parent contexts + const DeclContext *context = decl->getDeclContext(); + while (context) { +if (isa(context)) { + return true; +} +context = context->getParent(); + } + + return false; +} + +const CXXRecordDecl *getRecordDeclFromVarDecl(VarDecl *VD) { + const Type *Ty = VD->getType()->getPointeeOrArrayElementType(); + if (!Ty) +llvm_unreachable("Resource class must have an element type."); + + if (const BuiltinType *BTy = dyn_cast(Ty)) { +return nullptr; + } llvm-beanz wrote: nit: Avoid braces on simple single-line expressions (see: https://llvm.org/docs/CodingStandards.html#don-t-use-braces-on-simple-single-statement-bodies-of-if-else-loop-statements). nit: Use auto for cases where the type is obvious (see: https://llvm.org/docs/CodingStandards.html#use-auto-type-deduction-to-make-code-more-readable). ```suggestion if (const auto *BTy = dyn_cast(Ty)) return nullptr; ``` https://github.com/llvm/llvm-project/pull/97103 _______ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
@@ -437,7 +453,409 @@ void SemaHLSL::handleShaderAttr(Decl *D, const ParsedAttr ) { D->addAttr(NewAttr); } +struct RegisterBindingFlags { + bool Resource = false; + bool Udt = false; + bool Other = false; + bool Basic = false; + + bool Srv = false; + bool Uav = false; + bool Cbv = false; llvm-beanz wrote: UDT, SRV, UAV, and CBV are all initialisms, it probably makes the most sense to fully capitalize them. https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
@@ -437,7 +453,409 @@ void SemaHLSL::handleShaderAttr(Decl *D, const ParsedAttr ) { D->addAttr(NewAttr); } +struct RegisterBindingFlags { + bool Resource = false; + bool Udt = false; + bool Other = false; + bool Basic = false; + + bool Srv = false; + bool Uav = false; + bool Cbv = false; + bool Sampler = false; + + bool ContainsNumeric = false; + bool DefaultGlobals = false; +}; + +bool isDeclaredWithinCOrTBuffer(const Decl *decl) { + if (!decl) +return false; + + // Traverse up the parent contexts + const DeclContext *context = decl->getDeclContext(); + while (context) { +if (isa(context)) { + return true; +} +context = context->getParent(); + } + + return false; +} + +const CXXRecordDecl *getRecordDeclFromVarDecl(VarDecl *VD) { + const Type *Ty = VD->getType()->getPointeeOrArrayElementType(); + if (!Ty) +llvm_unreachable("Resource class must have an element type."); llvm-beanz wrote: A condition body should never just be an assert or unreachable. ```suggestion assert(Ty && "Resource class must have an element type."); ``` https://github.com/llvm/llvm-project/pull/97103 ___________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
@@ -38,6 +38,22 @@ Decl *SemaHLSL::ActOnStartBuffer(Scope *BufferScope, bool CBuffer, HLSLBufferDecl *Result = HLSLBufferDecl::Create( getASTContext(), LexicalParent, CBuffer, KwLoc, Ident, IdentLoc, LBrace); + HLSLResourceAttr *NewAttr; + if (CBuffer) { +NewAttr = HLSLResourceAttr::CreateImplicit( +getASTContext(), llvm::hlsl::ResourceClass::CBuffer, +llvm::hlsl::ResourceKind::CBuffer, +/*IsROV=*/false); + } + // tbuffer case + else { +NewAttr = HLSLResourceAttr::CreateImplicit( +getASTContext(), llvm::hlsl::ResourceClass::SRV, +llvm::hlsl::ResourceKind::TBuffer, +/*IsROV=*/false); + } + Result->addAttr(NewAttr); llvm-beanz wrote: ```suggestion auto RC = CBuffer ? llvm::hlsl::ResourceClass::CBuffer : llvm::hlsl::ResourceClass::SRV; auto RK = CBuffer ? llvm::hlsl::ResourceKind::CBuffer : llvm::hlsl::ResourceKind::TBuffer D->addAttr(HLSLResourceAttr::CreateImplicit(getASTContext(),RC, RK, /*IsROV=*/false)); ``` nit: the formatting for this is off, but I think this is a simpler way to write it. https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
https://github.com/llvm-beanz commented: I’ll give this a deeper read tomorrow, but I’ve left some comments mostly on coding convention and style issues. https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
llvm::hlsl::ResourceClass::CBuffer: { +r.cbv = true; +break; + } + case llvm::hlsl::ResourceClass::Sampler: { +r.sampler = true; +break; + } + } +} else { + if (SamplerUAVOrSRV->getType()->isBuiltinType()) +r.basic = true; + else if (SamplerUAVOrSRV->getType()->isAggregateType()) { +r.udt = true; +QualType VarType = SamplerUAVOrSRV->getType(); +if (const RecordType *RT = VarType->getAs()) { + const RecordDecl *RD = RT->getDecl(); + // recurse through members, set appropriate resource class flags. + setResourceClassFlagsFromRecordDecl(r, RD); +} + } else +r.other = true; +} + } else { +llvm_unreachable("unknown decl type"); + } + return r; +} + +static void ValidateMultipleRegisterAnnotations(Sema , Decl *D, +StringRef ) { + // make sure that there are no register annotations applied to the decl + // with the same register type but different numbers + std::unordered_map> + s; // store unique register type + numbers + std::set starting_set = {Slot[1]}; + s.insert(std::make_pair(Slot[0], starting_set)); + for (auto it = D->attr_begin(); it != D->attr_end(); ++it) { +if (HLSLResourceBindingAttr *attr = +dyn_cast(*it)) { + std::string otherSlot(attr->getSlot().data()); + + // insert into hash map + if (s.find(otherSlot[0]) != s.end()) { +// if the register type is already in the map, insert the number +// into the set (if it's not already there +s[otherSlot[0]].insert(otherSlot[1]); + } else { +// if the register type is not in the map, insert it with the number +std::set otherSet; +otherSet.insert(otherSlot[1]); +s.insert(std::make_pair(otherSlot[0], otherSet)); + } +} + } + + for (auto regType : s) { +if (regType.second.size() > 1) { + std::string regTypeStr(1, regType.first); + S.Diag(D->getLocation(), diag::err_hlsl_conflicting_register_annotations) + << regTypeStr; +} + } +} + +static void DiagnoseHLSLResourceRegType(Sema , SourceLocation , +Decl *D, StringRef ) { + + // Samplers, UAVs, and SRVs are VarDecl types + VarDecl *SamplerUAVOrSRV = dyn_cast(D); + // Cbuffers and Tbuffers are HLSLBufferDecl types + HLSLBufferDecl *CBufferOrTBuffer = dyn_cast(D); + + // exactly one of these two types should be set + if (!SamplerUAVOrSRV && !CBufferOrTBuffer) +return; + if (SamplerUAVOrSRV && CBufferOrTBuffer) +return; + + register_binding_flags f = HLSLFillRegisterBindingFlags(S, D); + assert((int)f.other + (int)f.resource + (int)f.basic + (int)f.udt == 1 && + "only one resource analysis result should be expected"); + + // get the variable type + std::string typestr; + if (SamplerUAVOrSRV) { +QualType QT = SamplerUAVOrSRV->getType(); +PrintingPolicy PP = S.getPrintingPolicy(); +typestr = QualType::getAsString(QT.split(), PP); + } else +typestr = CBufferOrTBuffer->isCBuffer() ? "cbuffer" : "tbuffer"; ---- bob80905 wrote: Made a function to fetch the relevant data only at diagnostic emission time. https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] Implement resource binding type prefix mismatch flag setting logic (PR #97103)
llvm::hlsl::ResourceClass::CBuffer: { +r.cbv = true; +break; + } + case llvm::hlsl::ResourceClass::Sampler: { +r.sampler = true; +break; + } + } +} else { + if (SamplerUAVOrSRV->getType()->isBuiltinType()) +r.basic = true; + else if (SamplerUAVOrSRV->getType()->isAggregateType()) { +r.udt = true; +QualType VarType = SamplerUAVOrSRV->getType(); +if (const RecordType *RT = VarType->getAs()) { + const RecordDecl *RD = RT->getDecl(); + // recurse through members, set appropriate resource class flags. + setResourceClassFlagsFromRecordDecl(r, RD); +} + } else +r.other = true; +} + } else { +llvm_unreachable("unknown decl type"); + } + return r; +} + +static void ValidateMultipleRegisterAnnotations(Sema , Decl *D, +StringRef ) { + // make sure that there are no register annotations applied to the decl + // with the same register type but different numbers + std::unordered_map> + s; // store unique register type + numbers + std::set starting_set = {Slot[1]}; + s.insert(std::make_pair(Slot[0], starting_set)); + for (auto it = D->attr_begin(); it != D->attr_end(); ++it) { +if (HLSLResourceBindingAttr *attr = +dyn_cast(*it)) { + std::string otherSlot(attr->getSlot().data()); + + // insert into hash map + if (s.find(otherSlot[0]) != s.end()) { +// if the register type is already in the map, insert the number +// into the set (if it's not already there +s[otherSlot[0]].insert(otherSlot[1]); + } else { +// if the register type is not in the map, insert it with the number +std::set otherSet; +otherSet.insert(otherSlot[1]); +s.insert(std::make_pair(otherSlot[0], otherSet)); + } +} + } + + for (auto regType : s) { +if (regType.second.size() > 1) { + std::string regTypeStr(1, regType.first); + S.Diag(D->getLocation(), diag::err_hlsl_conflicting_register_annotations) + << regTypeStr; +} + } +} + +static void DiagnoseHLSLResourceRegType(Sema , SourceLocation , +Decl *D, StringRef ) { + + // Samplers, UAVs, and SRVs are VarDecl types + VarDecl *SamplerUAVOrSRV = dyn_cast(D); + // Cbuffers and Tbuffers are HLSLBufferDecl types + HLSLBufferDecl *CBufferOrTBuffer = dyn_cast(D); + + // exactly one of these two types should be set + if (!SamplerUAVOrSRV && !CBufferOrTBuffer) +return; + if (SamplerUAVOrSRV && CBufferOrTBuffer) +return; + + register_binding_flags f = HLSLFillRegisterBindingFlags(S, D); + assert((int)f.other + (int)f.resource + (int)f.basic + (int)f.udt == 1 && + "only one resource analysis result should be expected"); + + // get the variable type + std::string typestr; + if (SamplerUAVOrSRV) { +QualType QT = SamplerUAVOrSRV->getType(); +PrintingPolicy PP = S.getPrintingPolicy(); +typestr = QualType::getAsString(QT.split(), PP); + } else +typestr = CBufferOrTBuffer->isCBuffer() ? "cbuffer" : "tbuffer"; + + std::string registerType(Slot.substr(0, 1)); damyanp wrote: Just to be clear here, my recommendation doesn't change the behavior of conflicting registers it just allows you to implement it much mor efficiently. https://github.com/llvm/llvm-project/pull/97103 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits