Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions .github/workflows/benchmark-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:
run-id: ${{ github.event.workflow_run.id }}
github-token: ${{ secrets.GITHUB_TOKEN }}

# The artifact comes from the PR's own copy of the Benchmarks workflow,
# so its contents are untrusted: accept only a plain PR number.
- name: Read PR number
id: pr
run: |
Expand All @@ -36,7 +38,13 @@ jobs:
echo "skip=true" >> "$GITHUB_OUTPUT"
exit 0
fi
echo "number=$(cat results/pr-number.txt | tr -d '[:space:]')" >> "$GITHUB_OUTPUT"
number=$(tr -d '[:space:]' < results/pr-number.txt)
if ! [[ "$number" =~ ^[0-9]{1,10}$ ]]; then
echo "::warning::Invalid PR number in artifact — skipping."
echo "skip=true" >> "$GITHUB_OUTPUT"
exit 0
fi
echo "number=$number" >> "$GITHUB_OUTPUT"
echo "skip=false" >> "$GITHUB_OUTPUT"

- name: Read markdown report
Expand All @@ -53,11 +61,29 @@ jobs:
- name: Post or update PR comment
if: steps.pr.outputs.skip != 'true' && steps.report.outputs.skip != 'true'
uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
env:
PR_NUMBER: ${{ steps.pr.outputs.number }}
with:
script: |
const fs = require('fs');
const marker = '<!-- hermes-benchmark-results -->';
const prNumber = parseInt('${{ steps.pr.outputs.number }}', 10);
const prNumber = Number(process.env.PR_NUMBER);

// Only comment on the PR whose head commit was benchmarked, so a
// forged PR number cannot target another PR.
const { data: pr } = await github.rest.pulls.get({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: prNumber,
});
const headSha = context.payload.workflow_run.head_sha;
if (pr.head.sha !== headSha) {
core.warning(
`PR #${prNumber} head ${pr.head.sha} does not match the ` +
`benchmarked commit ${headSha}; skipping.`,
);
return;
}

const markdown = fs.readFileSync('results/bench_report.md', 'utf-8');
const body = `${marker}\n${markdown}`;
Expand Down
4 changes: 2 additions & 2 deletions lib/Regex/RegexSerialization.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ void dumpInstruction(
const regex::MatchNChar8Insn *insn,
llvh::raw_ostream &OS) {
OS << "MatchNChar8: '";
const char *cPtr = reinterpret_cast<const char *>(insn + sizeof(regex::Insn));
const char *cPtr = reinterpret_cast<const char *>(insn + 1);
for (uint32_t i = 0; i < insn->charCount; i++) {
char c = *cPtr;
if (std::isprint(c)) {
Expand All @@ -119,7 +119,7 @@ void dumpInstruction(
const regex::MatchNCharICase8Insn *insn,
llvh::raw_ostream &OS) {
OS << "MatchNCharICase8: '";
const char *cPtr = reinterpret_cast<const char *>(insn + sizeof(regex::Insn));
const char *cPtr = reinterpret_cast<const char *>(insn + 1);
for (uint32_t i = 0; i < insn->charCount; i++) {
char c = *cPtr;
if (std::isprint(c)) {
Expand Down
Loading