Add OSS guard tests for ET_UNWRAP/ET_UNWRAP_TOKENIZER expression contract (#20075) by psiddh · Pull Request #20075 · pytorch/executorch

psiddh · 2026-06-05T19:02:04Z

Summary:

ET_UNWRAP (runtime/core/result.h) and ET_UNWRAP_TOKENIZER
(extension/llm/runner/util.h) are expression-form macros used as
auto x = ET_UNWRAP(expr); across 100+ call sites. No test anywhere exercised
either macro, so changing them to statement-only macros (as #19686 did)
compiled cleanly in OSS CI and only broke internal-only consumers
(cria/arvr/jarvis) at diff-train import time.

Add compile-time guard tests that use both macros in expression position
(success + error paths) so OSS Buck and CMake CI fail if the expression
contract is broken. Mirrored in fbcode + xplat.

error_handling_test.cpp: EtUnwrapExpressionForm, EtUnwrapExpressionFormWithMessage
test_util.cpp: EtUnwrapTokenizerExpressionForm

Differential Revision: D107684052

pytorch-bot · 2026-06-05T19:02:08Z

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/20075

📄 Preview Python docs built from this PR

Note: Links to docs will display an error until the docs builds have been completed.

✅ You can merge normally! (1 Unrelated Failure)

As of commit 95fd0e9 with merge base db5f1ba ():

FLAKY - The following job failed but was likely due to flakiness present on trunk:

pull / test-qnn-testsuite-linux / test-backend-linux (qnn, models) / linux-job (gh) (detected as infra flaky with no log or failing log classifier)

This comment was automatically generated by Dr. CI and updates every 15 minutes.

meta-codesync · 2026-06-05T19:02:13Z

@psiddh has exported this pull request. If you are a Meta employee, you can view the originating Diff in D107684052.

github-actions · 2026-06-05T19:03:03Z

This PR needs a `release notes:` label

If your change should be included in the release notes (i.e. would users of this library care about this change?), please use a label starting with release notes:. This helps us keep track and include your important work in the next release notes.

To add a label, you can comment to pytorchbot, for example
@pytorchbot label "release notes: none"

For more information, see
https://github.com/pytorch/pytorch/wiki/PyTorch-AutoLabel-Bot#why-categorize-for-release-notes-and-how-does-it-work.

Copilot

Pull request overview

Adds OSS compile-time guard coverage to ensure ET_UNWRAP (in runtime/core/result.h) and ET_UNWRAP_TOKENIZER (in extension/llm/runner/util.h) continue to work as expression-form macros (usable as auto x = ET_UNWRAP(expr);) across both success and error paths—preventing regressions where they accidentally become statement-only macros that still compile in OSS but break downstream/internal consumers.

Changes:

Add new ET_UNWRAP(...) expression-position helpers and tests covering both the 1-arg and “with message” forms.
Add a new ET_UNWRAP_TOKENIZER(...) expression-position helper and test that exercises success + error paths.
Add the required include in the LLM runner unit test to build the new guard.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
runtime/core/test/error_handling_test.cpp	Adds expression-position `ET_UNWRAP` helpers + gtests to pin the macro’s expression contract (including variadic “message” form).
extension/llm/runner/test/test_util.cpp	Adds expression-position `ET_UNWRAP_TOKENIZER` helper + gtest to pin the macro’s expression contract on prvalues.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

…ract (pytorch#20075) Summary: ET_UNWRAP (runtime/core/result.h) and ET_UNWRAP_TOKENIZER (extension/llm/runner/util.h) are expression-form macros used as `auto x = ET_UNWRAP(expr);` across 100+ call sites. No test anywhere exercised either macro, so changing them to statement-only macros (as pytorch#19686 did) compiled cleanly in OSS CI and only broke internal-only consumers (cria/arvr/jarvis) at diff-train import time. Add compile-time guard tests that use both macros in expression position (success + error paths) so OSS Buck and CMake CI fail if the expression contract is broken. Mirrored in fbcode + xplat. - error_handling_test.cpp: EtUnwrapExpressionForm, EtUnwrapExpressionFormWithMessage - test_util.cpp: EtUnwrapTokenizerExpressionForm Differential Revision: D107684052

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

meta-codesync · 2026-06-07T02:53:39Z

@psiddh has imported this pull request. If you are a Meta employee, you can view this in D107684052.

…ract (pytorch#20075) Summary: ET_UNWRAP (runtime/core/result.h) and ET_UNWRAP_TOKENIZER (extension/llm/runner/util.h) are expression-form macros used as `auto x = ET_UNWRAP(expr);` across 100+ call sites. No test anywhere exercised either macro, so changing them to statement-only macros (as pytorch#19686 did) compiled cleanly in OSS CI and only broke internal-only consumers (cria/arvr/jarvis) at diff-train import time. Add compile-time guard tests that use both macros in expression position (success + error paths) so OSS Buck and CMake CI fail if the expression contract is broken. Mirrored in fbcode + xplat. - error_handling_test.cpp: EtUnwrapExpressionForm, EtUnwrapExpressionFormWithMessage - test_util.cpp: EtUnwrapTokenizerExpressionForm Differential Revision: D107684052

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

+Result<uint64_t> double_abs_unwrap(int64_t num) {
+  uint64_t value = ET_UNWRAP(get_abs(num));
+  return value * 2;
+}
+
+Result<uint64_t> double_abs_unwrap_with_message(int64_t num) {
+  uint64_t value =
+      ET_UNWRAP(get_abs(num), "get_abs failed for %d", static_cast<int>(num));
+  return value * 2;
+}


+::executorch::runtime::Error
+unwrap_tokenizer_expression(int32_t value, bool ok, int32_t& out) {
+  out = ET_UNWRAP_TOKENIZER(make_int_result(value, ok));
+  return ::executorch::runtime::Error::Ok;
+}


Copilot AI review requested due to automatic review settings June 5, 2026 19:02

psiddh requested review from JacobSzwejbka, larryliu0820 and mergennachin as code owners June 5, 2026 19:02

meta-cla Bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Jun 5, 2026

meta-codesync Bot added the meta-exported label Jun 5, 2026

Copilot started reviewing on behalf of psiddh June 5, 2026 19:02 View session

psiddh requested a review from kirklandsign June 5, 2026 19:13

Copilot AI reviewed Jun 5, 2026

View reviewed changes

meta-codesync Bot changed the title ~~Add OSS guard tests for ET_UNWRAP/ET_UNWRAP_TOKENIZER expression contract~~ Add OSS guard tests for ET_UNWRAP/ET_UNWRAP_TOKENIZER expression contract (#20075) Jun 5, 2026

psiddh force-pushed the export-D107684052 branch from 82ff589 to fb09045 Compare June 5, 2026 23:14

kirklandsign approved these changes Jun 5, 2026

View reviewed changes

Copilot AI review requested due to automatic review settings June 6, 2026 03:47

Copilot started reviewing on behalf of psiddh June 6, 2026 03:47 View session

Copilot AI reviewed Jun 6, 2026

View reviewed changes

Copilot AI review requested due to automatic review settings June 30, 2026 02:00

psiddh force-pushed the export-D107684052 branch from f2487d4 to 95fd0e9 Compare June 30, 2026 02:00

Copilot started reviewing on behalf of psiddh June 30, 2026 02:00 View session

Copilot AI reviewed Jun 30, 2026

View reviewed changes

psiddh merged commit e095c57 into pytorch:main Jun 30, 2026
181 of 182 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add OSS guard tests for ET_UNWRAP/ET_UNWRAP_TOKENIZER expression contract (#20075)#20075

Add OSS guard tests for ET_UNWRAP/ET_UNWRAP_TOKENIZER expression contract (#20075)#20075
psiddh merged 1 commit into
pytorch:mainfrom
psiddh:export-D107684052

psiddh commented Jun 5, 2026 •

edited by meta-codesync Bot

Loading

Uh oh!

pytorch-bot Bot commented Jun 5, 2026 •

edited

Loading

Uh oh!

meta-codesync Bot commented Jun 5, 2026

Uh oh!

github-actions Bot commented Jun 5, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI left a comment

Uh oh!

meta-codesync Bot commented Jun 7, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

psiddh commented Jun 5, 2026 • edited by meta-codesync Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pytorch-bot Bot commented Jun 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🔗 Helpful Links

🧪 See artifacts and rendered test results at hud.pytorch.org/pr/pytorch/executorch/20075

✅ You can merge normally! (1 Unrelated Failure)

Uh oh!

meta-codesync Bot commented Jun 5, 2026

Uh oh!

github-actions Bot commented Jun 5, 2026

This PR needs a release notes: label

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

meta-codesync Bot commented Jun 7, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

psiddh commented Jun 5, 2026 •

edited by meta-codesync Bot

Loading

pytorch-bot Bot commented Jun 5, 2026 •

edited

Loading

This PR needs a `release notes:` label